From c619a63c06d2027835e75abda6e82381522413e8 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 18 Apr 2022 22:55:44 +0100 Subject: [PATCH] Fix backwards layer order and minor layout issue. --- pcbnew/dialogs/dialog_plot.cpp | 3 +-- pcbnew/dialogs/dialog_plot_base.cpp | 11 ++++------- pcbnew/dialogs/dialog_plot_base.fbp | 15 +++++---------- pcbnew/dialogs/dialog_plot_base.h | 5 ++--- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index 971316eb51..adddd81bfb 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -93,7 +93,7 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) : wxArrayInt plotAllLayersOrder; wxArrayString plotAllLayersChoices; - for( LSEQ seq = board->GetEnabledLayers().SeqStackupBottom2Top(); seq; ++seq ) + for( LSEQ seq = board->GetEnabledLayers().UIOrder(); seq; ++seq ) { PCB_LAYER_ID id = *seq; @@ -136,7 +136,6 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) : m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) ); bButtonSizer->Add( m_bpMoveUp, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 ); - bButtonSizer->AddStretchSpacer(); m_bpMoveDown = new wxBitmapButton( sbSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0 ); diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 3f8caf72b6..b7bf5c98e3 100644 --- a/pcbnew/dialogs/dialog_plot_base.cpp +++ b/pcbnew/dialogs/dialog_plot_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -97,12 +97,12 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_plotNoViaOnMaskOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 ); m_plotNoViaOnMaskOpt->SetToolTip( _("Remove soldermask on vias") ); - gbSizer1->Add( m_plotNoViaOnMaskOpt, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 ); + gbSizer1->Add( m_plotNoViaOnMaskOpt, wxGBPosition( 5, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 ); m_useAuxOriginCheckBox = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Use drill/place file origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_useAuxOriginCheckBox->SetToolTip( _("Use the drill/place file origin as the coordinate origin for plotted files") ); - gbSizer1->Add( m_useAuxOriginCheckBox, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 ); + gbSizer1->Add( m_useAuxOriginCheckBox, wxGBPosition( 3, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 ); drillMarksLabel = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 ); drillMarksLabel->Wrap( -1 ); @@ -144,9 +144,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr gbSizer1->Add( m_zoneFillCheck, wxGBPosition( 6, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - gbSizer1->AddGrowableCol( 0 ); - gbSizer1->AddGrowableCol( 2 ); - sbOptionsSizer->Add( gbSizer1, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -166,7 +163,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_staticTextAlert1 = new wxStaticText( this, wxID_ANY, _("Most board manufacturers expect 0 and use their own constraints for solder mask minimum width."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAlert1->Wrap( 580 ); - bSizerWarningText->Add( m_staticTextAlert1, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizerWarningText->Add( m_staticTextAlert1, 0, wxTOP|wxLEFT, 5 ); wxBoxSizer* bSizerSecondLine; bSizerSecondLine = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index dd4f4d6774..f7065547f4 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ dialog_plot_base 1000 none - 1 Dialog_Plot_base @@ -26,7 +25,6 @@ 1 1 UI - 0 1 0 @@ -52,7 +50,6 @@ DIALOG_SHIM; dialog_shim.h Plot - 0 @@ -346,7 +343,6 @@ - 0 @@ -524,7 +520,7 @@ wxHORIZONTAL - 0,2 + 0 @@ -869,7 +865,7 @@ 30 - 1 + 2 1 wxALIGN_CENTER_VERTICAL|wxLEFT 5 @@ -936,7 +932,7 @@ 30 - 1 + 2 1 wxALIGN_CENTER_VERTICAL|wxLEFT 3 @@ -1739,7 +1735,7 @@ 5 - wxTOP|wxBOTTOM|wxLEFT + wxTOP|wxLEFT 0 1 @@ -3745,7 +3741,6 @@ - 0 diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h index cbcc32d326..9b519b6275 100644 --- a/pcbnew/dialogs/dialog_plot_base.h +++ b/pcbnew/dialogs/dialog_plot_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -131,7 +131,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxButton* m_sdbSizer1Cancel; wxMenu* m_popMenu; - // Virtual event handlers, override them in your derived class + // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnRightClick( wxMouseEvent& event ) { event.Skip(); } virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); } @@ -149,7 +149,6 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM public: DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_PLOT_BASE(); void DIALOG_PLOT_BASEOnContextMenu( wxMouseEvent &event )