From 6dc60598da8f286624d2cc9a9762adb3714375d2 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 30 Jan 2024 15:01:59 +0000 Subject: [PATCH] Cleanup array dialog. --- pcbnew/dialogs/dialog_create_array_base.cpp | 104 +- pcbnew/dialogs/dialog_create_array_base.fbp | 2456 +++++++++---------- pcbnew/dialogs/dialog_create_array_base.h | 5 +- 3 files changed, 1266 insertions(+), 1299 deletions(-) diff --git a/pcbnew/dialogs/dialog_create_array_base.cpp b/pcbnew/dialogs/dialog_create_array_base.cpp index f8444b69d4..3af6eb4b20 100644 --- a/pcbnew/dialogs/dialog_create_array_base.cpp +++ b/pcbnew/dialogs/dialog_create_array_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -135,7 +135,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID sbSizerItemsSpacing->Add( sbSizerGridShape, 0, wxALL|wxEXPAND, 5 ); - bSizerGridLeft->Add( sbSizerItemsSpacing, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerGridLeft->Add( sbSizerItemsSpacing, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizerStagger; sbSizerStagger = new wxStaticBoxSizer( new wxStaticBox( m_gridPanel, wxID_ANY, _("Stagger Settings") ), wxVERTICAL ); @@ -162,24 +162,24 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID sbSizerStagger->Add( m_radioBoxGridStaggerType, 0, wxALL, 5 ); - bSizerGridLeft->Add( sbSizerStagger, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerGridLeft->Add( sbSizerStagger, 0, wxEXPAND|wxALL, 5 ); bSizerGridArray->Add( bSizerGridLeft, 1, wxEXPAND, 5 ); - - bSizerGridArray->Add( 0, 0, 0, wxALL|wxEXPAND, 10 ); - m_gridPadNumberingPanel = new wxPanel( m_gridPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_gridPadNumberingPanel->Hide(); + wxBoxSizer* bSizer15; + bSizer15 = new wxBoxSizer( wxVERTICAL ); + m_gridPadNumberingSizer = new wxBoxSizer( wxVERTICAL ); wxString m_radioBoxGridNumberingAxisChoices[] = { _("Horizontal, then vertical"), _("Vertical, then horizontal") }; int m_radioBoxGridNumberingAxisNChoices = sizeof( m_radioBoxGridNumberingAxisChoices ) / sizeof( wxString ); m_radioBoxGridNumberingAxis = new wxRadioBox( m_gridPadNumberingPanel, wxID_ANY, _("Numbering Direction"), wxDefaultPosition, wxDefaultSize, m_radioBoxGridNumberingAxisNChoices, m_radioBoxGridNumberingAxisChoices, 1, wxRA_SPECIFY_COLS ); m_radioBoxGridNumberingAxis->SetSelection( 0 ); - m_gridPadNumberingSizer->Add( m_radioBoxGridNumberingAxis, 0, wxALL|wxEXPAND, 5 ); + m_gridPadNumberingSizer->Add( m_radioBoxGridNumberingAxis, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxGridReverseNumbering = new wxCheckBox( m_gridPadNumberingPanel, wxID_ANY, _("Reverse numbering on alternate rows/columns"), wxDefaultPosition, wxDefaultSize, 0 ); m_gridPadNumberingSizer->Add( m_checkBoxGridReverseNumbering, 0, wxALL, 5 ); @@ -256,10 +256,13 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_gridPadNumberingSizer->Add( fgSizer1, 1, wxEXPAND, 5 ); - m_gridPadNumberingPanel->SetSizer( m_gridPadNumberingSizer ); + bSizer15->Add( m_gridPadNumberingSizer, 1, wxEXPAND|wxLEFT, 10 ); + + + m_gridPadNumberingPanel->SetSizer( bSizer15 ); m_gridPadNumberingPanel->Layout(); - m_gridPadNumberingSizer->Fit( m_gridPadNumberingPanel ); - bSizerGridArray->Add( m_gridPadNumberingPanel, 1, wxEXPAND | wxALL, 5 ); + bSizer15->Fit( m_gridPadNumberingPanel ); + bSizerGridArray->Add( m_gridPadNumberingPanel, 1, wxEXPAND, 5 ); m_gridPanel->SetSizer( bSizerGridArray ); @@ -274,7 +277,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID bSizerCircLeft = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizerInfo; - sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_circularPanel, wxID_ANY, _("Items to duplicate") ), wxVERTICAL ); + sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_circularPanel, wxID_ANY, _("Items to Duplicate") ), wxVERTICAL ); m_stInfoItems = new wxStaticText( sbSizerInfo->GetStaticBox(), wxID_ANY, _("This is the position of the selected item,\nor the position of the group to duplicate"), wxDefaultPosition, wxDefaultSize, 0 ); m_stInfoItems->Wrap( -1 ); @@ -295,7 +298,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_stRefPosXUnit = new wxStaticText( sbSizerInfo->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_stRefPosXUnit->Wrap( -1 ); - fgSizer4->Add( m_stRefPosXUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizer4->Add( m_stRefPosXUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_stRefPosYTxt = new wxStaticText( sbSizerInfo->GetStaticBox(), wxID_ANY, _("Ref point pos Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_stRefPosYTxt->Wrap( -1 ); @@ -306,7 +309,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_stRefPosYUnit = new wxStaticText( sbSizerInfo->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_stRefPosYUnit->Wrap( -1 ); - fgSizer4->Add( m_stRefPosYUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizer4->Add( m_stRefPosYUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); sbSizerInfo->Add( fgSizer4, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); @@ -315,19 +318,12 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID bSizerCircLeft->Add( sbSizerInfo, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerCircParams; - sbSizerCircParams = new wxStaticBoxSizer( new wxStaticBox( m_circularPanel, wxID_ANY, _("Circular array params") ), wxVERTICAL ); + sbSizerCircParams = new wxStaticBoxSizer( new wxStaticBox( m_circularPanel, wxID_ANY, _("Array Settings") ), wxVERTICAL ); m_radioBtnSetByPos = new wxRadioButton( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Set center by position"), wxDefaultPosition, wxDefaultSize, 0 ); m_radioBtnSetByPos->SetValue( true ); sbSizerCircParams->Add( m_radioBtnSetByPos, 0, wxALL, 5 ); - m_radioBtnSetByRadius = new wxRadioButton( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Set center by radius"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerCircParams->Add( m_radioBtnSetByRadius, 0, wxALL, 5 ); - - m_stInfoItems1 = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("This is the position of the center of the circle\ndefining the circular area to create"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stInfoItems1->Wrap( -1 ); - sbSizerCircParams->Add( m_stInfoItems1, 0, wxALL, 5 ); - wxFlexGridSizer* fgSizerArrayPrms; fgSizerArrayPrms = new wxFlexGridSizer( 0, 3, 5, 5 ); fgSizerArrayPrms->AddGrowableCol( 1 ); @@ -336,35 +332,41 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_labelCentreX = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Center pos X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCentreX->Wrap( -1 ); - fgSizerArrayPrms->Add( m_labelCentreX, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerArrayPrms->Add( m_labelCentreX, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_entryCentreX = new wxTextCtrl( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerArrayPrms->Add( m_entryCentreX, 0, wxEXPAND, 5 ); m_unitLabelCentreX = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitLabelCentreX->Wrap( -1 ); - fgSizerArrayPrms->Add( m_unitLabelCentreX, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizerArrayPrms->Add( m_unitLabelCentreX, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_labelCentreY = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Center pos Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCentreY->Wrap( -1 ); - fgSizerArrayPrms->Add( m_labelCentreY, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerArrayPrms->Add( m_labelCentreY, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_entryCentreY = new wxTextCtrl( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerArrayPrms->Add( m_entryCentreY, 0, wxEXPAND, 5 ); m_unitLabelCentreY = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitLabelCentreY->Wrap( -1 ); - fgSizerArrayPrms->Add( m_unitLabelCentreY, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizerArrayPrms->Add( m_unitLabelCentreY, 0, wxALIGN_CENTER_VERTICAL, 5 ); - sbSizerCircParams->Add( fgSizerArrayPrms, 0, wxEXPAND, 5 ); + sbSizerCircParams->Add( fgSizerArrayPrms, 0, wxEXPAND|wxLEFT, 25 ); + + + sbSizerCircParams->Add( 0, 15, 1, wxEXPAND, 5 ); + + m_radioBtnSetByRadius = new wxRadioButton( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Set center by radius"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizerCircParams->Add( m_radioBtnSetByRadius, 0, wxALL, 5 ); wxBoxSizer* bSizerRadius; bSizerRadius = new wxBoxSizer( wxVERTICAL ); - m_labelCircRadius = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Array radius,\nfrom Ref point pos and array center:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelCircRadius = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Radius from center to reference position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCircRadius->Wrap( -1 ); - bSizerRadius->Add( m_labelCircRadius, 0, wxALL, 5 ); + bSizerRadius->Add( m_labelCircRadius, 0, wxTOP, 5 ); wxBoxSizer* bSizerRadiusValue; bSizerRadiusValue = new wxBoxSizer( wxHORIZONTAL ); @@ -372,18 +374,18 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_tcValueCircRadius = new wxTextCtrl( sbSizerCircParams->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_tcValueCircRadius->SetToolTip( _("Distance between Ref point and Center pos.") ); - bSizerRadiusValue->Add( m_tcValueCircRadius, 1, wxALL|wxEXPAND, 5 ); + bSizerRadiusValue->Add( m_tcValueCircRadius, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 3 ); m_unitLabelCircRadius = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitLabelCircRadius->Wrap( -1 ); - bSizerRadiusValue->Add( m_unitLabelCircRadius, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerRadiusValue->Add( m_unitLabelCircRadius, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizerRadius->Add( bSizerRadiusValue, 0, wxEXPAND, 5 ); - m_labelCircCenterAngle = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Array angle,\nfrom Ref point pos and array center:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelCircCenterAngle = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Angle from center to reference position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCircCenterAngle->Wrap( -1 ); - bSizerRadius->Add( m_labelCircCenterAngle, 0, wxALL, 5 ); + bSizerRadius->Add( m_labelCircCenterAngle, 0, wxTOP, 5 ); wxBoxSizer* bSizerRadiusValue1; bSizerRadiusValue1 = new wxBoxSizer( wxHORIZONTAL ); @@ -399,23 +401,23 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID #endif m_tcValueCircCenterAngle->SetToolTip( _("Angle between Ref point and Center pos.") ); - bSizerRadiusValue1->Add( m_tcValueCircCenterAngle, 1, wxALL|wxEXPAND, 5 ); + bSizerRadiusValue1->Add( m_tcValueCircCenterAngle, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 3 ); m_unitLabelCircCenterAngle = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitLabelCircCenterAngle->Wrap( -1 ); - bSizerRadiusValue1->Add( m_unitLabelCircCenterAngle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerRadiusValue1->Add( m_unitLabelCircCenterAngle, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizerRadius->Add( bSizerRadiusValue1, 0, wxEXPAND, 5 ); - sbSizerCircParams->Add( bSizerRadius, 0, wxEXPAND, 5 ); + sbSizerCircParams->Add( bSizerRadius, 0, wxEXPAND|wxLEFT, 25 ); - bSizerCircLeft->Add( sbSizerCircParams, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerCircLeft->Add( sbSizerCircParams, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizerDupPrms; - sbSizerDupPrms = new wxStaticBoxSizer( new wxStaticBox( m_circularPanel, wxID_ANY, _("Duplicate parameters") ), wxVERTICAL ); + sbSizerDupPrms = new wxStaticBoxSizer( new wxStaticBox( m_circularPanel, wxID_ANY, _("Duplication Settings") ), wxVERTICAL ); wxFlexGridSizer* fgSizerDupPrms; fgSizerDupPrms = new wxFlexGridSizer( 0, 3, 5, 5 ); @@ -434,7 +436,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_unitLabelCircAngle = new wxStaticText( sbSizerDupPrms->GetStaticBox(), wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitLabelCircAngle->Wrap( -1 ); - fgSizerDupPrms->Add( m_unitLabelCircAngle, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizerDupPrms->Add( m_unitLabelCircAngle, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_labelCircCount = new wxStaticText( sbSizerDupPrms->GetStaticBox(), wxID_ANY, _("Item count:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCircCount->Wrap( -1 ); @@ -462,17 +464,20 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID sbSizerDupPrms->Add( fgSizerDupPrms, 0, wxBOTTOM|wxEXPAND, 5 ); - bSizerCircLeft->Add( sbSizerDupPrms, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerCircLeft->Add( sbSizerDupPrms, 0, wxEXPAND|wxALL, 5 ); bSizer4->Add( bSizerCircLeft, 1, wxEXPAND, 5 ); - - bSizer4->Add( 0, 0, 0, wxALL|wxEXPAND, 10 ); - m_circularPadNumberingPanel = new wxPanel( m_circularPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_circularPadNumberingPanel->Hide(); + wxBoxSizer* bSizer13; + bSizer13 = new wxBoxSizer( wxHORIZONTAL ); + + + bSizer13->Add( 10, 0, 0, wxEXPAND, 5 ); + m_circPadNumberingSizer = new wxStaticBoxSizer( new wxStaticBox( m_circularPadNumberingPanel, wxID_ANY, _("Numbering Options") ), wxVERTICAL ); wxString m_rbCircStartNumberingOptChoices[] = { _("Use first free number"), _("From start value") }; @@ -505,18 +510,21 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_labelCircNumStep = new wxStaticText( m_circPadNumberingSizer->GetStaticBox(), wxID_ANY, _("Pad numbering skip:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCircNumStep->Wrap( -1 ); - fgSizer2->Add( m_labelCircNumStep, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer2->Add( m_labelCircNumStep, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_entryCircNumberingStep = new wxTextCtrl( m_circPadNumberingSizer->GetStaticBox(), wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_entryCircNumberingStep, 0, wxALL, 5 ); + fgSizer2->Add( m_entryCircNumberingStep, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_circPadNumberingSizer->Add( fgSizer2, 0, wxEXPAND, 5 ); - m_circularPadNumberingPanel->SetSizer( m_circPadNumberingSizer ); + bSizer13->Add( m_circPadNumberingSizer, 1, wxEXPAND, 5 ); + + + m_circularPadNumberingPanel->SetSizer( bSizer13 ); m_circularPadNumberingPanel->Layout(); - m_circPadNumberingSizer->Fit( m_circularPadNumberingPanel ); + bSizer13->Fit( m_circularPadNumberingPanel ); bSizer4->Add( m_circularPadNumberingPanel, 0, wxEXPAND | wxALL, 5 ); @@ -581,9 +589,9 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_rbGridStartNumberingOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); m_radioBoxGridNumberingScheme->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); m_radioBtnSetByPos->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnButtonPosition ), NULL, this ); - m_radioBtnSetByRadius->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnButtonRadius ), NULL, this ); m_entryCentreX->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); m_entryCentreY->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); + m_radioBtnSetByRadius->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnButtonRadius ), NULL, this ); m_tcValueCircRadius->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnRadiusChanged ), NULL, this ); m_tcValueCircCenterAngle->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnRadiusChanged ), NULL, this ); m_entryCircAngle->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); @@ -605,9 +613,9 @@ DIALOG_CREATE_ARRAY_BASE::~DIALOG_CREATE_ARRAY_BASE() m_rbGridStartNumberingOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); m_radioBoxGridNumberingScheme->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); m_radioBtnSetByPos->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnButtonPosition ), NULL, this ); - m_radioBtnSetByRadius->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnButtonRadius ), NULL, this ); m_entryCentreX->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); m_entryCentreY->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); + m_radioBtnSetByRadius->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnButtonRadius ), NULL, this ); m_tcValueCircRadius->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnRadiusChanged ), NULL, this ); m_tcValueCircCenterAngle->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnRadiusChanged ), NULL, this ); m_entryCircAngle->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_CREATE_ARRAY_BASE::OnParameterChanged ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_create_array_base.fbp b/pcbnew/dialogs/dialog_create_array_base.fbp index 19796692df..b2573f052c 100644 --- a/pcbnew/dialogs/dialog_create_array_base.fbp +++ b/pcbnew/dialogs/dialog_create_array_base.fbp @@ -490,7 +490,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxALL 0 wxID_ANY @@ -1314,7 +1314,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxALL 0 wxID_ANY @@ -1534,19 +1534,9 @@ - - 10 - wxALL|wxEXPAND - 0 - - 0 - protected - 0 - - 5 - wxEXPAND | wxALL + wxEXPAND 1 1 @@ -1602,551 +1592,290 @@ wxTAB_TRAVERSAL - m_gridPadNumberingSizer + bSizer15 wxVERTICAL - protected - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Horizontal, then vertical" "Vertical, then horizontal" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Numbering Direction - 1 - - 0 - - - 0 - - 1 - m_radioBoxGridNumberingAxis - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Reverse numbering on alternate rows/columns - - 0 - - - 0 - - 1 - m_checkBoxGridReverseNumbering - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Use first free number" "From start value" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Initial Pad Number - 1 - - 0 - - - 0 - - 1 - m_rbGridStartNumberingOpt - 1 - - - protected - 1 - - Resizable - 1 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnParameterChanged - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Continuous (1, 2, 3...)" "Coordinate (A1, A2, ... B1, ...)" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Pad Numbering Scheme - 1 - - 0 - - - 0 - - 1 - m_radioBoxGridNumberingScheme - 1 - - - protected - 1 - - Resizable - 1 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnParameterChanged - - - - 5 - wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Primary axis numbering: - 0 - - 0 - - - 0 - - 1 - m_labelPriAxisNumbering - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choicePriAxisNumbering - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 0 - - 1 - - 0 - 0 - wxID_ANY - Secondary axis numbering: - 0 - - 0 - - - 0 - - 1 - m_labelSecAxisNumbering - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceSecAxisNumbering - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND + none + + 10 + wxEXPAND|wxLEFT 1 - - 3 - wxBOTH - 0 - - 0 + - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 + m_gridPadNumberingSizer + wxVERTICAL + protected 5 - wxALIGN_CENTER_VERTICAL|wxALL - 1 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Horizontal, then vertical" "Vertical, then horizontal" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Numbering Direction + 1 + + 0 + + + 0 + + 1 + m_radioBoxGridNumberingAxis + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Reverse numbering on alternate rows/columns + + 0 + + + 0 + + 1 + m_checkBoxGridReverseNumbering + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Use first free number" "From start value" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Initial Pad Number + 1 + + 0 + + + 0 + + 1 + m_rbGridStartNumberingOpt + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnParameterChanged + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Continuous (1, 2, 3...)" "Coordinate (A1, A2, ... B1, ...)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pad Numbering Scheme + 1 + + 0 + + + 0 + + 1 + m_radioBoxGridNumberingScheme + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnParameterChanged + + + + 5 + wxLEFT|wxRIGHT|wxTOP + 0 1 1 @@ -2176,7 +1905,7 @@ 0 0 wxID_ANY - Pad numbering start: + Primary axis numbering: 0 0 @@ -2185,7 +1914,7 @@ 0 1 - m_labelGridNumberingOffset + m_labelPriAxisNumbering 1 @@ -2207,9 +1936,9 @@ 5 - wxALL + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -2223,6 +1952,7 @@ 1 0 + 1 1 @@ -2241,12 +1971,11 @@ 0 - 0 0 - 72,-1 + 1 - m_entryGridPriNumberingOffset + m_choicePriAxisNumbering 1 @@ -2254,6 +1983,7 @@ 1 Resizable + 0 1 @@ -2264,7 +1994,6 @@ wxFILTER_NONE wxDefaultValidator - 1 @@ -2272,73 +2001,8 @@ 5 - wxALL + wxTOP|wxRIGHT|wxLEFT 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 72,-1 - 1 - m_entryGridSecNumberingOffset - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 1 1 1 @@ -2361,14 +2025,14 @@ 0 Left 0 - 1 + 0 1 0 0 wxID_ANY - Pad numbering skip: + Secondary axis numbering: 0 0 @@ -2377,7 +2041,7 @@ 0 1 - m_labelGridNumberingStep + m_labelSecAxisNumbering 1 @@ -2399,9 +2063,9 @@ 5 - wxALL + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -2415,6 +2079,7 @@ 1 0 + 1 1 @@ -2423,7 +2088,7 @@ 0 Left 0 - 1 + 0 1 @@ -2433,12 +2098,11 @@ 0 - 0 0 - 72,-1 + 1 - m_entryGridPriNumberingStep + m_choiceSecAxisNumbering 1 @@ -2446,6 +2110,7 @@ 1 Resizable + 0 1 @@ -2456,7 +2121,6 @@ wxFILTER_NONE wxDefaultValidator - 1 @@ -2464,67 +2128,404 @@ 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 72,-1 - 1 - m_entryGridSecNumberingStep - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - + wxEXPAND + 1 + + 3 + wxBOTH + 0 + + 0 + + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pad numbering start: + 0 + + 0 + + + 0 + + 1 + m_labelGridNumberingOffset + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 72,-1 + 1 + m_entryGridPriNumberingOffset + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 72,-1 + 1 + m_entryGridSecNumberingOffset + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pad numbering skip: + 0 + + 0 + + + 0 + + 1 + m_labelGridNumberingStep + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 72,-1 + 1 + m_entryGridPriNumberingStep + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 72,-1 + 1 + m_entryGridSecNumberingStep + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + @@ -2600,28 +2601,28 @@ 5 wxEXPAND 1 - + bSizerCircLeft wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + wxID_ANY - Items to duplicate + Items to Duplicate sbSizerInfo wxVERTICAL 1 none - + 5 wxALL 0 - + 1 1 1 @@ -2679,7 +2680,7 @@ -1 - + 5 wxEXPAND|wxTOP|wxBOTTOM 0 @@ -2824,7 +2825,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3013,7 +3014,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3077,23 +3078,23 @@ - + 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxALL 0 - + wxID_ANY - Circular array params + Array Settings sbSizerCircParams wxVERTICAL 1 none - + 5 wxALL 0 - + 1 1 1 @@ -3155,139 +3156,11 @@ OnButtonPosition - - 5 - wxALL + + 25 + wxEXPAND|wxLEFT 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Set center by radius - - 0 - - - 0 - - 1 - m_radioBtnSetByRadius - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnButtonRadius - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - This is the position of the center of the circle defining the circular area to create - 0 - - 0 - - - 0 - - 1 - m_stInfoItems1 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - + 3 wxBOTH 1 @@ -3299,9 +3172,9 @@ none 0 5 - + 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3361,7 +3234,7 @@ -1 - + 5 wxEXPAND 0 @@ -3427,9 +3300,9 @@ OnParameterChanged - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3489,9 +3362,9 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3551,7 +3424,7 @@ -1 - + 5 wxEXPAND 0 @@ -3617,9 +3490,9 @@ OnParameterChanged - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3681,18 +3554,94 @@ - + 5 wxEXPAND + 1 + + 15 + protected + 0 + + + + 5 + wxALL 0 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Set center by radius + + 0 + + + 0 + + 1 + m_radioBtnSetByRadius + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnButtonRadius + + + + 25 + wxEXPAND|wxLEFT + 0 + bSizerRadius wxVERTICAL none - + 5 - wxALL + wxTOP 0 1 @@ -3723,7 +3672,7 @@ 0 0 wxID_ANY - Array radius, from Ref point pos and array center: + Radius from center to reference position: 0 0 @@ -3752,20 +3701,20 @@ -1 - + 5 wxEXPAND 0 - + bSizerRadiusValue wxHORIZONTAL none - - 5 - wxALL|wxEXPAND + + 3 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 1 - + 1 1 1 @@ -3827,9 +3776,9 @@ OnRadiusChanged - + 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL 0 1 @@ -3891,11 +3840,11 @@ - + 5 - wxALL + wxTOP 0 - + 1 1 1 @@ -3924,7 +3873,7 @@ 0 0 wxID_ANY - Array angle, from Ref point pos and array center: + Angle from center to reference position: 0 0 @@ -3953,20 +3902,20 @@ -1 - + 5 wxEXPAND 0 - + bSizerRadiusValue1 wxHORIZONTAL none - - 5 - wxALL|wxEXPAND + + 3 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 1 - + 1 1 1 @@ -4028,11 +3977,11 @@ OnRadiusChanged - + 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -4096,23 +4045,23 @@ - + 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxALL 0 - + wxID_ANY - Duplicate parameters + Duplication Settings sbSizerDupPrms wxVERTICAL 1 none - + 5 wxBOTTOM|wxEXPAND 0 - + 3 wxBOTH 1 @@ -4124,7 +4073,7 @@ none 0 5 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -4186,7 +4135,7 @@ -1 - + 5 wxEXPAND 0 @@ -4252,9 +4201,9 @@ OnParameterChanged - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL 0 1 @@ -4314,7 +4263,7 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -4376,7 +4325,7 @@ -1 - + 5 wxEXPAND 0 @@ -4442,17 +4391,17 @@ OnParameterChanged - + 5 wxEXPAND 0 - + 0 protected 0 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -4514,7 +4463,7 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL 0 @@ -4585,16 +4534,6 @@ - - 10 - wxALL|wxEXPAND - 0 - - 0 - protected - 0 - - 5 wxEXPAND | wxALL @@ -4651,228 +4590,104 @@ wxTAB_TRAVERSAL - - wxID_ANY - Numbering Options + - m_circPadNumberingSizer - wxVERTICAL - 1 - protected + bSizer13 + wxHORIZONTAL + none 5 - wxALL|wxEXPAND + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Use first free number" "From start value" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Initial Pad Number: - 1 - - 0 - - - 0 - - 1 - m_rbCircStartNumberingOpt - 1 - - + + 0 protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnParameterChanged - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Pad Numbering: - 0 - - 0 - - - 0 - - 1 - m_labelCircNumbering - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceCircNumbering - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + 10 5 wxEXPAND - 0 - - 2 - wxBOTH - 0 - - 0 + 1 + + wxID_ANY + Numbering Options - fgSizer2 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 + m_circPadNumberingSizer + wxVERTICAL + 1 + protected 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Use first free number" "From start value" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Initial Pad Number: + 1 + + 0 + + + 0 + + 1 + m_rbCircStartNumberingOpt + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnParameterChanged + + + + 5 + wxALL 0 1 @@ -4903,7 +4718,7 @@ 0 0 wxID_ANY - Pad numbering start: + Pad Numbering: 0 0 @@ -4912,7 +4727,7 @@ 0 1 - m_labelCircNumStart + m_labelCircNumbering 1 @@ -4923,7 +4738,7 @@ 1 - + ; ; forward_declare 0 @@ -4934,9 +4749,9 @@ 5 - wxALL - 1 - + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + 1 1 1 @@ -4950,6 +4765,7 @@ 1 0 + 1 1 @@ -4968,12 +4784,11 @@ 0 - 0 0 1 - m_entryCircNumberingStart + m_choiceCircNumbering 1 @@ -4981,147 +4796,292 @@ 1 Resizable + 0 1 - + ; ; forward_declare 0 wxFILTER_NONE wxDefaultValidator - 1 - + 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Pad numbering skip: - 0 - - 0 - - - 0 + + 2 + wxBOTH + 0 + + 0 - 1 - m_labelCircNumStep - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALL - 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_entryCircNumberingStep - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - + fgSizer2 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pad numbering start: + 0 + + 0 + + + 0 + + 1 + m_labelCircNumStart + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_entryCircNumberingStart + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pad numbering skip: + 0 + + 0 + + + 0 + + 1 + m_labelCircNumStep + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 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_entryCircNumberingStep + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + diff --git a/pcbnew/dialogs/dialog_create_array_base.h b/pcbnew/dialogs/dialog_create_array_base.h index f71d11ee65..59731546fd 100644 --- a/pcbnew/dialogs/dialog_create_array_base.h +++ b/pcbnew/dialogs/dialog_create_array_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -92,14 +92,13 @@ class DIALOG_CREATE_ARRAY_BASE : public DIALOG_SHIM wxTextCtrl* m_tcRefPosY; wxStaticText* m_stRefPosYUnit; wxRadioButton* m_radioBtnSetByPos; - wxRadioButton* m_radioBtnSetByRadius; - wxStaticText* m_stInfoItems1; wxStaticText* m_labelCentreX; wxTextCtrl* m_entryCentreX; wxStaticText* m_unitLabelCentreX; wxStaticText* m_labelCentreY; wxTextCtrl* m_entryCentreY; wxStaticText* m_unitLabelCentreY; + wxRadioButton* m_radioBtnSetByRadius; wxStaticText* m_labelCircRadius; wxTextCtrl* m_tcValueCircRadius; wxStaticText* m_unitLabelCircRadius;