diff --git a/pcbnew/dialogs/dialog_global_edit_teardrops.cpp b/pcbnew/dialogs/dialog_global_edit_teardrops.cpp index b2c229b772..27d8705020 100644 --- a/pcbnew/dialogs/dialog_global_edit_teardrops.cpp +++ b/pcbnew/dialogs/dialog_global_edit_teardrops.cpp @@ -146,9 +146,9 @@ private: DIALOG_GLOBAL_EDIT_TEARDROPS::DIALOG_GLOBAL_EDIT_TEARDROPS( PCB_EDIT_FRAME* aParent ) : DIALOG_GLOBAL_EDIT_TEARDROPS_BASE( aParent ), m_teardropHDPercent( aParent, m_stHDRatio, m_tcHDRatio, m_stHDRatioUnits ), - m_teardropLenPercent( aParent, m_stLenPercentLabel, m_tcLenPercent, m_stLenPercentUnits ), + m_teardropLenPercent( aParent, m_stLenPercentLabel, m_tcLenPercent, nullptr ), m_teardropMaxLen( aParent, m_stMaxLen, m_tcTdMaxLen, m_stMaxLenUnits ), - m_teardropHeightPercent( aParent, m_stHeightPercentLabel, m_tcHeightPercent, m_stHeightPercentUnits ), + m_teardropHeightPercent( aParent, m_stHeightPercentLabel, m_tcHeightPercent, nullptr ), m_teardropMaxHeight( aParent, m_stMaxHeight, m_tcMaxHeight, m_stMaxHeightUnits ) { m_parent = aParent; diff --git a/pcbnew/dialogs/dialog_global_edit_teardrops_base.cpp b/pcbnew/dialogs/dialog_global_edit_teardrops_base.cpp index f2e66676d7..ddf392122f 100644 --- a/pcbnew/dialogs/dialog_global_edit_teardrops_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_teardrops_base.cpp @@ -143,7 +143,7 @@ DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::DIALOG_GLOBAL_EDIT_TEARDROPS_BASE( wxWindow* bSizerLeftCol11->Add( m_cbPreferZoneConnection, 0, wxBOTTOM|wxRIGHT, 5 ); - m_cbTeardropsUseNextTrack = new wxCheckBox( sbAction->GetStaticBox(), wxID_ANY, _("Allow teardrops to span 2 track segments"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); + m_cbTeardropsUseNextTrack = new wxCheckBox( sbAction->GetStaticBox(), wxID_ANY, _("Allow teardrops to span two track segments"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_cbTeardropsUseNextTrack->SetToolTip( _("Allows a teardrop to spread over 2 tracks if the first track segment is too short") ); bSizerLeftCol11->Add( m_cbTeardropsUseNextTrack, 0, wxBOTTOM|wxRIGHT, 5 ); @@ -178,7 +178,7 @@ DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::DIALOG_GLOBAL_EDIT_TEARDROPS_BASE( wxWindow* bSizerRightCol11->Add( bSizer39, 0, wxEXPAND, 3 ); - m_minTrackWidthHint = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("(as a percentage of pad/via size)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_minTrackWidthHint = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("(as a percentage of pad/via minor dimension)"), wxDefaultPosition, wxDefaultSize, 0 ); m_minTrackWidthHint->Wrap( -1 ); bSizerRightCol11->Add( m_minTrackWidthHint, 0, wxTOP|wxBOTTOM|wxLEFT, 2 ); @@ -221,18 +221,34 @@ DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::DIALOG_GLOBAL_EDIT_TEARDROPS_BASE( wxWindow* fgSizerRightCol->SetFlexibleDirection( wxBOTH ); fgSizerRightCol->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_stLenPercentLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Best length:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stLenPercentLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Best length (L):"), wxDefaultPosition, wxDefaultSize, 0 ); m_stLenPercentLabel->Wrap( -1 ); fgSizerRightCol->Add( m_stLenPercentLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_tcLenPercent = new wxTextCtrl( sbAction->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRightCol->Add( m_tcLenPercent, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_stLenPercentUnits = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stLenPercentUnits->Wrap( -1 ); - fgSizerRightCol->Add( m_stLenPercentUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + wxBoxSizer* bSizer131; + bSizer131 = new wxBoxSizer( wxHORIZONTAL ); - m_stMaxLen = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Maximum length:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lengthUnitsPrefix = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + m_lengthUnitsPrefix->Wrap( -1 ); + bSizer131->Add( m_lengthUnitsPrefix, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_lengthUnitsHint = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lengthUnitsHint->Wrap( -1 ); + m_lengthUnitsHint->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bSizer131->Add( m_lengthUnitsHint, 0, wxALIGN_BOTTOM, 1 ); + + m_lengthUnitsSuffix = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lengthUnitsSuffix->Wrap( -1 ); + bSizer131->Add( m_lengthUnitsSuffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + fgSizerRightCol->Add( bSizer131, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_stMaxLen = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Maximum length (L):"), wxDefaultPosition, wxDefaultSize, 0 ); m_stMaxLen->Wrap( -1 ); fgSizerRightCol->Add( m_stMaxLen, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -252,18 +268,34 @@ DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::DIALOG_GLOBAL_EDIT_TEARDROPS_BASE( wxWindow* fgSizerRightCol->Add( 0, 0, 1, wxEXPAND, 5 ); - m_stHeightPercentLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Best height:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stHeightPercentLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Best width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); m_stHeightPercentLabel->Wrap( -1 ); fgSizerRightCol->Add( m_stHeightPercentLabel, 0, wxALIGN_CENTER_VERTICAL, 10 ); m_tcHeightPercent = new wxTextCtrl( sbAction->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRightCol->Add( m_tcHeightPercent, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_stHeightPercentUnits = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stHeightPercentUnits->Wrap( -1 ); - fgSizerRightCol->Add( m_stHeightPercentUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + wxBoxSizer* bSizer1311; + bSizer1311 = new wxBoxSizer( wxHORIZONTAL ); - m_stMaxHeight = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Maximum height:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_widthUnitsPrefix = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + m_widthUnitsPrefix->Wrap( -1 ); + bSizer1311->Add( m_widthUnitsPrefix, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_widthUnitsHint = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_widthUnitsHint->Wrap( -1 ); + m_widthUnitsHint->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bSizer1311->Add( m_widthUnitsHint, 0, wxALIGN_BOTTOM, 1 ); + + m_widthUnitsSuffix = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + m_widthUnitsSuffix->Wrap( -1 ); + bSizer1311->Add( m_widthUnitsSuffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + fgSizerRightCol->Add( bSizer1311, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_stMaxHeight = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Maximum width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); m_stMaxHeight->Wrap( -1 ); fgSizerRightCol->Add( m_stMaxHeight, 0, wxALIGN_CENTER_VERTICAL, 10 ); @@ -349,13 +381,17 @@ DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::DIALOG_GLOBAL_EDIT_TEARDROPS_BASE( wxWindow* m_bitmapTeardrop->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stLenPercentLabel->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcLenPercent->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); - m_stLenPercentUnits->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_lengthUnitsPrefix->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_lengthUnitsHint->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_lengthUnitsSuffix->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxLen->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcTdMaxLen->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxLenUnits->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stHeightPercentLabel->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcHeightPercent->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); - m_stHeightPercentUnits->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_widthUnitsPrefix->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_widthUnitsHint->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_widthUnitsSuffix->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxHeight->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcMaxHeight->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxHeightUnits->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); @@ -390,13 +426,17 @@ DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::~DIALOG_GLOBAL_EDIT_TEARDROPS_BASE() m_bitmapTeardrop->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stLenPercentLabel->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcLenPercent->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); - m_stLenPercentUnits->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_lengthUnitsPrefix->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_lengthUnitsHint->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_lengthUnitsSuffix->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxLen->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcTdMaxLen->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxLenUnits->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stHeightPercentLabel->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcHeightPercent->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); - m_stHeightPercentUnits->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_widthUnitsPrefix->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_widthUnitsHint->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_widthUnitsSuffix->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxHeight->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_tcMaxHeight->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); m_stMaxHeightUnits->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEARDROPS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_global_edit_teardrops_base.fbp b/pcbnew/dialogs/dialog_global_edit_teardrops_base.fbp index cf7fa1a56d..93b0d14c6f 100644 --- a/pcbnew/dialogs/dialog_global_edit_teardrops_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_teardrops_base.fbp @@ -1436,7 +1436,7 @@ 0 0 wxID_ANY - Allow teardrops to span 2 track segments + Allow teardrops to span two track segments 0 @@ -1725,7 +1725,7 @@ 0 0 wxID_ANY - (as a percentage of pad/via size) + (as a percentage of pad/via minor dimension) 0 0 @@ -1928,7 +1928,7 @@ 0 0 wxID_ANY - Best length: + Best length (L): 0 0 @@ -2024,67 +2024,204 @@ onSpecifiedValuesUpdateUi - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - % - 0 - - 0 - - - 0 + - 1 - m_stLenPercentUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - onSpecifiedValuesUpdateUi + bSizer131 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + %( + 0 + + 0 + + + 0 + + 1 + m_lengthUnitsPrefix + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + onSpecifiedValuesUpdateUi + + + + 1 + wxALIGN_BOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + ,93,400,-1,70,0 + 0 + 0 + wxID_ANY + d + 0 + + 0 + + + 0 + + 1 + m_lengthUnitsHint + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + onSpecifiedValuesUpdateUi + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + ) + 0 + + 0 + + + 0 + + 1 + m_lengthUnitsSuffix + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + onSpecifiedValuesUpdateUi + + @@ -2120,7 +2257,7 @@ 0 0 wxID_ANY - Maximum length: + Maximum length (L): 0 0 @@ -2342,7 +2479,7 @@ 0 0 wxID_ANY - Best height: + Best width (W): 0 0 @@ -2438,67 +2575,204 @@ onSpecifiedValuesUpdateUi - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - % - 0 - - 0 - - - 0 + - 1 - m_stHeightPercentUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - onSpecifiedValuesUpdateUi + bSizer1311 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + %( + 0 + + 0 + + + 0 + + 1 + m_widthUnitsPrefix + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + onSpecifiedValuesUpdateUi + + + + 1 + wxALIGN_BOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + ,93,400,-1,70,0 + 0 + 0 + wxID_ANY + d + 0 + + 0 + + + 0 + + 1 + m_widthUnitsHint + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + onSpecifiedValuesUpdateUi + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + ) + 0 + + 0 + + + 0 + + 1 + m_widthUnitsSuffix + 1 + + + private + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + onSpecifiedValuesUpdateUi + + @@ -2534,7 +2808,7 @@ 0 0 wxID_ANY - Maximum height: + Maximum width (W): 0 0 diff --git a/pcbnew/dialogs/dialog_global_edit_teardrops_base.h b/pcbnew/dialogs/dialog_global_edit_teardrops_base.h index ab46b331da..18f139f476 100644 --- a/pcbnew/dialogs/dialog_global_edit_teardrops_base.h +++ b/pcbnew/dialogs/dialog_global_edit_teardrops_base.h @@ -47,6 +47,12 @@ class PCB_LAYER_BOX_SELECTOR; class DIALOG_GLOBAL_EDIT_TEARDROPS_BASE : public DIALOG_SHIM { private: + wxStaticText* m_lengthUnitsPrefix; + wxStaticText* m_lengthUnitsHint; + wxStaticText* m_lengthUnitsSuffix; + wxStaticText* m_widthUnitsPrefix; + wxStaticText* m_widthUnitsHint; + wxStaticText* m_widthUnitsSuffix; protected: wxCheckBox* m_pthPads; @@ -75,13 +81,11 @@ class DIALOG_GLOBAL_EDIT_TEARDROPS_BASE : public DIALOG_SHIM wxStaticBitmap* m_bitmapTeardrop; wxStaticText* m_stLenPercentLabel; wxTextCtrl* m_tcLenPercent; - wxStaticText* m_stLenPercentUnits; wxStaticText* m_stMaxLen; wxTextCtrl* m_tcTdMaxLen; wxStaticText* m_stMaxLenUnits; wxStaticText* m_stHeightPercentLabel; wxTextCtrl* m_tcHeightPercent; - wxStaticText* m_stHeightPercentUnits; wxStaticText* m_stMaxHeight; wxTextCtrl* m_tcMaxHeight; wxStaticText* m_stMaxHeightUnits; diff --git a/pcbnew/dialogs/panel_setup_teardrops.cpp b/pcbnew/dialogs/panel_setup_teardrops.cpp index 01f9363c8b..e3d471d3a1 100644 --- a/pcbnew/dialogs/panel_setup_teardrops.cpp +++ b/pcbnew/dialogs/panel_setup_teardrops.cpp @@ -33,10 +33,10 @@ PANEL_SETUP_TEARDROPS::PANEL_SETUP_TEARDROPS( wxWindow* aParentWindow, PCB_EDIT_ m_BrdSettings( &aFrame->GetBoard()->GetDesignSettings() ), m_teardropMaxLenRound( aFrame, m_stMaxLen, m_tcTdMaxLen, m_stMaxLenUnits ), m_teardropMaxWidthRound( aFrame, m_stMaxWidthLabel, m_tcMaxWidth, m_stMaxWidthUnits ), - m_teardropMaxLenRect( aFrame, m_stMaxLen1, m_tcTdMaxLen1, m_stMaxLenUnits1 ), - m_teardropMaxWidthRect( aFrame, m_stMaxWidthLabel2, m_tcMaxWidth1, m_stMaxWidthUnits1 ), - m_teardropMaxLenT2T( aFrame, m_stMaxLen2, m_tcTdMaxLen2, m_stMaxLenUnits2 ), - m_teardropMaxWidthT2T( aFrame, m_stMaxWidthLabel2, m_tcMaxWidth2, m_stMaxWidthUnits2 ) + m_teardropMaxLenRect( aFrame, m_stMaxLen1, m_tcTdMaxLen1, m_stMaxLen1Units ), + m_teardropMaxWidthRect( aFrame, m_stMaxWidth2Label, m_tcMaxWidth1, m_stMaxWidth1Units ), + m_teardropMaxLenT2T( aFrame, m_stMaxLen2, m_tcTdMaxLen2, m_stMaxLen2Units ), + m_teardropMaxWidthT2T( aFrame, m_stMaxWidth2Label, m_tcMaxWidth2, m_stMaxWidth2Units ) { m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) ); m_bitmapTeardrop1->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_rect_sizes ) ); diff --git a/pcbnew/dialogs/panel_setup_teardrops_base.cpp b/pcbnew/dialogs/panel_setup_teardrops_base.cpp index 567971d464..c1c04ade35 100644 --- a/pcbnew/dialogs/panel_setup_teardrops_base.cpp +++ b/pcbnew/dialogs/panel_setup_teardrops_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -71,9 +71,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer131; bSizer131 = new wxBoxSizer( wxHORIZONTAL ); - m_stLenPercentUnits = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_stLenPercentUnits->Wrap( -1 ); - bSizer131->Add( m_stLenPercentUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stLenPercentUnits; + stLenPercentUnits = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stLenPercentUnits->Wrap( -1 ); + bSizer131->Add( stLenPercentUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticText* stLenPercentHint; stLenPercentHint = new wxStaticText( this, wxID_ANY, _("d"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -82,9 +83,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind bSizer131->Add( stLenPercentHint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText76 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText76->Wrap( -1 ); - bSizer131->Add( m_staticText76, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* staticText76; + staticText76 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText76->Wrap( -1 ); + bSizer131->Add( staticText76, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer->Add( bSizer131, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); @@ -111,9 +113,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer13; bSizer13 = new wxBoxSizer( wxHORIZONTAL ); - m_stWidthPercentUnits = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_stWidthPercentUnits->Wrap( -1 ); - bSizer13->Add( m_stWidthPercentUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stWidthPercentUnits; + stWidthPercentUnits = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stWidthPercentUnits->Wrap( -1 ); + bSizer13->Add( stWidthPercentUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticText* stWidthPercentHint; stWidthPercentHint = new wxStaticText( this, wxID_ANY, _("d"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -122,9 +125,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind bSizer13->Add( stWidthPercentHint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText77 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText77->Wrap( -1 ); - bSizer13->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stWidthPercentSuffix; + stWidthPercentSuffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stWidthPercentSuffix->Wrap( -1 ); + bSizer13->Add( stWidthPercentSuffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer->Add( bSizer13, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); @@ -167,9 +171,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer1311; bSizer1311 = new wxBoxSizer( wxHORIZONTAL ); - m_minTrackWidthUnits = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_minTrackWidthUnits->Wrap( -1 ); - bSizer1311->Add( m_minTrackWidthUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* minTrackWidthUnits; + minTrackWidthUnits = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + minTrackWidthUnits->Wrap( -1 ); + bSizer1311->Add( minTrackWidthUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticText* stMinTrackWidthHint; stMinTrackWidthHint = new wxStaticText( this, wxID_ANY, _("d"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -178,9 +183,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind bSizer1311->Add( stMinTrackWidthHint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText78 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText78->Wrap( -1 ); - bSizer1311->Add( m_staticText78, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stMinTrackWidthSuffix; + stMinTrackWidthSuffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stMinTrackWidthSuffix->Wrap( -1 ); + bSizer1311->Add( stMinTrackWidthSuffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer->Add( bSizer1311, wxGBPosition( 0, 5 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); @@ -242,9 +248,9 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); gbSizer1->SetEmptyCellSize( wxSize( 10,7 ) ); - m_stLenPercentLabel1 = new wxStaticText( this, wxID_ANY, _("Best length (L):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stLenPercentLabel1->Wrap( -1 ); - gbSizer1->Add( m_stLenPercentLabel1, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stLenPercent1Label = new wxStaticText( this, wxID_ANY, _("Best length (L):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stLenPercent1Label->Wrap( -1 ); + gbSizer1->Add( m_stLenPercent1Label, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_spLenPercent1 = new wxSpinCtrlDouble( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 20, 100, 40.000000, 10 ); m_spLenPercent1->SetDigits( 0 ); @@ -253,9 +259,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer122; bSizer122 = new wxBoxSizer( wxHORIZONTAL ); - m_stLenPercentUnits1 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_stLenPercentUnits1->Wrap( -1 ); - bSizer122->Add( m_stLenPercentUnits1, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stLenPercent1Units; + stLenPercent1Units = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stLenPercent1Units->Wrap( -1 ); + bSizer122->Add( stLenPercent1Units, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticText* stLenPercent1Hint; stLenPercent1Hint = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -264,9 +271,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind bSizer122->Add( stLenPercent1Hint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText75 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText75->Wrap( -1 ); - bSizer122->Add( m_staticText75, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stLenPercent1Suffix; + stLenPercent1Suffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stLenPercent1Suffix->Wrap( -1 ); + bSizer122->Add( stLenPercent1Suffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer1->Add( bSizer122, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); @@ -278,13 +286,13 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind m_tcTdMaxLen1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); gbSizer1->Add( m_tcTdMaxLen1, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - m_stMaxLenUnits1 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stMaxLenUnits1->Wrap( -1 ); - gbSizer1->Add( m_stMaxLenUnits1, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stMaxLen1Units = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stMaxLen1Units->Wrap( -1 ); + gbSizer1->Add( m_stMaxLen1Units, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - m_stWidthLabel1 = new wxStaticText( this, wxID_ANY, _("Best width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stWidthLabel1->Wrap( -1 ); - gbSizer1->Add( m_stWidthLabel1, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stWidth1Label = new wxStaticText( this, wxID_ANY, _("Best width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stWidth1Label->Wrap( -1 ); + gbSizer1->Add( m_stWidth1Label, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_spWidthPercent1 = new wxSpinCtrlDouble( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 60, 100, 100.000000, 10 ); m_spWidthPercent1->SetDigits( 0 ); @@ -293,9 +301,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer12; bSizer12 = new wxBoxSizer( wxHORIZONTAL ); - m_stWidthPercentUnits1 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_stWidthPercentUnits1->Wrap( -1 ); - bSizer12->Add( m_stWidthPercentUnits1, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stWidthPercent1Units; + stWidthPercent1Units = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stWidthPercent1Units->Wrap( -1 ); + bSizer12->Add( stWidthPercent1Units, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticText* stSizePercent1Hint; stSizePercent1Hint = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -304,27 +313,28 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind bSizer12->Add( stSizePercent1Hint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText74 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText74->Wrap( -1 ); - bSizer12->Add( m_staticText74, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stSizePercent1Suffix; + stSizePercent1Suffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stSizePercent1Suffix->Wrap( -1 ); + bSizer12->Add( stSizePercent1Suffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer1->Add( bSizer12, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - m_stMaxWidthLabel1 = new wxStaticText( this, wxID_ANY, _("Maximum width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stMaxWidthLabel1->Wrap( -1 ); - gbSizer1->Add( m_stMaxWidthLabel1, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stMaxWidth1Label = new wxStaticText( this, wxID_ANY, _("Maximum width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stMaxWidth1Label->Wrap( -1 ); + gbSizer1->Add( m_stMaxWidth1Label, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_tcMaxWidth1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); gbSizer1->Add( m_tcMaxWidth1, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - m_stMaxWidthUnits1 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stMaxWidthUnits1->Wrap( -1 ); - gbSizer1->Add( m_stMaxWidthUnits1, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stMaxWidth1Units = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stMaxWidth1Units->Wrap( -1 ); + gbSizer1->Add( m_stMaxWidth1Units, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - m_curvePointsLabel1 = new wxStaticText( this, wxID_ANY, _("Curve points:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_curvePointsLabel1->Wrap( -1 ); - gbSizer1->Add( m_curvePointsLabel1, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_curvePoints1Label = new wxStaticText( this, wxID_ANY, _("Curve points:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_curvePoints1Label->Wrap( -1 ); + gbSizer1->Add( m_curvePoints1Label, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_curvePointsCtrl1 = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 10, 5 ); gbSizer1->Add( m_curvePointsCtrl1, wxGBPosition( 6, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); @@ -349,9 +359,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer1221; bSizer1221 = new wxBoxSizer( wxHORIZONTAL ); - m_minTrackWidthUnits1 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_minTrackWidthUnits1->Wrap( -1 ); - bSizer1221->Add( m_minTrackWidthUnits1, 0, 0, 5 ); + wxStaticText* minTrackWidthUnits1; + minTrackWidthUnits1 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + minTrackWidthUnits1->Wrap( -1 ); + bSizer1221->Add( minTrackWidthUnits1, 0, 0, 5 ); wxStaticText* stMinTrackWidthHint1; stMinTrackWidthHint1 = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -360,9 +371,10 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind bSizer1221->Add( stMinTrackWidthHint1, 0, wxALIGN_BOTTOM, 1 ); - m_staticText73 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText73->Wrap( -1 ); - bSizer1221->Add( m_staticText73, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* staticText73; + staticText73 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + staticText73->Wrap( -1 ); + bSizer1221->Add( staticText73, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer1->Add( bSizer1221, wxGBPosition( 0, 5 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); @@ -424,9 +436,9 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind gbSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); gbSizer2->SetEmptyCellSize( wxSize( 10,7 ) ); - m_stLenPercentLabel2 = new wxStaticText( this, wxID_ANY, _("Best length (L):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stLenPercentLabel2->Wrap( -1 ); - gbSizer2->Add( m_stLenPercentLabel2, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stLenPercent2Label = new wxStaticText( this, wxID_ANY, _("Best length (L):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stLenPercent2Label->Wrap( -1 ); + gbSizer2->Add( m_stLenPercent2Label, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_spLenPercent2 = new wxSpinCtrlDouble( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 20, 100, 40.000000, 10 ); m_spLenPercent2->SetDigits( 0 ); @@ -435,20 +447,22 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer1211; bSizer1211 = new wxBoxSizer( wxHORIZONTAL ); - m_stLenPercentUnits2 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_stLenPercentUnits2->Wrap( -1 ); - bSizer1211->Add( m_stLenPercentUnits2, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stLenPercent2Units; + stLenPercent2Units = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stLenPercent2Units->Wrap( -1 ); + bSizer1211->Add( stLenPercent2Units, 0, wxALIGN_CENTER_VERTICAL, 5 ); - wxStaticText* stLenPercentHint2; - stLenPercentHint2 = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); - stLenPercentHint2->Wrap( -1 ); - stLenPercentHint2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + wxStaticText* stLenPercent2Hint; + stLenPercent2Hint = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); + stLenPercent2Hint->Wrap( -1 ); + stLenPercent2Hint->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizer1211->Add( stLenPercentHint2, 0, wxALIGN_BOTTOM, 1 ); + bSizer1211->Add( stLenPercent2Hint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText70 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText70->Wrap( -1 ); - bSizer1211->Add( m_staticText70, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stLenPercent2Suffix; + stLenPercent2Suffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stLenPercent2Suffix->Wrap( -1 ); + bSizer1211->Add( stLenPercent2Suffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer2->Add( bSizer1211, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); @@ -460,13 +474,13 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind m_tcTdMaxLen2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); gbSizer2->Add( m_tcTdMaxLen2, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - m_stMaxLenUnits2 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stMaxLenUnits2->Wrap( -1 ); - gbSizer2->Add( m_stMaxLenUnits2, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stMaxLen2Units = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stMaxLen2Units->Wrap( -1 ); + gbSizer2->Add( m_stMaxLen2Units, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - m_stWidthLabel2 = new wxStaticText( this, wxID_ANY, _("Best width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stWidthLabel2->Wrap( -1 ); - gbSizer2->Add( m_stWidthLabel2, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stWidth2Label = new wxStaticText( this, wxID_ANY, _("Best width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stWidth2Label->Wrap( -1 ); + gbSizer2->Add( m_stWidth2Label, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_spWidthPercent2 = new wxSpinCtrlDouble( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 60, 100, 100.000000, 10 ); m_spWidthPercent2->SetDigits( 0 ); @@ -475,38 +489,40 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer121; bSizer121 = new wxBoxSizer( wxHORIZONTAL ); - m_stWidthPercentUnits2 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_stWidthPercentUnits2->Wrap( -1 ); - bSizer121->Add( m_stWidthPercentUnits2, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stWidthPercent2Units; + stWidthPercent2Units = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stWidthPercent2Units->Wrap( -1 ); + bSizer121->Add( stWidthPercent2Units, 0, wxALIGN_CENTER_VERTICAL, 5 ); - wxStaticText* stWidthPercentHint2; - stWidthPercentHint2 = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); - stWidthPercentHint2->Wrap( -1 ); - stWidthPercentHint2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + wxStaticText* stWidthPercent2Hint; + stWidthPercent2Hint = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); + stWidthPercent2Hint->Wrap( -1 ); + stWidthPercent2Hint->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizer121->Add( stWidthPercentHint2, 0, wxALIGN_BOTTOM, 1 ); + bSizer121->Add( stWidthPercent2Hint, 0, wxALIGN_BOTTOM, 1 ); - m_staticText72 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText72->Wrap( -1 ); - bSizer121->Add( m_staticText72, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stWidthPercent2Suffix; + stWidthPercent2Suffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stWidthPercent2Suffix->Wrap( -1 ); + bSizer121->Add( stWidthPercent2Suffix, 0, wxALIGN_CENTER_VERTICAL, 5 ); gbSizer2->Add( bSizer121, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - m_stMaxWidthLabel2 = new wxStaticText( this, wxID_ANY, _("Maximum width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stMaxWidthLabel2->Wrap( -1 ); - gbSizer2->Add( m_stMaxWidthLabel2, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stMaxWidth2Label = new wxStaticText( this, wxID_ANY, _("Maximum width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stMaxWidth2Label->Wrap( -1 ); + gbSizer2->Add( m_stMaxWidth2Label, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_tcMaxWidth2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); gbSizer2->Add( m_tcMaxWidth2, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - m_stMaxWidthUnits2 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stMaxWidthUnits2->Wrap( -1 ); - gbSizer2->Add( m_stMaxWidthUnits2, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_stMaxWidth2Units = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_stMaxWidth2Units->Wrap( -1 ); + gbSizer2->Add( m_stMaxWidth2Units, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - m_curvePointsLabel2 = new wxStaticText( this, wxID_ANY, _("Curve points:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_curvePointsLabel2->Wrap( -1 ); - gbSizer2->Add( m_curvePointsLabel2, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_curvePoints2Label = new wxStaticText( this, wxID_ANY, _("Curve points:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_curvePoints2Label->Wrap( -1 ); + gbSizer2->Add( m_curvePoints2Label, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_curvePointsCtrl2 = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 10, 5 ); gbSizer2->Add( m_curvePointsCtrl2, wxGBPosition( 6, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); @@ -526,20 +542,22 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind wxBoxSizer* bSizer12211; bSizer12211 = new wxBoxSizer( wxHORIZONTAL ); - m_minTrackWidthUnits2 = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); - m_minTrackWidthUnits2->Wrap( -1 ); - bSizer12211->Add( m_minTrackWidthUnits2, 0, wxALIGN_CENTER_VERTICAL, 5 ); + wxStaticText* stMinTrackWidth2Units; + stMinTrackWidth2Units = new wxStaticText( this, wxID_ANY, _("%("), wxDefaultPosition, wxDefaultSize, 0 ); + stMinTrackWidth2Units->Wrap( -1 ); + bSizer12211->Add( stMinTrackWidth2Units, 0, wxALIGN_CENTER_VERTICAL, 5 ); - wxStaticText* stMinTrackWidthHint2; - stMinTrackWidthHint2 = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); - stMinTrackWidthHint2->Wrap( -1 ); - stMinTrackWidthHint2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + wxStaticText* stMinTrackWidth2Hint; + stMinTrackWidth2Hint = new wxStaticText( this, wxID_ANY, _("w"), wxDefaultPosition, wxDefaultSize, 0 ); + stMinTrackWidth2Hint->Wrap( -1 ); + stMinTrackWidth2Hint->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizer12211->Add( stMinTrackWidthHint2, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer12211->Add( stMinTrackWidth2Hint, 0, wxALIGN_CENTER_VERTICAL, 5 ); - m_staticText71 = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText71->Wrap( -1 ); - bSizer12211->Add( m_staticText71, 0, wxALIGN_BOTTOM|wxBOTTOM, 1 ); + wxStaticText* stMinTrackWidth2Suffix; + stMinTrackWidth2Suffix = new wxStaticText( this, wxID_ANY, _(" )"), wxDefaultPosition, wxDefaultSize, 0 ); + stMinTrackWidth2Suffix->Wrap( -1 ); + bSizer12211->Add( stMinTrackWidth2Suffix, 0, wxALIGN_BOTTOM|wxBOTTOM, 1 ); gbSizer2->Add( bSizer12211, wxGBPosition( 0, 5 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/pcbnew/dialogs/panel_setup_teardrops_base.fbp b/pcbnew/dialogs/panel_setup_teardrops_base.fbp index 7887662a14..8e115dafa1 100644 --- a/pcbnew/dialogs/panel_setup_teardrops_base.fbp +++ b/pcbnew/dialogs/panel_setup_teardrops_base.fbp @@ -682,11 +682,11 @@ 0 1 - m_stLenPercentUnits + stLenPercentUnits 1 - protected + none 1 Resizable @@ -806,11 +806,11 @@ 0 1 - m_staticText76 + staticText76 1 - protected + none 1 Resizable @@ -1213,11 +1213,11 @@ 0 1 - m_stWidthPercentUnits + stWidthPercentUnits 1 - protected + none 1 Resizable @@ -1337,11 +1337,11 @@ 0 1 - m_staticText77 + stWidthPercentSuffix 1 - protected + none 1 Resizable @@ -1943,11 +1943,11 @@ 0 1 - m_minTrackWidthUnits + minTrackWidthUnits 1 - protected + none 1 Resizable @@ -2067,11 +2067,11 @@ 0 1 - m_staticText78 + stMinTrackWidthSuffix 1 - protected + none 1 Resizable @@ -2644,7 +2644,7 @@ 0 1 - m_stLenPercentLabel1 + m_stLenPercent1Label 1 @@ -2786,11 +2786,11 @@ 0 1 - m_stLenPercentUnits1 + stLenPercent1Units 1 - protected + none 1 Resizable @@ -2910,11 +2910,11 @@ 0 1 - m_staticText75 + stLenPercent1Suffix 1 - protected + none 1 Resizable @@ -3110,7 +3110,7 @@ 0 1 - m_stMaxLenUnits1 + m_stMaxLen1Units 1 @@ -3175,7 +3175,7 @@ 0 1 - m_stWidthLabel1 + m_stWidth1Label 1 @@ -3317,11 +3317,11 @@ 0 1 - m_stWidthPercentUnits1 + stWidthPercent1Units 1 - protected + none 1 Resizable @@ -3441,11 +3441,11 @@ 0 1 - m_staticText74 + stSizePercent1Suffix 1 - protected + none 1 Resizable @@ -3508,7 +3508,7 @@ 0 1 - m_stMaxWidthLabel1 + m_stMaxWidth1Label 1 @@ -3641,7 +3641,7 @@ 0 1 - m_stMaxWidthUnits1 + m_stMaxWidth1Units 1 @@ -3706,7 +3706,7 @@ 0 1 - m_curvePointsLabel1 + m_curvePoints1Label 1 @@ -4047,11 +4047,11 @@ 0 1 - m_minTrackWidthUnits1 + minTrackWidthUnits1 1 - protected + none 1 Resizable @@ -4171,11 +4171,11 @@ 0 1 - m_staticText73 + staticText73 1 - protected + none 1 Resizable @@ -4748,7 +4748,7 @@ 0 1 - m_stLenPercentLabel2 + m_stLenPercent2Label 1 @@ -4890,11 +4890,11 @@ 0 1 - m_stLenPercentUnits2 + stLenPercent2Units 1 - protected + none 1 Resizable @@ -4952,7 +4952,7 @@ 0 1 - stLenPercentHint2 + stLenPercent2Hint 1 @@ -5014,11 +5014,11 @@ 0 1 - m_staticText70 + stLenPercent2Suffix 1 - protected + none 1 Resizable @@ -5214,7 +5214,7 @@ 0 1 - m_stMaxLenUnits2 + m_stMaxLen2Units 1 @@ -5279,7 +5279,7 @@ 0 1 - m_stWidthLabel2 + m_stWidth2Label 1 @@ -5421,11 +5421,11 @@ 0 1 - m_stWidthPercentUnits2 + stWidthPercent2Units 1 - protected + none 1 Resizable @@ -5483,7 +5483,7 @@ 0 1 - stWidthPercentHint2 + stWidthPercent2Hint 1 @@ -5545,11 +5545,11 @@ 0 1 - m_staticText72 + stWidthPercent2Suffix 1 - protected + none 1 Resizable @@ -5612,7 +5612,7 @@ 0 1 - m_stMaxWidthLabel2 + m_stMaxWidth2Label 1 @@ -5745,7 +5745,7 @@ 0 1 - m_stMaxWidthUnits2 + m_stMaxWidth2Units 1 @@ -5810,7 +5810,7 @@ 0 1 - m_curvePointsLabel2 + m_curvePoints2Label 1 @@ -6083,11 +6083,11 @@ 0 1 - m_minTrackWidthUnits2 + stMinTrackWidth2Units 1 - protected + none 1 Resizable @@ -6145,7 +6145,7 @@ 0 1 - stMinTrackWidthHint2 + stMinTrackWidth2Hint 1 @@ -6207,11 +6207,11 @@ 0 1 - m_staticText71 + stMinTrackWidth2Suffix 1 - protected + none 1 Resizable diff --git a/pcbnew/dialogs/panel_setup_teardrops_base.h b/pcbnew/dialogs/panel_setup_teardrops_base.h index 1a7ef450e7..8fac7eb56f 100644 --- a/pcbnew/dialogs/panel_setup_teardrops_base.h +++ b/pcbnew/dialogs/panel_setup_teardrops_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -48,15 +48,11 @@ class PANEL_SETUP_TEARDROPS_BASE : public wxPanel wxRadioButton* m_rbCurved; wxStaticText* m_stLenPercentLabel; wxSpinCtrlDouble* m_spLenPercent; - wxStaticText* m_stLenPercentUnits; - wxStaticText* m_staticText76; wxStaticText* m_stMaxLen; wxTextCtrl* m_tcTdMaxLen; wxStaticText* m_stMaxLenUnits; wxStaticText* m_stWidthLabel; wxSpinCtrlDouble* m_spWidthPercent; - wxStaticText* m_stWidthPercentUnits; - wxStaticText* m_staticText77; wxStaticText* m_stMaxWidthLabel; wxTextCtrl* m_tcMaxWidth; wxStaticText* m_stMaxWidthUnits; @@ -65,8 +61,6 @@ class PANEL_SETUP_TEARDROPS_BASE : public wxPanel wxCheckBox* m_cbPreferZoneConnection; wxStaticText* m_stHDRatio; wxSpinCtrlDouble* m_spTeardropHDPercent; - wxStaticText* m_minTrackWidthUnits; - wxStaticText* m_staticText78; wxCheckBox* m_cbTeardropsUseNextTrack; wxStaticText* m_rectShapesLabel; wxStaticLine* m_staticline2; @@ -74,27 +68,21 @@ class PANEL_SETUP_TEARDROPS_BASE : public wxPanel wxStaticText* m_edgesLabel1; wxRadioButton* m_rbStraightLines1; wxRadioButton* m_rbCurved1; - wxStaticText* m_stLenPercentLabel1; + wxStaticText* m_stLenPercent1Label; wxSpinCtrlDouble* m_spLenPercent1; - wxStaticText* m_stLenPercentUnits1; - wxStaticText* m_staticText75; wxStaticText* m_stMaxLen1; wxTextCtrl* m_tcTdMaxLen1; - wxStaticText* m_stMaxLenUnits1; - wxStaticText* m_stWidthLabel1; + wxStaticText* m_stMaxLen1Units; + wxStaticText* m_stWidth1Label; wxSpinCtrlDouble* m_spWidthPercent1; - wxStaticText* m_stWidthPercentUnits1; - wxStaticText* m_staticText74; - wxStaticText* m_stMaxWidthLabel1; + wxStaticText* m_stMaxWidth1Label; wxTextCtrl* m_tcMaxWidth1; - wxStaticText* m_stMaxWidthUnits1; - wxStaticText* m_curvePointsLabel1; + wxStaticText* m_stMaxWidth1Units; + wxStaticText* m_curvePoints1Label; wxSpinCtrl* m_curvePointsCtrl1; wxCheckBox* m_cbPreferZoneConnection1; wxStaticText* m_stHDRatio1; wxSpinCtrlDouble* m_spTeardropHDPercent1; - wxStaticText* m_minTrackWidthUnits1; - wxStaticText* m_staticText73; wxCheckBox* m_cbTeardropsUseNextTrack1; wxStaticText* m_tracksLabel; wxStaticLine* m_staticline3; @@ -102,26 +90,20 @@ class PANEL_SETUP_TEARDROPS_BASE : public wxPanel wxStaticText* m_edgesLabel2; wxRadioButton* m_rbStraightLines2; wxRadioButton* m_rbCurved2; - wxStaticText* m_stLenPercentLabel2; + wxStaticText* m_stLenPercent2Label; wxSpinCtrlDouble* m_spLenPercent2; - wxStaticText* m_stLenPercentUnits2; - wxStaticText* m_staticText70; wxStaticText* m_stMaxLen2; wxTextCtrl* m_tcTdMaxLen2; - wxStaticText* m_stMaxLenUnits2; - wxStaticText* m_stWidthLabel2; + wxStaticText* m_stMaxLen2Units; + wxStaticText* m_stWidth2Label; wxSpinCtrlDouble* m_spWidthPercent2; - wxStaticText* m_stWidthPercentUnits2; - wxStaticText* m_staticText72; - wxStaticText* m_stMaxWidthLabel2; + wxStaticText* m_stMaxWidth2Label; wxTextCtrl* m_tcMaxWidth2; - wxStaticText* m_stMaxWidthUnits2; - wxStaticText* m_curvePointsLabel2; + wxStaticText* m_stMaxWidth2Units; + wxStaticText* m_curvePoints2Label; wxSpinCtrl* m_curvePointsCtrl2; wxStaticText* m_stHDRatio2; wxSpinCtrlDouble* m_spTeardropHDPercent2; - wxStaticText* m_minTrackWidthUnits2; - wxStaticText* m_staticText71; wxCheckBox* m_cbTeardropsUseNextTrack2; public: