From 54be0da33d778474786fa2e91605dd46ba9ca2c5 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Wed, 27 Oct 2021 11:36:43 -0400 Subject: [PATCH] Pcbnew: minor plot dialog improvements. --- pcbnew/dialogs/dialog_plot_base.cpp | 22 +++++++++++----------- pcbnew/dialogs/dialog_plot_base.fbp | 27 ++++++++++++++++----------- pcbnew/dialogs/dialog_plot_base.h | 5 +++-- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 85e02e8b5d..187a5479bf 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 Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -51,13 +51,13 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr wxBoxSizer* bmiddleSizer; bmiddleSizer = new wxBoxSizer( wxHORIZONTAL ); - m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Included Layers") ), wxHORIZONTAL ); + m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Include Layers") ), wxHORIZONTAL ); wxArrayString m_layerCheckListBoxChoices; m_layerCheckListBox = new wxCheckListBox( m_LayersSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 ); m_layerCheckListBox->SetMinSize( wxSize( 150,-1 ) ); - m_LayersSizer->Add( m_layerCheckListBox, 1, wxEXPAND, 5 ); + m_LayersSizer->Add( m_layerCheckListBox, 1, wxALL|wxEXPAND, 5 ); bmiddleSizer->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 3 ); @@ -95,7 +95,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr gbSizer1->Add( m_includeEdgeLayerOpt, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - m_sketchPadsOnFabLayers = new wxCheckBox( sbOptionsSizer->GetStaticBox(), ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Sketch pads on fab layers"), wxDefaultPosition, wxDefaultSize, 0 ); + m_sketchPadsOnFabLayers = new wxCheckBox( sbOptionsSizer->GetStaticBox(), ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Sketch pads on fabrication layers"), wxDefaultPosition, wxDefaultSize, 0 ); m_sketchPadsOnFabLayers->SetToolTip( _("Include pad outlines on F.Fab and B.Fab layers when plotting") ); gbSizer1->Add( m_sketchPadsOnFabLayers, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); @@ -166,11 +166,11 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr wxBoxSizer* bSizerWarningText; bSizerWarningText = new wxBoxSizer( wxVERTICAL ); - m_staticTextAlert = new wxStaticText( this, wxID_ANY, _("Global solder mask min width and/or margin are not set to 0. "), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextAlert = new wxStaticText( this, wxID_ANY, _("Global solder mask minimum width and/or margin are not set to 0. "), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAlert->Wrap( -1 ); bSizerWarningText->Add( m_staticTextAlert, 0, wxTOP|wxLEFT, 5 ); - m_staticTextAlert1 = new wxStaticText( this, wxID_ANY, _("Most board houses expect 0 and use their constraints, especially for solder mask min width."), wxDefaultPosition, wxDefaultSize, 0 ); + 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 ); @@ -225,7 +225,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr wxString m_coordFormatCtrlChoices[] = { _("4.5, unit mm"), _("4.6, unit mm") }; int m_coordFormatCtrlNChoices = sizeof( m_coordFormatCtrlChoices ) / sizeof( wxString ); m_coordFormatCtrl = new wxChoice( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_coordFormatCtrlNChoices, m_coordFormatCtrlChoices, 0 ); - m_coordFormatCtrl->SetSelection( 0 ); + m_coordFormatCtrl->SetSelection( 1 ); gbSizer2->Add( m_coordFormatCtrl, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_useGerberX2Format = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Use extended X2 format (recommended)"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -234,11 +234,11 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr gbSizer2->Add( m_useGerberX2Format, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 ); m_useGerberNetAttributes = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Include netlist attributes"), wxDefaultPosition, wxDefaultSize, 0 ); - m_useGerberNetAttributes->SetToolTip( _("Include netlist metadata and aperture attributes in Gerber files.\nIn X1 format, they are comments.\nUsed to check connectivity in CAM tools and Gerber viewers.") ); + m_useGerberNetAttributes->SetToolTip( _("Include netlist metadata and aperture attributes in Gerber files.\nThey are comments in the X1 format.\nUsed to check connectivity in CAM tools and Gerber viewers.") ); gbSizer2->Add( m_useGerberNetAttributes, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 30 ); - m_disableApertMacros = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Disable aperture macros (non recommended)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_disableApertMacros = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Disable aperture macros (not recommended)"), wxDefaultPosition, wxDefaultSize, 0 ); m_disableApertMacros->SetToolTip( _("Disable aperture macros in Gerber files\nUse *only* for broken Gerber viewers.") ); gbSizer2->Add( m_disableApertMacros, wxGBPosition( 3, 1 ), wxGBSpan( 1, 2 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 30 ); @@ -321,7 +321,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PSOptionsSizer->Add( fgSizer2, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_forcePSA4OutputOpt = new wxCheckBox( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("Force A4 output"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PSOptionsSizer->Add( m_forcePSA4OutputOpt, 0, wxRIGHT|wxLEFT, 5 ); + m_PSOptionsSizer->Add( m_forcePSA4OutputOpt, 0, wxBOTTOM|wxRIGHT, 5 ); m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 5 ); @@ -337,7 +337,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr bSizerdxfLeft->Add( m_DXF_plotModeOpt, 0, wxALL, 5 ); - m_DXF_plotTextStrokeFontOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Use KiCad font to plot texts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DXF_plotTextStrokeFontOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Use KiCad font to plot text"), wxDefaultPosition, wxDefaultSize, 0 ); m_DXF_plotTextStrokeFontOpt->SetToolTip( _("Check to use KiCad stroke font\nUncheck to plot single-line ASCII texts as editable text (using DXF font)") ); bSizerdxfLeft->Add( m_DXF_plotTextStrokeFontOpt, 0, wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index 87449da2ad..68347195ff 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_plot_base 1000 none + 1 Dialog_Plot_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Plot + 0 @@ -343,6 +346,7 @@ + 0 @@ -420,7 +424,7 @@ 1 wxID_ANY - Included Layers + Include Layers m_LayersSizer wxHORIZONTAL @@ -428,7 +432,7 @@ protected 5 - wxEXPAND + wxALL|wxEXPAND 1 1 @@ -899,7 +903,7 @@ 0 0 ID_ALLOW_PRINT_PAD_ON_SILKSCREEN - Sketch pads on fab layers + Sketch pads on fabrication layers 0 @@ -1771,7 +1775,7 @@ 0 0 wxID_ANY - Global solder mask min width and/or margin are not set to 0. + Global solder mask minimum width and/or margin are not set to 0. 0 0 @@ -1832,7 +1836,7 @@ 0 0 wxID_ANY - Most board houses expect 0 and use their constraints, especially for solder mask min width. + Most board manufacturers expect 0 and use their own constraints for solder mask minimum width. 0 0 @@ -2293,7 +2297,7 @@ 1 Resizable - 0 + 1 1 @@ -2434,7 +2438,7 @@ 0 - Include netlist metadata and aperture attributes in Gerber files. In X1 format, they are comments. Used to check connectivity in CAM tools and Gerber viewers. + Include netlist metadata and aperture attributes in Gerber files. They are comments in the X1 format. Used to check connectivity in CAM tools and Gerber viewers. wxFILTER_NONE wxDefaultValidator @@ -2480,7 +2484,7 @@ 0 0 wxID_ANY - Disable aperture macros (non recommended) + Disable aperture macros (not recommended) 0 @@ -3213,7 +3217,7 @@ 5 - wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT 0 1 @@ -3396,7 +3400,7 @@ 0 0 wxID_ANY - Use KiCad font to plot texts + Use KiCad font to plot text 0 @@ -3943,6 +3947,7 @@ + 0 diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h index e843d76785..e37e2d99e8 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 Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -133,7 +133,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxButton* m_sdbSizer1Cancel; wxMenu* m_popMenu; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override 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(); } @@ -151,6 +151,7 @@ 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 )