diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index 6e6ccd4fbf..87f04b4bbf 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -323,6 +323,8 @@ void DIALOG_PLOT::init_Dialog() // Option to exclude pads from silkscreen layers m_sketchPadsOnFabLayers->SetValue( m_plotOpts.GetSketchPadsOnFabLayers() ); + m_plotPadNumbers->SetValue( m_plotOpts.GetPlotPadNumbers() ); + m_plotPadNumbers->Enable( m_plotOpts.GetSketchPadsOnFabLayers() ); // Option to tent vias m_subtractMaskFromSilk->SetValue( m_plotOpts.GetSubtractMaskFromSilk() ); @@ -898,6 +900,7 @@ void DIALOG_PLOT::applyPlotSettings() tempOptions.SetSubtractMaskFromSilk( m_subtractMaskFromSilk->GetValue() ); tempOptions.SetPlotFrameRef( m_plotSheetRef->GetValue() ); tempOptions.SetSketchPadsOnFabLayers( m_sketchPadsOnFabLayers->GetValue() ); + tempOptions.SetPlotPadNumbers( m_plotPadNumbers->GetValue() ); tempOptions.SetUseAuxOrigin( m_useAuxOriginCheckBox->GetValue() ); tempOptions.SetPlotValue( m_plotFootprintValues->GetValue() ); tempOptions.SetPlotReference( m_plotFootprintRefs->GetValue() ); @@ -1360,3 +1363,8 @@ void DIALOG_PLOT::onPlotFPText( wxCommandEvent& aEvent ) m_plotFootprintValues->SetValue( false ); } } + +void DIALOG_PLOT::onSketchPads( wxCommandEvent& aEvent ) +{ + m_plotPadNumbers->Enable( aEvent.IsChecked() ); +} diff --git a/pcbnew/dialogs/dialog_plot.h b/pcbnew/dialogs/dialog_plot.h index 5adb2899a7..86d7bb009b 100644 --- a/pcbnew/dialogs/dialog_plot.h +++ b/pcbnew/dialogs/dialog_plot.h @@ -45,29 +45,30 @@ public: private: // Event called functions - void Plot( wxCommandEvent& event ) override; - void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) override; - void OnRightClickLayers( wxMouseEvent& event ); - void OnRightClickAllLayers( wxMouseEvent& event ); - void SetPlotFormat( wxCommandEvent& event ) override; - void OnChangeDXFPlotMode( wxCommandEvent& event ) override; - void OnSetScaleOpt( wxCommandEvent& event ) override; - void CreateDrillFile( wxCommandEvent& event ) override; - void OnGerberX2Checked( wxCommandEvent& event ) override; - void onRunDRC( wxCommandEvent& event ) override; - void onBoardSetup( wxHyperlinkEvent& aEvent ) override; - - void onPlotAllListMoveUp( wxCommandEvent& aEvent ); - void onPlotAllListMoveDown( wxCommandEvent& aEvent ); - - void onPlotFPValues( wxCommandEvent& aEvent ) override; - void onPlotFPRefs( wxCommandEvent& aEvent ) override; - void onPlotFPText( wxCommandEvent& aEvent ) override; + void Plot( wxCommandEvent& event ) override; + void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) override; + void OnRightClickLayers( wxMouseEvent& event ); + void OnRightClickAllLayers( wxMouseEvent& event ); + void SetPlotFormat( wxCommandEvent& event ) override; + void OnChangeDXFPlotMode( wxCommandEvent& event ) override; + void OnSetScaleOpt( wxCommandEvent& event ) override; + void CreateDrillFile( wxCommandEvent& event ) override; + void OnGerberX2Checked( wxCommandEvent& event ) override; + void onRunDRC( wxCommandEvent& event ) override; + void onBoardSetup( wxHyperlinkEvent& aEvent ) override; + + void onPlotAllListMoveUp( wxCommandEvent& aEvent ); + void onPlotAllListMoveDown( wxCommandEvent& aEvent ); + + void onPlotFPValues( wxCommandEvent& aEvent ) override; + void onPlotFPRefs( wxCommandEvent& aEvent ) override; + void onPlotFPText( wxCommandEvent& aEvent ) override; + void onSketchPads( wxCommandEvent& event ) override; // other functions - void init_Dialog(); // main initialization - void reInitDialog(); // initialization after calling drill dialog - void applyPlotSettings(); + void init_Dialog(); // main initialization + void reInitDialog(); // initialization after calling drill dialog + void applyPlotSettings(); PLOT_FORMAT getPlotFormat(); void setPlotModeChoiceSelection( OUTLINE_MODE aPlotMode ) diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 367dd655e7..e4f047f138 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 4.1.0-0-g733bf3d) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -99,8 +99,12 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr gbSizer1->Add( m_sketchPadsOnFabLayers, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_plotPadNumbers = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Include pad numbers"), wxDefaultPosition, wxDefaultSize, 0 ); + m_plotPadNumbers->SetValue(true); + gbSizer1->Add( m_plotPadNumbers, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxLEFT, 25 ); + m_zoneFillCheck = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Check zone fills before plotting"), wxDefaultPosition, wxDefaultSize, 0 ); - gbSizer1->Add( m_zoneFillCheck, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + gbSizer1->Add( m_zoneFillCheck, wxGBPosition( 7, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_tentVias = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Tent vias"), wxDefaultPosition, wxDefaultSize, 0 ); m_tentVias->SetToolTip( _("Tented vias: not plotted on soldermask layer\nNot tented: vias are plotted on soldermask layer\n(Solder mask is a negative layer)") ); @@ -156,7 +160,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_SizerSolderMaskAlert = new wxBoxSizer( wxHORIZONTAL ); - m_bitmapAlert = new wxStaticBitmap( this, wxID_ANY, wxArtProvider::GetBitmap( wxASCII_STR(wxART_WARNING), wxASCII_STR(wxART_CMN_DIALOG) ), wxDefaultPosition, wxDefaultSize, 0 ); + m_bitmapAlert = new wxStaticBitmap( this, wxID_ANY, wxArtProvider::GetBitmap( wxART_WARNING, wxART_CMN_DIALOG ), wxDefaultPosition, wxDefaultSize, 0 ); m_SizerSolderMaskAlert->Add( m_bitmapAlert, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); wxBoxSizer* bSizerWarningText; @@ -478,6 +482,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_plotFootprintValues->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onPlotFPValues ), NULL, this ); m_plotFootprintRefs->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onPlotFPRefs ), NULL, this ); m_plotFootprintText->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onPlotFPText ), NULL, this ); + m_sketchPadsOnFabLayers->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onSketchPads ), NULL, this ); m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this ); m_boardSetup->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( DIALOG_PLOT_BASE::onBoardSetup ), NULL, this ); m_useGerberX2Format->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnGerberX2Checked ), NULL, this ); @@ -496,6 +501,7 @@ DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE() m_plotFootprintValues->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onPlotFPValues ), NULL, this ); m_plotFootprintRefs->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onPlotFPRefs ), NULL, this ); m_plotFootprintText->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onPlotFPText ), NULL, this ); + m_sketchPadsOnFabLayers->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onSketchPads ), NULL, this ); m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this ); m_boardSetup->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( DIALOG_PLOT_BASE::onBoardSetup ), NULL, this ); m_useGerberX2Format->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnGerberX2Checked ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index 48de52aee6..4afbe0e60a 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -527,7 +527,7 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 - + -1,-1 wxHORIZONTAL @@ -946,6 +946,75 @@ + onSketchPads + + + + 25 + 1 + 0 + wxLEFT + 6 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Include pad numbers + + 0 + + + 0 + + 1 + m_plotPadNumbers + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + @@ -953,7 +1022,7 @@ 1 0 wxALIGN_CENTER_VERTICAL|wxRIGHT - 6 + 7 1 1 diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h index 8f36906c5c..3572692d7c 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 4.1.0-0-g733bf3d) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -71,6 +71,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxCheckBox* m_plotFootprintText; wxCheckBox* m_plotInvisibleText; wxCheckBox* m_sketchPadsOnFabLayers; + wxCheckBox* m_plotPadNumbers; wxCheckBox* m_zoneFillCheck; wxCheckBox* m_tentVias; wxStaticText* drillMarksLabel; @@ -141,6 +142,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM virtual void onPlotFPValues( wxCommandEvent& event ) { event.Skip(); } virtual void onPlotFPRefs( wxCommandEvent& event ) { event.Skip(); } virtual void onPlotFPText( wxCommandEvent& event ) { event.Skip(); } + virtual void onSketchPads( wxCommandEvent& event ) { event.Skip(); } virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); } virtual void onBoardSetup( wxHyperlinkEvent& event ) { event.Skip(); } virtual void OnGerberX2Checked( wxCommandEvent& event ) { event.Skip(); }