diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index 40edd16173..35d988396c 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -54,8 +54,7 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) : // We use a sdbSizer here to get the order right, which is platform-dependent m_sdbSizer1OK->SetLabel( _( "Plot" ) ); - m_sdbSizer1Apply->SetLabel( _( "Draft Plot" ) ); - m_sdbSizer1Apply->SetToolTip( _( "Plot without running zone fill checks." ) ); + m_sdbSizer1Apply->SetLabel( _( "Generate Drill Files..." ) ); m_sdbSizer1Cancel->SetLabel( _( "Close" ) ); m_sdbSizer1OK->SetDefault(); @@ -74,6 +73,10 @@ void DIALOG_PLOT::init_Dialog() m_config->Read( OPTKEY_PLOT_X_FINESCALE_ADJ, &m_XScaleAdjust ); m_config->Read( OPTKEY_PLOT_Y_FINESCALE_ADJ, &m_YScaleAdjust ); + bool checkZones; + m_config->Read( OPTKEY_PLOT_CHECK_ZONES, &checkZones, true ); + m_zoneFillCheck->SetValue( checkZones ); + m_browseButton->SetBitmap( KiBitmap( browse_files_xpm ) ); // m_PSWidthAdjust is stored in mm in user config @@ -679,6 +682,8 @@ void DIALOG_PLOT::applyPlotSettings() ConfigBaseWriteDouble( m_config, OPTKEY_PLOT_Y_FINESCALE_ADJ, m_YScaleAdjust ); + m_config->Write( OPTKEY_PLOT_CHECK_ZONES, m_zoneFillCheck->GetValue() ); + // PS Width correction msg = m_PSFineAdjustWidthOpt->GetValue(); int itmp = ValueFromString( g_UserUnit, msg ); @@ -761,19 +766,7 @@ void DIALOG_PLOT::OnGerberX2Checked( wxCommandEvent& event ) } -void DIALOG_PLOT::Plot( wxCommandEvent& ) -{ - doPlot( true ); -} - - -void DIALOG_PLOT::DraftPlot( wxCommandEvent& ) -{ - doPlot( false ); -} - - -void DIALOG_PLOT::doPlot( bool aCheckZones ) +void DIALOG_PLOT::Plot( wxCommandEvent& event ) { BOARD* board = m_parent->GetBoard(); @@ -802,7 +795,7 @@ void DIALOG_PLOT::doPlot( bool aCheckZones ) return; } - if( aCheckZones ) + if( m_zoneFillCheck->GetValue() ) m_parent->Check_All_Zones( this ); m_plotOpts.SetAutoScale( false ); diff --git a/pcbnew/dialogs/dialog_plot.h b/pcbnew/dialogs/dialog_plot.h index 30f3712b15..7a695e5c7b 100644 --- a/pcbnew/dialogs/dialog_plot.h +++ b/pcbnew/dialogs/dialog_plot.h @@ -58,7 +58,6 @@ private: // Event called functions void Plot( wxCommandEvent& event ) override; - void DraftPlot( wxCommandEvent& event ) override; void OnQuit( wxCommandEvent& event ) override; void OnClose( wxCloseEvent& event ) override; void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) override; diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 86595d2391..20d26beddf 100644 --- a/pcbnew/dialogs/dialog_plot_base.cpp +++ b/pcbnew/dialogs/dialog_plot_base.cpp @@ -89,7 +89,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr bSizerPlotItems = new wxBoxSizer( wxVERTICAL ); m_plotSheetRef = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerPlotItems->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 ); + bSizerPlotItems->Add( m_plotSheetRef, 0, wxRIGHT|wxLEFT, 2 ); m_plotModuleValueOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Plot footprint values"), wxDefaultPosition, wxDefaultSize, 0 ); m_plotModuleValueOpt->SetValue(true); @@ -107,7 +107,7 @@ 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") ); - bSizerPlotItems->Add( m_plotNoViaOnMaskOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 ); + bSizerPlotItems->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 ); m_excludeEdgeLayerOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Exclude PCB edge layer from other layers"), wxDefaultPosition, wxDefaultSize, 0 ); m_excludeEdgeLayerOpt->SetToolTip( _("Do not plot the contents of the PCB edge layer on any other layers.") ); @@ -119,16 +119,19 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr bSizerPlotItems->Add( m_excludePadsFromSilkscreen, 0, wxALL, 2 ); + m_useAuxOriginCheckBox = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Use auxiliary axis as origin"), wxDefaultPosition, wxDefaultSize, 0 ); + m_useAuxOriginCheckBox->SetToolTip( _("Use auxiliary axis as coordinates origin in plot files") ); + + bSizerPlotItems->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 ); + m_plotMirrorOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerPlotItems->Add( m_plotMirrorOpt, 0, wxALL, 2 ); m_plotPSNegativeOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerPlotItems->Add( m_plotPSNegativeOpt, 0, wxALL, 2 ); - m_useAuxOriginCheckBox = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Use auxiliary axis as origin"), wxDefaultPosition, wxDefaultSize, 0 ); - m_useAuxOriginCheckBox->SetToolTip( _("Use auxiliary axis as coordinates origin in plot files") ); - - bSizerPlotItems->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 ); + m_zoneFillCheck = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Check zone fills before plotting"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerPlotItems->Add( m_zoneFillCheck, 0, wxALL, 2 ); bSizer192->Add( bSizerPlotItems, 0, wxEXPAND, 5 ); @@ -186,39 +189,38 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 ); - wxStaticBoxSizer* sbSizerSoldMaskLayerOpt; - sbSizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Solder Mask Options:") ), wxVERTICAL ); + m_sizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Solder Mask Options:") ), wxVERTICAL ); wxFlexGridSizer* fgSizerSoldMaskOpts; fgSizerSoldMaskOpts = new wxFlexGridSizer( 2, 2, 0, 0 ); fgSizerSoldMaskOpts->SetFlexibleDirection( wxBOTH ); fgSizerSoldMaskOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_SolderMaskMarginLabel = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SolderMaskMarginLabel = new wxStaticText( m_sizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginLabel->Wrap( -1 ); m_SolderMaskMarginLabel->SetToolTip( _("Margin between pads and solder mask") ); fgSizerSoldMaskOpts->Add( m_SolderMaskMarginLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - m_SolderMaskMarginCurrValue = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("val"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SolderMaskMarginCurrValue = new wxStaticText( m_sizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("val"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginCurrValue->Wrap( -1 ); fgSizerSoldMaskOpts->Add( m_SolderMaskMarginCurrValue, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - m_solderMaskMinWidthLabel = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_solderMaskMinWidthLabel = new wxStaticText( m_sizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_solderMaskMinWidthLabel->Wrap( -1 ); m_solderMaskMinWidthLabel->SetToolTip( _("Minimum distance between 2 pad areas.\nTwo pad areas nearer than this value will be merged during plotting") ); fgSizerSoldMaskOpts->Add( m_solderMaskMinWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_SolderMaskMinWidthCurrValue = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("val"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SolderMaskMinWidthCurrValue = new wxStaticText( m_sizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("val"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMinWidthCurrValue->Wrap( -1 ); fgSizerSoldMaskOpts->Add( m_SolderMaskMinWidthCurrValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - sbSizerSoldMaskLayerOpt->Add( fgSizerSoldMaskOpts, 1, wxEXPAND, 5 ); + m_sizerSoldMaskLayerOpt->Add( fgSizerSoldMaskOpts, 1, wxEXPAND, 5 ); - m_PlotOptionsSizer->Add( sbSizerSoldMaskLayerOpt, 1, wxEXPAND, 5 ); + m_PlotOptionsSizer->Add( m_sizerSoldMaskLayerOpt, 1, wxEXPAND, 5 ); m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options:") ), wxHORIZONTAL ); @@ -228,7 +230,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_useGerberExtensions = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Use Protel filename extensions"), wxDefaultPosition, wxDefaultSize, 0 ); m_useGerberExtensions->SetToolTip( _("Use Protel Gerber extensions (.GBL, .GTL, etc...)\nNo longer recommended. The official extension is .gbr") ); - bSizerGbrOpt->Add( m_useGerberExtensions, 0, wxALL, 2 ); + bSizerGbrOpt->Add( m_useGerberExtensions, 0, wxBOTTOM|wxRIGHT|wxLEFT, 2 ); m_useGerberX2Attributes = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Include extended (X2) attributes"), wxDefaultPosition, wxDefaultSize, 0 ); m_useGerberX2Attributes->SetToolTip( _("Include extended attributes (X2 Gerber files format) in the Gerber file.\nMainly File Format attributes.") ); @@ -259,7 +261,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_rbGerberFormat->SetSelection( 0 ); m_rbGerberFormat->SetToolTip( _("Resolution of coordinates in Gerber files.\nUse the higher value if possible.") ); - m_GerberOptionsSizer->Add( m_rbGerberFormat, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL, 5 ); + m_GerberOptionsSizer->Add( m_rbGerberFormat, 0, wxALIGN_LEFT|wxALIGN_TOP|wxBOTTOM|wxLEFT, 5 ); m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 ); @@ -355,7 +357,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_SizerDXF_options->Add( m_DXF_plotTextStrokeFontOpt, 0, wxALL, 2 ); - m_PlotOptionsSizer->Add( m_SizerDXF_options, 0, wxEXPAND, 5 ); + m_PlotOptionsSizer->Add( m_SizerDXF_options, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_PlotOptionsSizer, 0, 0, 5 ); @@ -380,9 +382,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_buttonDRC = new wxButton( this, wxID_ANY, _("Run DRC..."), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonDRC, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File..."), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerButtons->Add( m_buttonDrill, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - bSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 ); @@ -441,8 +440,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_useGerberX2Attributes->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnGerberX2Checked ), NULL, this ); m_DXF_plotModeOpt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnChangeDXFPlotMode ), NULL, this ); m_buttonDRC->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onRunDRC ), NULL, this ); - m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this ); - m_sdbSizer1Apply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::DraftPlot ), NULL, this ); + m_sdbSizer1Apply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this ); m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this ); this->Connect( m_menuItem1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnPopUpLayers ) ); @@ -465,8 +463,7 @@ DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE() m_useGerberX2Attributes->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnGerberX2Checked ), NULL, this ); m_DXF_plotModeOpt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnChangeDXFPlotMode ), NULL, this ); m_buttonDRC->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::onRunDRC ), NULL, this ); - m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this ); - m_sdbSizer1Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::DraftPlot ), NULL, this ); + m_sdbSizer1Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this ); this->Disconnect( ID_LAYER_FAB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnPopUpLayers ) ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index a11f35d742..1373122591 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -730,7 +730,7 @@ none 2 - wxTOP|wxRIGHT|wxLEFT + wxRIGHT|wxLEFT 0 1 @@ -1082,7 +1082,7 @@ 2 - wxTOP|wxRIGHT|wxLEFT + wxALL 0 1 @@ -1344,6 +1344,94 @@ + + 2 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use auxiliary axis as origin + + 0 + + + 0 + + 1 + m_useAuxOriginCheckBox + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Use auxiliary axis as coordinates origin in plot files + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 wxALL @@ -1520,11 +1608,11 @@ - + 2 wxALL 0 - + 1 1 1 @@ -1553,7 +1641,7 @@ 0 0 wxID_ANY - Use auxiliary axis as origin + Check zone fills before plotting 0 @@ -1561,7 +1649,7 @@ 0 1 - m_useAuxOriginCheckBox + m_zoneFillCheck 1 @@ -1572,9 +1660,9 @@ 1 - + ; forward_declare 0 - Use auxiliary axis as coordinates origin in plot files + wxFILTER_NONE wxDefaultValidator @@ -1610,11 +1698,11 @@ - + 3 wxRIGHT|wxLEFT 1 - + bSizer14 wxVERTICAL @@ -2320,10 +2408,10 @@ wxID_ANY Solder Mask Options: - sbSizerSoldMaskLayerOpt + m_sizerSoldMaskLayerOpt wxVERTICAL 1 - none + protected 5 @@ -2681,7 +2769,7 @@ 3 wxALL|wxEXPAND 0 - + wxID_ANY Gerber Options: @@ -2701,7 +2789,7 @@ none 2 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -3143,7 +3231,7 @@ 5 - wxALIGN_LEFT|wxALIGN_TOP|wxALL + wxALIGN_LEFT|wxALIGN_TOP|wxBOTTOM|wxLEFT 0 1 @@ -4104,7 +4192,7 @@ 5 - wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT 0 wxID_ANY @@ -4485,94 +4573,6 @@ - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CREATE_DRILL_FILE - Generate Drill File... - - 0 - - - 0 - - 1 - m_buttonDrill - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - CreateDrillFile - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxEXPAND @@ -4599,7 +4599,7 @@ m_sdbSizer1 protected - DraftPlot + CreateDrillFile OnQuit diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h index f45e9ed0d7..33889cf6b3 100644 --- a/pcbnew/dialogs/dialog_plot_base.h +++ b/pcbnew/dialogs/dialog_plot_base.h @@ -51,7 +51,6 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM ID_PRINT_REF = 1000, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, ID_MIROR_OPT, - ID_CREATE_DRILL_FILE, ID_LAYER_FAB, ID_SELECT_COPPER_LAYERS, ID_DESELECT_COPPER_LAYERS, @@ -75,9 +74,10 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxCheckBox* m_plotNoViaOnMaskOpt; wxCheckBox* m_excludeEdgeLayerOpt; wxCheckBox* m_excludePadsFromSilkscreen; + wxCheckBox* m_useAuxOriginCheckBox; wxCheckBox* m_plotMirrorOpt; wxCheckBox* m_plotPSNegativeOpt; - wxCheckBox* m_useAuxOriginCheckBox; + wxCheckBox* m_zoneFillCheck; wxStaticText* m_staticText11; wxChoice* m_drillShapeOpt; wxStaticText* m_staticText12; @@ -86,6 +86,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxChoice* m_plotModeOpt; wxStaticText* m_textDefaultPenSize; wxTextCtrl* m_linesWidth; + wxStaticBoxSizer* m_sizerSoldMaskLayerOpt; wxStaticText* m_SolderMaskMarginLabel; wxStaticText* m_SolderMaskMarginCurrValue; wxStaticText* m_solderMaskMinWidthLabel; @@ -113,7 +114,6 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxCheckBox* m_DXF_plotTextStrokeFontOpt; WX_HTML_REPORT_PANEL* m_messagesPanel; wxButton* m_buttonDRC; - wxButton* m_buttonDrill; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Apply; @@ -131,7 +131,6 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM virtual void OnChangeDXFPlotMode( wxCommandEvent& event ) { event.Skip(); } virtual void onRunDRC( wxCommandEvent& event ) { event.Skip(); } virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); } - virtual void DraftPlot( wxCommandEvent& event ) { event.Skip(); } virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); } virtual void Plot( wxCommandEvent& event ) { event.Skip(); } virtual void OnPopUpLayers( wxCommandEvent& event ) { event.Skip(); } diff --git a/pcbnew/pcbplot.h b/pcbnew/pcbplot.h index 22a4baf933..8f796ea09e 100644 --- a/pcbnew/pcbplot.h +++ b/pcbnew/pcbplot.h @@ -61,6 +61,7 @@ class REPORTER; #define OPTKEY_PLOT_X_FINESCALE_ADJ wxT( "PlotXFineScaleAdj" ) #define OPTKEY_PLOT_Y_FINESCALE_ADJ wxT( "PlotYFineScaleAdj" ) #define CONFIG_PS_FINEWIDTH_ADJ wxT( "PSPlotFineWidthAdj" ) +#define OPTKEY_PLOT_CHECK_ZONES wxT( "CheckZonesBeforePlotting" ) ///@}