Remove netclass/custom rule handling from Track & Via Properties.
(These should be done in Edit > Edit Track & Via Properties.) Fixes https://gitlab.com/kicad/code/kicad/-/issues/17216
This commit is contained in:
parent
1844bf1708
commit
4b6a1f4dbd
|
@ -101,8 +101,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
|
|||
|
||||
bool nets = false;
|
||||
int net = 0;
|
||||
bool tracksMatchNetclassValues = true;
|
||||
bool viasMatchNetclassValues = true;
|
||||
bool hasLocked = false;
|
||||
bool hasUnlocked = false;
|
||||
|
||||
|
@ -153,7 +151,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
|
|||
m_trackEndX.SetValue( t->GetEnd().x );
|
||||
m_trackEndY.SetValue( t->GetEnd().y );
|
||||
m_trackWidth.SetValue( t->GetWidth() );
|
||||
m_trackDesignRules->SetValue( false );
|
||||
track_selection_layer = t->GetLayer();
|
||||
m_tracks = true;
|
||||
}
|
||||
|
@ -178,16 +175,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
|
|||
track_selection_layer = UNDEFINED_LAYER;
|
||||
}
|
||||
|
||||
if( tracksMatchNetclassValues )
|
||||
{
|
||||
MINOPTMAX<int> constraint = t->GetWidthConstraint();
|
||||
|
||||
if( constraint.HasOpt() )
|
||||
tracksMatchNetclassValues &= constraint.Opt() == t->GetWidth();
|
||||
else if( constraint.Min() > 0 )
|
||||
tracksMatchNetclassValues &= constraint.Min() == t->GetWidth();
|
||||
}
|
||||
|
||||
if( t->IsLocked() )
|
||||
hasLocked = true;
|
||||
else
|
||||
|
@ -285,23 +272,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
|
|||
}
|
||||
}
|
||||
|
||||
if( viasMatchNetclassValues )
|
||||
{
|
||||
MINOPTMAX<int> constraint = v->GetWidthConstraint();
|
||||
|
||||
if( constraint.HasOpt() )
|
||||
viasMatchNetclassValues &= constraint.Opt() == v->GetWidth();
|
||||
else if( constraint.Min() > 0 )
|
||||
viasMatchNetclassValues &= constraint.Min() == v->GetWidth();
|
||||
|
||||
constraint = v->GetDrillConstraint();
|
||||
|
||||
if( constraint.HasOpt() )
|
||||
viasMatchNetclassValues &= constraint.Opt() == v->GetDrillValue();
|
||||
else if( constraint.Min() > 0 )
|
||||
viasMatchNetclassValues &= constraint.Min() == v->GetDrillValue();
|
||||
}
|
||||
|
||||
if( v->IsLocked() )
|
||||
hasLocked = true;
|
||||
else
|
||||
|
@ -376,17 +346,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
|
|||
m_netSelector->Disable();
|
||||
}
|
||||
|
||||
if( viasMatchNetclassValues )
|
||||
{
|
||||
m_viaDesignRules->SetValue( true );
|
||||
|
||||
m_predefinedViaSizesLabel->Enable( false );
|
||||
m_predefinedViaSizesCtrl->Enable( false );
|
||||
m_predefinedViaSizesUnits->Enable( false );
|
||||
m_viaDiameter.Enable( false );
|
||||
m_viaDrill.Enable( false );
|
||||
}
|
||||
|
||||
int viaSelection = wxNOT_FOUND;
|
||||
|
||||
// 0 is the netclass place-holder
|
||||
|
@ -433,16 +392,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
|
|||
|
||||
if( m_tracks )
|
||||
{
|
||||
if( tracksMatchNetclassValues )
|
||||
{
|
||||
m_trackDesignRules->SetValue( true );
|
||||
|
||||
m_predefinedTrackWidthsLabel->Enable( false );
|
||||
m_predefinedTrackWidthsCtrl->Enable( false );
|
||||
m_predefinedTrackWidthsUnits->Enable( false );
|
||||
m_trackWidth.Enable( false );
|
||||
}
|
||||
|
||||
int widthSelection = wxNOT_FOUND;
|
||||
|
||||
// 0 is the netclass place-holder
|
||||
|
@ -645,19 +594,8 @@ bool DIALOG_TRACK_VIA_PROPERTIES::TransferDataFromWindow()
|
|||
if( !m_trackEndY.IsIndeterminate() )
|
||||
t->SetEnd( VECTOR2I( t->GetEnd().x, m_trackEndY.GetIntValue() ) );
|
||||
|
||||
if( m_trackDesignRules->IsChecked() )
|
||||
{
|
||||
MINOPTMAX<int> constraint = t->GetWidthConstraint();
|
||||
|
||||
if( constraint.HasOpt() )
|
||||
t->SetWidth( constraint.Opt() );
|
||||
else if( constraint.Min() > 0 )
|
||||
t->SetWidth( constraint.Min() );
|
||||
}
|
||||
else if( !m_trackWidth.IsIndeterminate() )
|
||||
{
|
||||
if( !m_trackWidth.IsIndeterminate() )
|
||||
t->SetWidth( m_trackWidth.GetIntValue() );
|
||||
}
|
||||
|
||||
int layer = m_TrackLayerCtrl->GetLayerSelection();
|
||||
|
||||
|
@ -728,30 +666,11 @@ bool DIALOG_TRACK_VIA_PROPERTIES::TransferDataFromWindow()
|
|||
|
||||
v->SanitizeLayers();
|
||||
|
||||
if( m_viaDesignRules->IsChecked() )
|
||||
{
|
||||
MINOPTMAX<int> constraint = v->GetWidthConstraint();
|
||||
if( !m_viaDiameter.IsIndeterminate() )
|
||||
v->SetWidth( m_viaDiameter.GetIntValue() );
|
||||
|
||||
if( constraint.HasOpt() )
|
||||
v->SetWidth( constraint.Opt() );
|
||||
else if( constraint.Min() > 0 )
|
||||
v->SetWidth( constraint.Min() );
|
||||
|
||||
constraint = v->GetDrillConstraint();
|
||||
|
||||
if( constraint.HasOpt() )
|
||||
v->SetDrill( constraint.Opt() );
|
||||
else if( constraint.Min() > 0 )
|
||||
v->SetDrill( constraint.Min() );
|
||||
}
|
||||
else
|
||||
{
|
||||
if( !m_viaDiameter.IsIndeterminate() )
|
||||
v->SetWidth( m_viaDiameter.GetIntValue() );
|
||||
|
||||
if( !m_viaDrill.IsIndeterminate() )
|
||||
v->SetDrill( m_viaDrill.GetIntValue() );
|
||||
}
|
||||
if( !m_viaDrill.IsIndeterminate() )
|
||||
v->SetDrill( m_viaDrill.GetIntValue() );
|
||||
|
||||
TEARDROP_PARAMETERS* targetParams = &v->GetTeardropParams();
|
||||
|
||||
|
@ -885,18 +804,6 @@ void DIALOG_TRACK_VIA_PROPERTIES::onViaNotFreeClicked( wxCommandEvent& aEvent )
|
|||
}
|
||||
|
||||
|
||||
void DIALOG_TRACK_VIA_PROPERTIES::onTrackNetclassCheck( wxCommandEvent& aEvent )
|
||||
{
|
||||
bool enableNC = aEvent.IsChecked();
|
||||
|
||||
m_predefinedTrackWidthsLabel->Enable( !enableNC );
|
||||
m_predefinedTrackWidthsCtrl->Enable( !enableNC );
|
||||
m_predefinedTrackWidthsUnits->Enable( !enableNC );
|
||||
|
||||
m_trackWidth.Enable( !enableNC );
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_TRACK_VIA_PROPERTIES::onWidthSelect( wxCommandEvent& aEvent )
|
||||
{
|
||||
m_TrackWidthCtrl->ChangeValue( m_predefinedTrackWidthsCtrl->GetStringSelection() );
|
||||
|
@ -910,19 +817,6 @@ void DIALOG_TRACK_VIA_PROPERTIES::onWidthEdit( wxCommandEvent& aEvent )
|
|||
}
|
||||
|
||||
|
||||
void DIALOG_TRACK_VIA_PROPERTIES::onViaNetclassCheck( wxCommandEvent& aEvent )
|
||||
{
|
||||
bool enableNC = aEvent.IsChecked();
|
||||
|
||||
m_predefinedViaSizesLabel->Enable( !enableNC );
|
||||
m_predefinedViaSizesCtrl->Enable( !enableNC );
|
||||
m_predefinedViaSizesUnits->Enable( !enableNC );
|
||||
|
||||
m_viaDiameter.Enable( !enableNC );
|
||||
m_viaDrill.Enable( !enableNC );
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_TRACK_VIA_PROPERTIES::onViaSelect( wxCommandEvent& aEvent )
|
||||
{
|
||||
VIA_DIMENSION* viaDimension = static_cast<VIA_DIMENSION*> ( aEvent.GetClientData() );
|
||||
|
|
|
@ -44,10 +44,8 @@ public:
|
|||
private:
|
||||
void onNetSelector( wxCommandEvent& aEvent );
|
||||
void onViaNotFreeClicked( wxCommandEvent& aEvent ) override;
|
||||
void onTrackNetclassCheck( wxCommandEvent& aEvent ) override;
|
||||
void onWidthSelect( wxCommandEvent& aEvent ) override;
|
||||
void onWidthEdit( wxCommandEvent& aEvent ) override;
|
||||
void onViaNetclassCheck( wxCommandEvent& aEvent ) override;
|
||||
void onViaSelect( wxCommandEvent& aEvent ) override;
|
||||
void onViaEdit( wxCommandEvent& aEvent ) override;
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
bNetWidgetsLeftCol->Add( m_netSelector, 1, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
|
||||
bSizerNetWidgets->Add( bNetWidgetsLeftCol, 1, wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
|
||||
bSizerNetWidgets->Add( bNetWidgetsLeftCol, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
|
||||
|
||||
wxBoxSizer* bNetWidgetsRightCol;
|
||||
bNetWidgetsRightCol = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
@ -47,10 +47,10 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
bSizerNetWidgets->Add( bNetWidgetsRightCol, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
|
||||
|
||||
|
||||
m_sbCommonSizer->Add( bSizerNetWidgets, 5, wxEXPAND|wxLEFT|wxRIGHT, 5 );
|
||||
m_sbCommonSizer->Add( bSizerNetWidgets, 5, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
m_staticline1 = new wxStaticLine( m_sbCommonSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
m_sbCommonSizer->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxTOP, 2 );
|
||||
m_sbCommonSizer->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 2 );
|
||||
|
||||
|
||||
m_sbCommonSizer->Add( 0, 5, 0, wxEXPAND, 5 );
|
||||
|
@ -116,10 +116,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
gbSizer1 = new wxGridBagSizer( 3, 3 );
|
||||
gbSizer1->SetFlexibleDirection( wxBOTH );
|
||||
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
m_trackDesignRules = new wxCheckBox( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("Use net class / custom rule widths"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_trackDesignRules->SetValue(true);
|
||||
gbSizer1->Add( m_trackDesignRules, wxGBPosition( 0, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
|
||||
gbSizer1->SetEmptyCellSize( wxSize( -1,0 ) );
|
||||
|
||||
m_predefinedTrackWidthsLabel = new wxStaticText( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("Pre-defined sizes:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_predefinedTrackWidthsLabel->Wrap( -1 );
|
||||
|
@ -218,9 +215,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
gbSizer3 = new wxGridBagSizer( 3, 3 );
|
||||
gbSizer3->SetFlexibleDirection( wxBOTH );
|
||||
gbSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
m_viaDesignRules = new wxCheckBox( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Use net class / custom rule sizes"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
gbSizer3->Add( m_viaDesignRules, wxGBPosition( 0, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
|
||||
gbSizer3->SetEmptyCellSize( wxSize( -1,0 ) );
|
||||
|
||||
m_predefinedViaSizesLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Pre-defined sizes:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_predefinedViaSizesLabel->Wrap( -1 );
|
||||
|
@ -237,7 +232,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
|
||||
m_ViaDiameterLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via diameter:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_ViaDiameterLabel->Wrap( -1 );
|
||||
gbSizer3->Add( m_ViaDiameterLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxLEFT, 1 );
|
||||
gbSizer3->Add( m_ViaDiameterLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 1 );
|
||||
|
||||
m_ViaDiameterCtrl = new wxTextCtrl( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
gbSizer3->Add( m_ViaDiameterCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||
|
@ -272,7 +267,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
viaRightColumn = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer4;
|
||||
fgSizer4 = new wxFlexGridSizer( 0, 2, 3, 5 );
|
||||
fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 5 );
|
||||
fgSizer4->AddGrowableCol( 1 );
|
||||
fgSizer4->AddGrowableRow( 0 );
|
||||
fgSizer4->AddGrowableRow( 1 );
|
||||
|
@ -592,10 +587,8 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
|
|||
|
||||
// Connect Events
|
||||
m_viaNotFree->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNotFreeClicked ), NULL, this );
|
||||
m_trackDesignRules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onTrackNetclassCheck ), NULL, this );
|
||||
m_predefinedTrackWidthsCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthSelect ), NULL, this );
|
||||
m_TrackWidthCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthEdit ), NULL, this );
|
||||
m_viaDesignRules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNetclassCheck ), NULL, this );
|
||||
m_predefinedViaSizesCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaSelect ), NULL, this );
|
||||
m_ViaDiameterCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
|
||||
m_ViaDrillCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
|
||||
|
@ -634,10 +627,8 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::~DIALOG_TRACK_VIA_PROPERTIES_BASE()
|
|||
{
|
||||
// Disconnect Events
|
||||
m_viaNotFree->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNotFreeClicked ), NULL, this );
|
||||
m_trackDesignRules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onTrackNetclassCheck ), NULL, this );
|
||||
m_predefinedTrackWidthsCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthSelect ), NULL, this );
|
||||
m_TrackWidthCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthEdit ), NULL, this );
|
||||
m_viaDesignRules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNetclassCheck ), NULL, this );
|
||||
m_predefinedViaSizesCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaSelect ), NULL, this );
|
||||
m_ViaDiameterCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
|
||||
m_ViaDrillCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
<property name="permission">protected</property>
|
||||
<object class="sizeritem" expanded="true">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
|
||||
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
|
||||
<property name="proportion">5</property>
|
||||
<object class="wxBoxSizer" expanded="true">
|
||||
<property name="minimum_size"></property>
|
||||
|
@ -85,7 +85,7 @@
|
|||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="true">
|
||||
<property name="border">10</property>
|
||||
<property name="flag">wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
|
||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="wxBoxSizer" expanded="true">
|
||||
<property name="minimum_size"></property>
|
||||
|
@ -300,7 +300,7 @@
|
|||
</object>
|
||||
<object class="sizeritem" expanded="true">
|
||||
<property name="border">2</property>
|
||||
<property name="flag">wxBOTTOM|wxEXPAND|wxTOP</property>
|
||||
<property name="flag">wxEXPAND|wxBOTTOM</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticLine" expanded="true">
|
||||
<property name="BottomDockable">1</property>
|
||||
|
@ -1110,7 +1110,7 @@
|
|||
<property name="flag">wxEXPAND|wxTOP</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="wxGridBagSizer" expanded="true">
|
||||
<property name="empty_cell_size"></property>
|
||||
<property name="empty_cell_size">-1,0</property>
|
||||
<property name="flexible_direction">wxBOTH</property>
|
||||
<property name="growablecols">1</property>
|
||||
<property name="growablerows"></property>
|
||||
|
@ -1120,75 +1120,6 @@
|
|||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="vgap">3</property>
|
||||
<object class="gbsizeritem" expanded="true">
|
||||
<property name="border">1</property>
|
||||
<property name="colspan">2</property>
|
||||
<property name="column">0</property>
|
||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
|
||||
<property name="row">0</property>
|
||||
<property name="rowspan">1</property>
|
||||
<object class="wxCheckBox" expanded="false">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
<property name="TopDockable">1</property>
|
||||
<property name="aui_layer"></property>
|
||||
<property name="aui_name"></property>
|
||||
<property name="aui_position"></property>
|
||||
<property name="aui_row"></property>
|
||||
<property name="best_size"></property>
|
||||
<property name="bg"></property>
|
||||
<property name="caption"></property>
|
||||
<property name="caption_visible">1</property>
|
||||
<property name="center_pane">0</property>
|
||||
<property name="checked">1</property>
|
||||
<property name="close_button">1</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default_pane">0</property>
|
||||
<property name="dock">Dock</property>
|
||||
<property name="dock_fixed">0</property>
|
||||
<property name="docking">Left</property>
|
||||
<property name="drag_accept_files">0</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="floatable">1</property>
|
||||
<property name="font"></property>
|
||||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">Use net class / custom rule widths</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="min_size"></property>
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_trackDesignRules</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pin_button">1</property>
|
||||
<property name="pos"></property>
|
||||
<property name="resize">Resizable</property>
|
||||
<property name="show">1</property>
|
||||
<property name="size"></property>
|
||||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnCheckBox">onTrackNetclassCheck</event>
|
||||
</object>
|
||||
</object>
|
||||
<object class="gbsizeritem" expanded="true">
|
||||
<property name="border">1</property>
|
||||
<property name="colspan">1</property>
|
||||
|
@ -2128,7 +2059,7 @@
|
|||
<property name="flag">wxEXPAND|wxTOP</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="wxGridBagSizer" expanded="true">
|
||||
<property name="empty_cell_size"></property>
|
||||
<property name="empty_cell_size">-1,0</property>
|
||||
<property name="flexible_direction">wxBOTH</property>
|
||||
<property name="growablecols">1</property>
|
||||
<property name="growablerows"></property>
|
||||
|
@ -2138,75 +2069,6 @@
|
|||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="vgap">3</property>
|
||||
<object class="gbsizeritem" expanded="true">
|
||||
<property name="border">1</property>
|
||||
<property name="colspan">2</property>
|
||||
<property name="column">0</property>
|
||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
|
||||
<property name="row">0</property>
|
||||
<property name="rowspan">1</property>
|
||||
<object class="wxCheckBox" expanded="false">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
<property name="TopDockable">1</property>
|
||||
<property name="aui_layer"></property>
|
||||
<property name="aui_name"></property>
|
||||
<property name="aui_position"></property>
|
||||
<property name="aui_row"></property>
|
||||
<property name="best_size"></property>
|
||||
<property name="bg"></property>
|
||||
<property name="caption"></property>
|
||||
<property name="caption_visible">1</property>
|
||||
<property name="center_pane">0</property>
|
||||
<property name="checked">0</property>
|
||||
<property name="close_button">1</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default_pane">0</property>
|
||||
<property name="dock">Dock</property>
|
||||
<property name="dock_fixed">0</property>
|
||||
<property name="docking">Left</property>
|
||||
<property name="drag_accept_files">0</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="floatable">1</property>
|
||||
<property name="font"></property>
|
||||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">Use net class / custom rule sizes</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="min_size"></property>
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_viaDesignRules</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pin_button">1</property>
|
||||
<property name="pos"></property>
|
||||
<property name="resize">Resizable</property>
|
||||
<property name="show">1</property>
|
||||
<property name="size"></property>
|
||||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnCheckBox">onViaNetclassCheck</event>
|
||||
</object>
|
||||
</object>
|
||||
<object class="gbsizeritem" expanded="true">
|
||||
<property name="border">1</property>
|
||||
<property name="colspan">1</property>
|
||||
|
@ -2410,7 +2272,7 @@
|
|||
<property name="border">1</property>
|
||||
<property name="colspan">1</property>
|
||||
<property name="column">0</property>
|
||||
<property name="flag">wxLEFT</property>
|
||||
<property name="flag">wxLEFT|wxALIGN_CENTER_VERTICAL</property>
|
||||
<property name="row">2</property>
|
||||
<property name="rowspan">1</property>
|
||||
<object class="wxStaticText" expanded="false">
|
||||
|
@ -2842,7 +2704,7 @@
|
|||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="rows">0</property>
|
||||
<property name="vgap">3</property>
|
||||
<property name="vgap">0</property>
|
||||
<object class="sizeritem" expanded="true">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
|
||||
|
|
|
@ -71,7 +71,6 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
|
|||
wxStaticText* m_TrackEndYLabel;
|
||||
wxTextCtrl* m_TrackEndYCtrl;
|
||||
wxStaticText* m_TrackEndYUnit;
|
||||
wxCheckBox* m_trackDesignRules;
|
||||
wxStaticText* m_predefinedTrackWidthsLabel;
|
||||
wxChoice* m_predefinedTrackWidthsCtrl;
|
||||
wxStaticText* m_predefinedTrackWidthsUnits;
|
||||
|
@ -86,7 +85,6 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
|
|||
wxStaticText* m_ViaYLabel;
|
||||
wxTextCtrl* m_ViaYCtrl;
|
||||
wxStaticText* m_ViaYUnit;
|
||||
wxCheckBox* m_viaDesignRules;
|
||||
wxStaticText* m_predefinedViaSizesLabel;
|
||||
wxChoice* m_predefinedViaSizesCtrl;
|
||||
wxStaticText* m_predefinedViaSizesUnits;
|
||||
|
@ -135,10 +133,8 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
|
|||
|
||||
// Virtual event handlers, override them in your derived class
|
||||
virtual void onViaNotFreeClicked( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onTrackNetclassCheck( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onWidthSelect( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onWidthEdit( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onViaNetclassCheck( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onViaSelect( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onViaEdit( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onTeardropsUpdateUi( wxUpdateUIEvent& event ) { event.Skip(); }
|
||||
|
|
Loading…
Reference in New Issue