Add in-place editing and validation to Design Rules.
Includes UNIT_BINDER transition and some general layout cleanup. (cherry picked from commit 282119e)
This commit is contained in:
parent
99fb938b8f
commit
124c6d9857
|
@ -244,7 +244,10 @@ wxString StringFromValue( EDA_UNITS_T aUnits, int aValue, bool aAddUnitSymbol, b
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
len = sprintf( buf, "%.10g", value_to_print );
|
if( aUnits == INCHES && aUseMils )
|
||||||
|
len = sprintf( buf, "%.7g", value_to_print );
|
||||||
|
else
|
||||||
|
len = sprintf( buf, "%.10g", value_to_print );
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString stringValue( buf, wxConvUTF8 );
|
wxString stringValue( buf, wxConvUTF8 );
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -32,6 +32,7 @@
|
||||||
#define __dialog_design_rules_h_
|
#define __dialog_design_rules_h_
|
||||||
|
|
||||||
#include <../class_board.h>
|
#include <../class_board.h>
|
||||||
|
#include <widgets/unit_binder.h>
|
||||||
|
|
||||||
#include <dialog_design_rules_base.h>
|
#include <dialog_design_rules_base.h>
|
||||||
|
|
||||||
|
@ -65,16 +66,28 @@ class DIALOG_DESIGN_RULES : public DIALOG_DESIGN_RULES_BASE
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
static const wxString wildCard; ///< the name of a fictitious netclass which includes all NETs
|
static const wxString wildCard; // The name of a fictitious netclass
|
||||||
|
// which includes all NETs
|
||||||
|
static int s_LastTabSelection; // Which tab user had open last
|
||||||
|
|
||||||
PCB_EDIT_FRAME* m_Parent;
|
PCB_EDIT_FRAME* m_Parent;
|
||||||
BOARD* m_Pcb;
|
BOARD* m_Pcb;
|
||||||
BOARD_DESIGN_SETTINGS* m_BrdSettings;
|
BOARD_DESIGN_SETTINGS* m_BrdSettings;
|
||||||
|
|
||||||
NETCLASSPTR m_SelectedNetClass;
|
int* m_originalColWidths;
|
||||||
|
|
||||||
static int s_LastTabSelection; ///< which tab user had open last
|
wxString m_gridErrorMsg;
|
||||||
int m_initialRowLabelsSize; ///< the initial width given by wxFormBuilder
|
wxGrid* m_gridErrorGrid;
|
||||||
|
int m_gridErrorRow;
|
||||||
|
int m_gridErrorCol;
|
||||||
|
|
||||||
|
bool m_netclassesDirty; // Indicates the netclass drop-down
|
||||||
|
// menus need rebuilding
|
||||||
|
UNIT_BINDER m_trackMinWidth;
|
||||||
|
UNIT_BINDER m_viaMinDiameter;
|
||||||
|
UNIT_BINDER m_viaMinDrill;
|
||||||
|
UNIT_BINDER m_microViaMinDiameter;
|
||||||
|
UNIT_BINDER m_microViaMinDrill;
|
||||||
|
|
||||||
wxFloatingPointValidator< double > m_validator; // Floating point validator
|
wxFloatingPointValidator< double > m_validator; // Floating point validator
|
||||||
|
|
||||||
|
@ -97,75 +110,31 @@ private:
|
||||||
void OnRemoveNetclassClick( wxCommandEvent& event ) override;
|
void OnRemoveNetclassClick( wxCommandEvent& event ) override;
|
||||||
void CheckAllowMicroVias();
|
void CheckAllowMicroVias();
|
||||||
void OnAllowMicroVias( wxCommandEvent& event ) override;
|
void OnAllowMicroVias( wxCommandEvent& event ) override;
|
||||||
|
void OnSizeNetclassGrid( wxSizeEvent& event ) override;
|
||||||
/*
|
void OnUpdateUI( wxUpdateUIEvent &event ) override;
|
||||||
* Called on "Move Up" button click
|
void OnNetclassGridCellChanging( wxGridEvent& event );
|
||||||
* the selected(s) rules are moved up
|
|
||||||
* The default netclass is always the first rule
|
|
||||||
*/
|
|
||||||
void OnMoveUpSelectedNetClass( wxCommandEvent& event ) override;
|
void OnMoveUpSelectedNetClass( wxCommandEvent& event ) override;
|
||||||
|
void OnMoveDownSelectedNetClass( wxCommandEvent& event ) override;
|
||||||
/*
|
|
||||||
* Called on the left Choice Box selection
|
|
||||||
*/
|
|
||||||
void OnLeftCBSelection( wxCommandEvent& event ) override;
|
void OnLeftCBSelection( wxCommandEvent& event ) override;
|
||||||
|
|
||||||
/*
|
|
||||||
* Called on the Right Choice Box selection
|
|
||||||
*/
|
|
||||||
void OnRightCBSelection( wxCommandEvent& event ) override;
|
void OnRightCBSelection( wxCommandEvent& event ) override;
|
||||||
|
|
||||||
void OnRightToLeftCopyButton( wxCommandEvent& event ) override;
|
void OnRightToLeftCopyButton( wxCommandEvent& event ) override;
|
||||||
void OnLeftToRightCopyButton( wxCommandEvent& event ) override;
|
void OnLeftToRightCopyButton( wxCommandEvent& event ) override;
|
||||||
|
|
||||||
void OnNotebookPageChanged( wxNotebookEvent& event ) override;
|
void OnNotebookPageChanged( wxNotebookEvent& event ) override;
|
||||||
|
|
||||||
/*
|
|
||||||
* Called on clicking the left "select all" button:
|
|
||||||
* select all items of the left netname list list box
|
|
||||||
*/
|
|
||||||
void OnLeftSelectAllButton( wxCommandEvent& event ) override;
|
void OnLeftSelectAllButton( wxCommandEvent& event ) override;
|
||||||
|
|
||||||
/*
|
|
||||||
* Called on clicking the right "select all" button:
|
|
||||||
* select all items of the right netname list list box
|
|
||||||
*/
|
|
||||||
void OnRightSelectAllButton( wxCommandEvent& event ) override;
|
void OnRightSelectAllButton( wxCommandEvent& event ) override;
|
||||||
|
|
||||||
/*
|
bool validateNetclassName( int aRow, wxString aName, bool focusFirst = true );
|
||||||
* Function SetDataValidators
|
bool validateData();
|
||||||
* adds numerical validators to relevant text input boxes
|
|
||||||
*/
|
|
||||||
void SetDataValidators( void );
|
|
||||||
|
|
||||||
/*
|
void transferNetclassesToWindow();
|
||||||
* Function TestDataValidity
|
void transferGlobalRulesToWindow();
|
||||||
*
|
|
||||||
* Performs a check of design rule data validity and displays an error message if errors
|
|
||||||
* are found.
|
|
||||||
* @param aErrorMsg is a pointer to a wxString to copy the error message into. Can be NULL.
|
|
||||||
* @return true if Ok, false if error
|
|
||||||
*/
|
|
||||||
bool TestDataValidity( wxString* aErrorMsg = NULL );
|
|
||||||
|
|
||||||
void InitDialogRules();
|
void rebuildNetclassDropdowns();
|
||||||
void InitGlobalRules();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function InitRulesList
|
|
||||||
* Fill the grid showing current rules with values
|
|
||||||
*/
|
|
||||||
void InitRulesList();
|
|
||||||
|
|
||||||
/* Populates the lists of sizes (Tracks width list and Vias diameters & drill list) */
|
/* Populates the lists of sizes (Tracks width list and Vias diameters & drill list) */
|
||||||
void InitDimensionsLists();
|
void InitDimensionsLists();
|
||||||
|
|
||||||
void InitializeRulesSelectionBoxes();
|
void CopyNetclassesToBoard();
|
||||||
|
|
||||||
/* Copy the rules list from grid to board
|
|
||||||
*/
|
|
||||||
void CopyRulesListToBoard();
|
|
||||||
|
|
||||||
void CopyGlobalRulesToBoard();
|
void CopyGlobalRulesToBoard();
|
||||||
void CopyDimensionsListsToBoard( );
|
void CopyDimensionsListsToBoard( );
|
||||||
void SetRoutableLayerStatus();
|
void SetRoutableLayerStatus();
|
||||||
|
@ -195,11 +164,15 @@ private:
|
||||||
|
|
||||||
void moveSelectedItems( NETS_LIST_CTRL* src, const wxString& newClassName );
|
void moveSelectedItems( NETS_LIST_CTRL* src, const wxString& newClassName );
|
||||||
|
|
||||||
|
void setGridError( wxGrid* aGrid, const wxString& aMsg, int aRow, int aCol );
|
||||||
|
|
||||||
|
void AdjustNetclassGridColumns( int aWidth );
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DIALOG_DESIGN_RULES( PCB_EDIT_FRAME* parent );
|
DIALOG_DESIGN_RULES( PCB_EDIT_FRAME* parent );
|
||||||
~DIALOG_DESIGN_RULES( ) { }
|
~DIALOG_DESIGN_RULES( );
|
||||||
|
|
||||||
|
virtual bool TransferDataToWindow() override;
|
||||||
virtual bool TransferDataFromWindow() override;
|
virtual bool TransferDataFromWindow() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Apr 19 2018)
|
// C++ code generated with wxFormBuilder (version Dec 30 2017)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
@ -24,40 +24,44 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
bpanelNetClassesSizer = new wxBoxSizer( wxVERTICAL );
|
bpanelNetClassesSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxStaticBoxSizer* sbSizerUpper;
|
wxStaticBoxSizer* sbSizerUpper;
|
||||||
sbSizerUpper = new wxStaticBoxSizer( new wxStaticBox( m_panelNetClassesEditor, wxID_ANY, _("Net Classes:") ), wxVERTICAL );
|
sbSizerUpper = new wxStaticBoxSizer( new wxStaticBox( m_panelNetClassesEditor, wxID_ANY, _("Net Classes") ), wxVERTICAL );
|
||||||
|
|
||||||
m_grid = new wxGrid( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSUNKEN_BORDER|wxTAB_TRAVERSAL|wxVSCROLL );
|
m_grid = new wxGrid( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSUNKEN_BORDER|wxTAB_TRAVERSAL|wxVSCROLL );
|
||||||
|
|
||||||
// Grid
|
// Grid
|
||||||
m_grid->CreateGrid( 1, 8 );
|
m_grid->CreateGrid( 1, 9 );
|
||||||
m_grid->EnableEditing( true );
|
m_grid->EnableEditing( true );
|
||||||
m_grid->EnableGridLines( true );
|
m_grid->EnableGridLines( true );
|
||||||
m_grid->EnableDragGridSize( false );
|
m_grid->EnableDragGridSize( false );
|
||||||
m_grid->SetMargins( 0, 0 );
|
m_grid->SetMargins( 0, 0 );
|
||||||
|
|
||||||
// Columns
|
// Columns
|
||||||
m_grid->SetColSize( 0, 100 );
|
m_grid->SetColSize( 0, 120 );
|
||||||
m_grid->SetColSize( 1, 120 );
|
m_grid->SetColSize( 1, 100 );
|
||||||
m_grid->SetColSize( 2, 84 );
|
m_grid->SetColSize( 2, 100 );
|
||||||
m_grid->SetColSize( 3, 85 );
|
m_grid->SetColSize( 3, 100 );
|
||||||
m_grid->SetColSize( 4, 81 );
|
m_grid->SetColSize( 4, 100 );
|
||||||
m_grid->SetColSize( 5, 90 );
|
m_grid->SetColSize( 5, 100 );
|
||||||
|
m_grid->SetColSize( 6, 100 );
|
||||||
|
m_grid->SetColSize( 7, 100 );
|
||||||
|
m_grid->SetColSize( 8, 100 );
|
||||||
m_grid->EnableDragColMove( false );
|
m_grid->EnableDragColMove( false );
|
||||||
m_grid->EnableDragColSize( true );
|
m_grid->EnableDragColSize( true );
|
||||||
m_grid->SetColLabelSize( 40 );
|
m_grid->SetColLabelSize( 22 );
|
||||||
m_grid->SetColLabelValue( 0, _("Clearance") );
|
m_grid->SetColLabelValue( 0, _("Name") );
|
||||||
m_grid->SetColLabelValue( 1, _("Track Width") );
|
m_grid->SetColLabelValue( 1, _("Clearance") );
|
||||||
m_grid->SetColLabelValue( 2, _("Via Dia") );
|
m_grid->SetColLabelValue( 2, _("Track Width") );
|
||||||
m_grid->SetColLabelValue( 3, _("Via Drill") );
|
m_grid->SetColLabelValue( 3, _("Via Dia") );
|
||||||
m_grid->SetColLabelValue( 4, _("uVia Dia") );
|
m_grid->SetColLabelValue( 4, _("Via Drill") );
|
||||||
m_grid->SetColLabelValue( 5, _("uVia Drill") );
|
m_grid->SetColLabelValue( 5, _("uVia Dia") );
|
||||||
m_grid->SetColLabelValue( 6, _("Diff Pair Width") );
|
m_grid->SetColLabelValue( 6, _("uVia Drill") );
|
||||||
m_grid->SetColLabelValue( 7, _("Diff Pair Gap") );
|
m_grid->SetColLabelValue( 7, _("Diff Pair Width") );
|
||||||
|
m_grid->SetColLabelValue( 8, _("Diff Pair Gap") );
|
||||||
m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
||||||
|
|
||||||
// Rows
|
// Rows
|
||||||
m_grid->EnableDragRowSize( false );
|
m_grid->EnableDragRowSize( false );
|
||||||
m_grid->SetRowLabelSize( 120 );
|
m_grid->SetRowLabelSize( 0 );
|
||||||
m_grid->SetRowLabelValue( 0, _("Default") );
|
m_grid->SetRowLabelValue( 0, _("Default") );
|
||||||
m_grid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
|
m_grid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
|
||||||
|
|
||||||
|
@ -67,34 +71,39 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
|
m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
|
||||||
m_grid->SetToolTip( _("Net Class parameters") );
|
m_grid->SetToolTip( _("Net Class parameters") );
|
||||||
|
|
||||||
sbSizerUpper->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
|
sbSizerUpper->Add( m_grid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
wxBoxSizer* buttonBoxSizer;
|
wxBoxSizer* buttonBoxSizer;
|
||||||
buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL );
|
buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_addButton = new wxButton( m_panelNetClassesEditor, wxID_ADD_NETCLASS, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_addButton = new wxBitmapButton( m_panelNetClassesEditor, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
|
||||||
m_addButton->SetToolTip( _("Add another Net Class") );
|
m_addButton->SetMinSize( wxSize( 29,29 ) );
|
||||||
|
|
||||||
buttonBoxSizer->Add( m_addButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
|
buttonBoxSizer->Add( m_addButton, 0, wxLEFT, 5 );
|
||||||
|
|
||||||
m_removeButton = new wxButton( m_panelNetClassesEditor, wxID_REMOVE_NETCLASS, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_removeButton = new wxBitmapButton( m_panelNetClassesEditor, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
|
||||||
m_removeButton->SetToolTip( _("Remove the currently select Net Class\nThe default Net Class cannot be removed") );
|
m_removeButton->SetMinSize( wxSize( 29,29 ) );
|
||||||
|
|
||||||
buttonBoxSizer->Add( m_removeButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
|
buttonBoxSizer->Add( m_removeButton, 0, wxRIGHT, 10 );
|
||||||
|
|
||||||
m_moveUpButton = new wxButton( m_panelNetClassesEditor, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_moveUpButton = new wxBitmapButton( m_panelNetClassesEditor, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
|
||||||
m_moveUpButton->SetToolTip( _("Move the currently selected Net Class up one row") );
|
m_moveUpButton->SetMinSize( wxSize( 29,29 ) );
|
||||||
|
|
||||||
buttonBoxSizer->Add( m_moveUpButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
|
buttonBoxSizer->Add( m_moveUpButton, 0, wxLEFT, 5 );
|
||||||
|
|
||||||
|
m_moveDownButton = new wxBitmapButton( m_panelNetClassesEditor, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
|
||||||
|
m_moveDownButton->SetMinSize( wxSize( 29,29 ) );
|
||||||
|
|
||||||
|
buttonBoxSizer->Add( m_moveDownButton, 0, wxRIGHT, 5 );
|
||||||
|
|
||||||
|
|
||||||
sbSizerUpper->Add( buttonBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 );
|
sbSizerUpper->Add( buttonBoxSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 2 );
|
||||||
|
|
||||||
|
|
||||||
bpanelNetClassesSizer->Add( sbSizerUpper, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
|
bpanelNetClassesSizer->Add( sbSizerUpper, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
|
||||||
|
|
||||||
wxStaticBoxSizer* sbSizerNetSelectMain;
|
wxStaticBoxSizer* sbSizerNetSelectMain;
|
||||||
sbSizerNetSelectMain = new wxStaticBoxSizer( new wxStaticBox( m_panelNetClassesEditor, wxID_ANY, _("Net Class Membership:") ), wxHORIZONTAL );
|
sbSizerNetSelectMain = new wxStaticBoxSizer( new wxStaticBox( m_panelNetClassesEditor, wxID_ANY, _("Net Class Membership") ), wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* leftNetSelectBoxSizer;
|
wxBoxSizer* leftNetSelectBoxSizer;
|
||||||
leftNetSelectBoxSizer = new wxBoxSizer( wxVERTICAL );
|
leftNetSelectBoxSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
@ -174,13 +183,10 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true );
|
m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true );
|
||||||
m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
wxBoxSizer* bpanelGlobRulesSizer;
|
wxBoxSizer* bpanelGlobRulesSizer;
|
||||||
bpanelGlobRulesSizer = new wxBoxSizer( wxVERTICAL );
|
bpanelGlobRulesSizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bDesignRulesUpperSizer;
|
wxStaticBoxSizer* sbRoutingOptionSizer;
|
||||||
bDesignRulesUpperSizer = new wxBoxSizer( wxHORIZONTAL );
|
sbRoutingOptionSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Routing Options") ), wxVERTICAL );
|
||||||
|
|
||||||
wxStaticBoxSizer* sbViasOptionSizer;
|
|
||||||
sbViasOptionSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Routing Options:") ), wxVERTICAL );
|
|
||||||
|
|
||||||
wxFlexGridSizer* fgViaOptionsSize;
|
wxFlexGridSizer* fgViaOptionsSize;
|
||||||
fgViaOptionsSize = new wxFlexGridSizer( 0, 3, 0, 0 );
|
fgViaOptionsSize = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||||
|
@ -188,34 +194,34 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
fgViaOptionsSize->SetFlexibleDirection( wxBOTH );
|
fgViaOptionsSize->SetFlexibleDirection( wxBOTH );
|
||||||
fgViaOptionsSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
fgViaOptionsSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
||||||
m_TrackMinWidthTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum track width:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
|
m_TrackMinWidthTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum track width:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_TrackMinWidthTitle->Wrap( -1 );
|
m_TrackMinWidthTitle->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_TrackMinWidthTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
|
fgViaOptionsSize->Add( m_TrackMinWidthTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_SetTrackMinWidthCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SetTrackMinWidthCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgViaOptionsSize->Add( m_SetTrackMinWidthCtrl, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND, 5 );
|
fgViaOptionsSize->Add( m_SetTrackMinWidthCtrl, 0, wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
|
||||||
|
|
||||||
m_TrackMinWidthUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
m_TrackMinWidthUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_TrackMinWidthUnits->Wrap( -1 );
|
m_TrackMinWidthUnits->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_TrackMinWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
fgViaOptionsSize->Add( m_TrackMinWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_ViaMinTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum via diameter:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
|
m_ViaMinTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum via diameter:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_ViaMinTitle->Wrap( -1 );
|
m_ViaMinTitle->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_ViaMinTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
|
fgViaOptionsSize->Add( m_ViaMinTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_SetViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SetViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgViaOptionsSize->Add( m_SetViasMinSizeCtrl, 0, wxALL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
|
fgViaOptionsSize->Add( m_SetViasMinSizeCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
|
||||||
|
|
||||||
m_ViaMinUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
m_ViaMinUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_ViaMinUnits->Wrap( -1 );
|
m_ViaMinUnits->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_ViaMinUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
fgViaOptionsSize->Add( m_ViaMinUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_ViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum via drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
|
m_ViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum via drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_ViaMinDrillTitle->Wrap( -1 );
|
m_ViaMinDrillTitle->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_ViaMinDrillTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
|
fgViaOptionsSize->Add( m_ViaMinDrillTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_SetViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SetViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgViaOptionsSize->Add( m_SetViasMinDrillCtrl, 0, wxALL|wxEXPAND, 5 );
|
fgViaOptionsSize->Add( m_SetViasMinDrillCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
|
||||||
|
|
||||||
m_ViaMinDrillUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
m_ViaMinDrillUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_ViaMinDrillUnits->Wrap( -1 );
|
m_ViaMinDrillUnits->Wrap( -1 );
|
||||||
|
@ -239,104 +245,40 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
|
|
||||||
fgViaOptionsSize->Add( 0, 0, 1, wxEXPAND, 5 );
|
fgViaOptionsSize->Add( 0, 0, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
m_MicroViaMinSizeTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum uVia diameter:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_MicroViaMinSizeTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum uVia diameter:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_MicroViaMinSizeTitle->Wrap( -1 );
|
m_MicroViaMinSizeTitle->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_MicroViaMinSizeTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 );
|
fgViaOptionsSize->Add( m_MicroViaMinSizeTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxTOP, 5 );
|
||||||
|
|
||||||
m_SetMicroViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SetMicroViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_SetMicroViasMinSizeCtrl->Enable( false );
|
m_SetMicroViasMinSizeCtrl->Enable( false );
|
||||||
|
|
||||||
fgViaOptionsSize->Add( m_SetMicroViasMinSizeCtrl, 0, wxALL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
|
fgViaOptionsSize->Add( m_SetMicroViasMinSizeCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
|
||||||
|
|
||||||
m_MicroViaMinSizeUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
m_MicroViaMinSizeUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_MicroViaMinSizeUnits->Wrap( -1 );
|
m_MicroViaMinSizeUnits->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_MicroViaMinSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
fgViaOptionsSize->Add( m_MicroViaMinSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_MicroViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum uVia drill:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_MicroViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Minimum uVia drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_MicroViaMinDrillTitle->Wrap( -1 );
|
m_MicroViaMinDrillTitle->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_MicroViaMinDrillTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
|
fgViaOptionsSize->Add( m_MicroViaMinDrillTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
m_SetMicroViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SetMicroViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_SetMicroViasMinDrillCtrl->Enable( false );
|
m_SetMicroViasMinDrillCtrl->Enable( false );
|
||||||
|
|
||||||
fgViaOptionsSize->Add( m_SetMicroViasMinDrillCtrl, 0, wxEXPAND|wxALL, 5 );
|
fgViaOptionsSize->Add( m_SetMicroViasMinDrillCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
|
||||||
|
|
||||||
m_MicroViaMinDrillUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
m_MicroViaMinDrillUnits = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
|
||||||
m_MicroViaMinDrillUnits->Wrap( -1 );
|
m_MicroViaMinDrillUnits->Wrap( -1 );
|
||||||
fgViaOptionsSize->Add( m_MicroViaMinDrillUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
fgViaOptionsSize->Add( m_MicroViaMinDrillUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
|
||||||
|
|
||||||
|
|
||||||
sbViasOptionSizer->Add( fgViaOptionsSize, 1, wxEXPAND, 5 );
|
sbRoutingOptionSizer->Add( fgViaOptionsSize, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
|
bpanelGlobRulesSizer->Add( sbRoutingOptionSizer, 1, wxEXPAND|wxALL, 5 );
|
||||||
|
|
||||||
|
|
||||||
bpanelGlobRulesSizer->Add( bDesignRulesUpperSizer, 0, wxEXPAND, 5 );
|
|
||||||
|
|
||||||
m_staticTextInfo = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Specific via diameters and track widths, which can be used to replace default Netclass values on demand,\nfor arbitrary vias or track segments."), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
|
|
||||||
m_staticTextInfo->Wrap( -1 );
|
|
||||||
bpanelGlobRulesSizer->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
|
|
||||||
|
|
||||||
wxBoxSizer* bDesignRulesLowerSizer;
|
|
||||||
bDesignRulesLowerSizer = new wxBoxSizer( wxHORIZONTAL );
|
|
||||||
|
|
||||||
wxStaticBoxSizer* sViaSizeBox;
|
|
||||||
sViaSizeBox = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Custom Via Sizes:") ), wxVERTICAL );
|
|
||||||
|
|
||||||
m_staticText7 = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Drill value: a blank or 0 => default Netclass value"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText7->Wrap( -1 );
|
|
||||||
sViaSizeBox->Add( m_staticText7, 0, wxALL, 5 );
|
|
||||||
|
|
||||||
m_gridViaSizeList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
|
|
||||||
// Grid
|
|
||||||
m_gridViaSizeList->CreateGrid( 8, 2 );
|
|
||||||
m_gridViaSizeList->EnableEditing( true );
|
|
||||||
m_gridViaSizeList->EnableGridLines( true );
|
|
||||||
m_gridViaSizeList->EnableDragGridSize( false );
|
|
||||||
m_gridViaSizeList->SetMargins( 0, 0 );
|
|
||||||
|
|
||||||
// Columns
|
|
||||||
m_gridViaSizeList->EnableDragColMove( false );
|
|
||||||
m_gridViaSizeList->EnableDragColSize( true );
|
|
||||||
m_gridViaSizeList->SetColLabelSize( 30 );
|
|
||||||
m_gridViaSizeList->SetColLabelValue( 0, _("Diameter") );
|
|
||||||
m_gridViaSizeList->SetColLabelValue( 1, _("Drill") );
|
|
||||||
m_gridViaSizeList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
|
||||||
|
|
||||||
// Rows
|
|
||||||
m_gridViaSizeList->EnableDragRowSize( true );
|
|
||||||
m_gridViaSizeList->SetRowLabelSize( 80 );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 0, _("Via 1") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 1, _("Via 2") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 2, _("Via 3") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 3, _("Via 4") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 4, _("Via 5") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 5, _("Via 6") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 6, _("Via 7") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 7, _("Via 8") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 8, _("Via 9") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 9, _("Via 10") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 10, _("Via 11") );
|
|
||||||
m_gridViaSizeList->SetRowLabelValue( 11, _("Via 12") );
|
|
||||||
m_gridViaSizeList->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
|
||||||
|
|
||||||
// Label Appearance
|
|
||||||
|
|
||||||
// Cell Defaults
|
|
||||||
m_gridViaSizeList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
|
|
||||||
sViaSizeBox->Add( m_gridViaSizeList, 1, wxALL|wxEXPAND, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
bDesignRulesLowerSizer->Add( sViaSizeBox, 1, wxALL|wxEXPAND, 5 );
|
|
||||||
|
|
||||||
wxStaticBoxSizer* sbTracksListSizer;
|
wxStaticBoxSizer* sbTracksListSizer;
|
||||||
sbTracksListSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Custom Track Widths:") ), wxVERTICAL );
|
sbTracksListSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Custom Track Widths") ), wxVERTICAL );
|
||||||
|
|
||||||
m_staticText8 = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText8->Wrap( -1 );
|
|
||||||
sbTracksListSizer->Add( m_staticText8, 0, wxALL, 5 );
|
|
||||||
|
|
||||||
m_gridTrackWidthList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
m_gridTrackWidthList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
|
||||||
|
@ -348,14 +290,15 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
m_gridTrackWidthList->SetMargins( 0, 0 );
|
m_gridTrackWidthList->SetMargins( 0, 0 );
|
||||||
|
|
||||||
// Columns
|
// Columns
|
||||||
|
m_gridTrackWidthList->SetColSize( 0, 110 );
|
||||||
m_gridTrackWidthList->EnableDragColMove( false );
|
m_gridTrackWidthList->EnableDragColMove( false );
|
||||||
m_gridTrackWidthList->EnableDragColSize( true );
|
m_gridTrackWidthList->EnableDragColSize( false );
|
||||||
m_gridTrackWidthList->SetColLabelSize( 30 );
|
m_gridTrackWidthList->SetColLabelSize( 22 );
|
||||||
m_gridTrackWidthList->SetColLabelValue( 0, _("Width") );
|
m_gridTrackWidthList->SetColLabelValue( 0, _("Width") );
|
||||||
m_gridTrackWidthList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
m_gridTrackWidthList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
||||||
|
|
||||||
// Rows
|
// Rows
|
||||||
m_gridTrackWidthList->EnableDragRowSize( true );
|
m_gridTrackWidthList->EnableDragRowSize( false );
|
||||||
m_gridTrackWidthList->SetRowLabelSize( 80 );
|
m_gridTrackWidthList->SetRowLabelSize( 80 );
|
||||||
m_gridTrackWidthList->SetRowLabelValue( 0, _("Track 1") );
|
m_gridTrackWidthList->SetRowLabelValue( 0, _("Track 1") );
|
||||||
m_gridTrackWidthList->SetRowLabelValue( 1, _("Track 2") );
|
m_gridTrackWidthList->SetRowLabelValue( 1, _("Track 2") );
|
||||||
|
@ -375,13 +318,58 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
|
|
||||||
// Cell Defaults
|
// Cell Defaults
|
||||||
m_gridTrackWidthList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
|
m_gridTrackWidthList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
|
||||||
sbTracksListSizer->Add( m_gridTrackWidthList, 1, wxALL|wxEXPAND, 5 );
|
sbTracksListSizer->Add( m_gridTrackWidthList, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bDesignRulesLowerSizer->Add( sbTracksListSizer, 1, wxALL|wxEXPAND, 5 );
|
bpanelGlobRulesSizer->Add( sbTracksListSizer, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
wxStaticBoxSizer* sViaSizeBox;
|
||||||
|
sViaSizeBox = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Custom Via Sizes") ), wxVERTICAL );
|
||||||
|
|
||||||
|
m_gridViaSizeList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
|
||||||
|
// Grid
|
||||||
|
m_gridViaSizeList->CreateGrid( 8, 2 );
|
||||||
|
m_gridViaSizeList->EnableEditing( true );
|
||||||
|
m_gridViaSizeList->EnableGridLines( true );
|
||||||
|
m_gridViaSizeList->EnableDragGridSize( false );
|
||||||
|
m_gridViaSizeList->SetMargins( 0, 0 );
|
||||||
|
|
||||||
|
// Columns
|
||||||
|
m_gridViaSizeList->SetColSize( 0, 110 );
|
||||||
|
m_gridViaSizeList->SetColSize( 1, 110 );
|
||||||
|
m_gridViaSizeList->EnableDragColMove( false );
|
||||||
|
m_gridViaSizeList->EnableDragColSize( false );
|
||||||
|
m_gridViaSizeList->SetColLabelSize( 22 );
|
||||||
|
m_gridViaSizeList->SetColLabelValue( 0, _("Diameter") );
|
||||||
|
m_gridViaSizeList->SetColLabelValue( 1, _("Drill") );
|
||||||
|
m_gridViaSizeList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
||||||
|
|
||||||
|
// Rows
|
||||||
|
m_gridViaSizeList->EnableDragRowSize( false );
|
||||||
|
m_gridViaSizeList->SetRowLabelSize( 80 );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 0, _("Via 1") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 1, _("Via 2") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 2, _("Via 3") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 3, _("Via 4") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 4, _("Via 5") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 5, _("Via 6") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 6, _("Via 7") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 7, _("Via 8") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 8, _("Via 9") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 9, _("Via 10") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 10, _("Via 11") );
|
||||||
|
m_gridViaSizeList->SetRowLabelValue( 11, _("Via 12") );
|
||||||
|
m_gridViaSizeList->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
|
||||||
|
|
||||||
|
// Label Appearance
|
||||||
|
|
||||||
|
// Cell Defaults
|
||||||
|
m_gridViaSizeList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
|
||||||
|
sViaSizeBox->Add( m_gridViaSizeList, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bpanelGlobRulesSizer->Add( bDesignRulesLowerSizer, 0, wxEXPAND, 5 );
|
bpanelGlobRulesSizer->Add( sViaSizeBox, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer );
|
m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer );
|
||||||
|
@ -409,12 +397,15 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
bMainSizer->Fit( this );
|
bMainSizer->Fit( this );
|
||||||
|
|
||||||
// Connect Events
|
// Connect Events
|
||||||
|
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_DESIGN_RULES_BASE::OnUpdateUI ) );
|
||||||
m_DRnotebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_DESIGN_RULES_BASE::OnNotebookPageChanged ), NULL, this );
|
m_DRnotebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_DESIGN_RULES_BASE::OnNotebookPageChanged ), NULL, this );
|
||||||
m_grid->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameLeftClick ), NULL, this );
|
m_grid->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameLeftClick ), NULL, this );
|
||||||
m_grid->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameRightClick ), NULL, this );
|
m_grid->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameRightClick ), NULL, this );
|
||||||
|
m_grid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_DESIGN_RULES_BASE::OnSizeNetclassGrid ), NULL, this );
|
||||||
m_addButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnAddNetclassClick ), NULL, this );
|
m_addButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnAddNetclassClick ), NULL, this );
|
||||||
m_removeButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRemoveNetclassClick ), NULL, this );
|
m_removeButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRemoveNetclassClick ), NULL, this );
|
||||||
m_moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnMoveUpSelectedNetClass ), NULL, this );
|
m_moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnMoveUpSelectedNetClass ), NULL, this );
|
||||||
|
m_moveDownButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnMoveDownSelectedNetClass ), NULL, this );
|
||||||
m_leftClassChoice->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftCBSelection ), NULL, this );
|
m_leftClassChoice->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftCBSelection ), NULL, this );
|
||||||
m_buttonLeftSelAll->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftSelectAllButton ), NULL, this );
|
m_buttonLeftSelAll->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftSelectAllButton ), NULL, this );
|
||||||
m_buttonRightToLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRightToLeftCopyButton ), NULL, this );
|
m_buttonRightToLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRightToLeftCopyButton ), NULL, this );
|
||||||
|
@ -427,12 +418,15 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
|
||||||
DIALOG_DESIGN_RULES_BASE::~DIALOG_DESIGN_RULES_BASE()
|
DIALOG_DESIGN_RULES_BASE::~DIALOG_DESIGN_RULES_BASE()
|
||||||
{
|
{
|
||||||
// Disconnect Events
|
// Disconnect Events
|
||||||
|
this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_DESIGN_RULES_BASE::OnUpdateUI ) );
|
||||||
m_DRnotebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_DESIGN_RULES_BASE::OnNotebookPageChanged ), NULL, this );
|
m_DRnotebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_DESIGN_RULES_BASE::OnNotebookPageChanged ), NULL, this );
|
||||||
m_grid->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameLeftClick ), NULL, this );
|
m_grid->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameLeftClick ), NULL, this );
|
||||||
m_grid->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameRightClick ), NULL, this );
|
m_grid->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( DIALOG_DESIGN_RULES_BASE::OnNetClassesNameRightClick ), NULL, this );
|
||||||
|
m_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_DESIGN_RULES_BASE::OnSizeNetclassGrid ), NULL, this );
|
||||||
m_addButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnAddNetclassClick ), NULL, this );
|
m_addButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnAddNetclassClick ), NULL, this );
|
||||||
m_removeButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRemoveNetclassClick ), NULL, this );
|
m_removeButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRemoveNetclassClick ), NULL, this );
|
||||||
m_moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnMoveUpSelectedNetClass ), NULL, this );
|
m_moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnMoveUpSelectedNetClass ), NULL, this );
|
||||||
|
m_moveDownButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnMoveDownSelectedNetClass ), NULL, this );
|
||||||
m_leftClassChoice->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftCBSelection ), NULL, this );
|
m_leftClassChoice->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftCBSelection ), NULL, this );
|
||||||
m_buttonLeftSelAll->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftSelectAllButton ), NULL, this );
|
m_buttonLeftSelAll->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnLeftSelectAllButton ), NULL, this );
|
||||||
m_buttonRightToLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRightToLeftCopyButton ), NULL, this );
|
m_buttonRightToLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRightToLeftCopyButton ), NULL, this );
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Apr 19 2018)
|
// C++ code generated with wxFormBuilder (version Dec 30 2017)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
@ -20,6 +20,10 @@ class NETS_LIST_CTRL;
|
||||||
#include <wx/font.h>
|
#include <wx/font.h>
|
||||||
#include <wx/grid.h>
|
#include <wx/grid.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
|
#include <wx/bitmap.h>
|
||||||
|
#include <wx/image.h>
|
||||||
|
#include <wx/icon.h>
|
||||||
|
#include <wx/bmpbuttn.h>
|
||||||
#include <wx/button.h>
|
#include <wx/button.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/statbox.h>
|
#include <wx/statbox.h>
|
||||||
|
@ -27,9 +31,6 @@ class NETS_LIST_CTRL;
|
||||||
#include <wx/statline.h>
|
#include <wx/statline.h>
|
||||||
#include <wx/listctrl.h>
|
#include <wx/listctrl.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/bitmap.h>
|
|
||||||
#include <wx/image.h>
|
|
||||||
#include <wx/icon.h>
|
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/valtext.h>
|
#include <wx/valtext.h>
|
||||||
|
@ -49,18 +50,17 @@ class DIALOG_DESIGN_RULES_BASE : public DIALOG_SHIM
|
||||||
protected:
|
protected:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
wxID_ADD_NETCLASS = 1000,
|
ID_LEFT_TO_RIGHT_COPY = 1000,
|
||||||
wxID_REMOVE_NETCLASS,
|
|
||||||
ID_LEFT_TO_RIGHT_COPY,
|
|
||||||
ID_RIGHT_TO_LEFT_COPY
|
ID_RIGHT_TO_LEFT_COPY
|
||||||
};
|
};
|
||||||
|
|
||||||
wxNotebook* m_DRnotebook;
|
wxNotebook* m_DRnotebook;
|
||||||
wxPanel* m_panelNetClassesEditor;
|
wxPanel* m_panelNetClassesEditor;
|
||||||
wxGrid* m_grid;
|
wxGrid* m_grid;
|
||||||
wxButton* m_addButton;
|
wxBitmapButton* m_addButton;
|
||||||
wxButton* m_removeButton;
|
wxBitmapButton* m_removeButton;
|
||||||
wxButton* m_moveUpButton;
|
wxBitmapButton* m_moveUpButton;
|
||||||
|
wxBitmapButton* m_moveDownButton;
|
||||||
wxComboBox* m_leftClassChoice;
|
wxComboBox* m_leftClassChoice;
|
||||||
wxStaticLine* m_staticline21;
|
wxStaticLine* m_staticline21;
|
||||||
wxButton* m_buttonLeftSelAll;
|
wxButton* m_buttonLeftSelAll;
|
||||||
|
@ -89,23 +89,23 @@ class DIALOG_DESIGN_RULES_BASE : public DIALOG_SHIM
|
||||||
wxStaticText* m_MicroViaMinDrillTitle;
|
wxStaticText* m_MicroViaMinDrillTitle;
|
||||||
wxTextCtrl* m_SetMicroViasMinDrillCtrl;
|
wxTextCtrl* m_SetMicroViasMinDrillCtrl;
|
||||||
wxStaticText* m_MicroViaMinDrillUnits;
|
wxStaticText* m_MicroViaMinDrillUnits;
|
||||||
wxStaticText* m_staticTextInfo;
|
|
||||||
wxStaticText* m_staticText7;
|
|
||||||
wxGrid* m_gridViaSizeList;
|
|
||||||
wxStaticText* m_staticText8;
|
|
||||||
wxGrid* m_gridTrackWidthList;
|
wxGrid* m_gridTrackWidthList;
|
||||||
|
wxGrid* m_gridViaSizeList;
|
||||||
wxStaticLine* m_staticline2;
|
wxStaticLine* m_staticline2;
|
||||||
wxStdDialogButtonSizer* m_sdbSizer1;
|
wxStdDialogButtonSizer* m_sdbSizer1;
|
||||||
wxButton* m_sdbSizer1OK;
|
wxButton* m_sdbSizer1OK;
|
||||||
wxButton* m_sdbSizer1Cancel;
|
wxButton* m_sdbSizer1Cancel;
|
||||||
|
|
||||||
// Virtual event handlers, overide them in your derived class
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
||||||
virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); }
|
virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); }
|
||||||
virtual void OnNetClassesNameLeftClick( wxGridEvent& event ) { event.Skip(); }
|
virtual void OnNetClassesNameLeftClick( wxGridEvent& event ) { event.Skip(); }
|
||||||
virtual void OnNetClassesNameRightClick( wxGridEvent& event ) { event.Skip(); }
|
virtual void OnNetClassesNameRightClick( wxGridEvent& event ) { event.Skip(); }
|
||||||
|
virtual void OnSizeNetclassGrid( wxSizeEvent& event ) { event.Skip(); }
|
||||||
virtual void OnAddNetclassClick( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnAddNetclassClick( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnRemoveNetclassClick( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnRemoveNetclassClick( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ) { event.Skip(); }
|
||||||
|
virtual void OnMoveDownSelectedNetClass( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnLeftCBSelection( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnLeftCBSelection( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnLeftSelectAllButton( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnLeftSelectAllButton( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnRightToLeftCopyButton( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnRightToLeftCopyButton( wxCommandEvent& event ) { event.Skip(); }
|
||||||
|
|
Loading…
Reference in New Issue