coding policy fixes (99ee5507) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_plot_base.cpp

+104 −95

Original line number	Original line	Diff line number	Diff line
	@@ -35,84 +35,84 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	bLeftSizer->Add( sbLayersSizer, 1, wxEXPAND, 5 );		bLeftSizer->Add( sbLayersSizer, 1, wxEXPAND, 5 );

	m_Use_Gerber_Extensions = new wxCheckBox( this, ID_USE_GERBER_EXTENSIONS, _("Use proper Gerber extensions"), wxDefaultPosition, wxDefaultSize, 0 );		m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper Gerber extensions"), wxDefaultPosition, wxDefaultSize, 0 );
	m_Use_Gerber_Extensions->SetToolTip( _("Use Proper Gerber Extensions - .GBL, .GTL, etc...") );		m_useGerberExtensions->SetToolTip( _("Use Proper Gerber Extensions - .GBL, .GTL, etc...") );

	bLeftSizer->Add( m_Use_Gerber_Extensions, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_useGerberExtensions, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude pcb edge layer"), wxDefaultPosition, wxDefaultSize, 0 );		m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude pcb edge layer"), wxDefaultPosition, wxDefaultSize, 0 );
	m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );		m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );

	bLeftSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_SubtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract mask from silk"), wxDefaultPosition, wxDefaultSize, 0 );		m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract mask from silk"), wxDefaultPosition, wxDefaultSize, 0 );
	m_SubtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );		m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );

	bLeftSizer->Add( m_SubtractMaskFromSilk, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_subtractMaskFromSilk, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_Plot_Sheet_Ref = new wxCheckBox( this, wxID_ANY, _("Print sheet reference"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference"), wxDefaultPosition, wxDefaultSize, 0 );
	bLeftSizer->Add( m_Plot_Sheet_Ref, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_plotSheetRef, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_Plot_Pads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Print pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
	m_Plot_Pads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );		m_plotPads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );

	bLeftSizer->Add( m_Plot_Pads_on_Silkscreen, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_plotPads_on_Silkscreen, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_Plot_Text_Value = new wxCheckBox( this, ID_PRINT_VALUE, _("Print module value"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value"), wxDefaultPosition, wxDefaultSize, 0 );
	bLeftSizer->Add( m_Plot_Text_Value, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_plotModuleValueOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_Plot_Text_Ref = new wxCheckBox( this, ID_PRINT_REF, _("Print module reference"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference"), wxDefaultPosition, wxDefaultSize, 0 );
	bLeftSizer->Add( m_Plot_Text_Ref, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_plotModuleRefOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_Plot_Text_Div = new wxCheckBox( this, ID_PRINT_MODULE_TEXTS, _("Print other module texts"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotTextOther = new wxCheckBox( this, wxID_ANY, _("Plot other module texts"), wxDefaultPosition, wxDefaultSize, 0 );
	m_Plot_Text_Div->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );		m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );

	bLeftSizer->Add( m_Plot_Text_Div, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bLeftSizer->Add( m_plotTextOther, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_Plot_Invisible_Text = new wxCheckBox( this, ID_FORCE_PRINT_INVISIBLE_TEXT, _("Force print invisible texts"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotInvisibleText = new wxCheckBox( this, wxID_ANY, _("Force plot invisible texts"), wxDefaultPosition, wxDefaultSize, 0 );
	m_Plot_Invisible_Text->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );		m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );

	bLeftSizer->Add( m_Plot_Invisible_Text, 0, wxALL, 5 );		bLeftSizer->Add( m_plotInvisibleText, 0, wxALL, 5 );

	bUpperSizer->Add( bLeftSizer, 2, wxEXPAND, 5 );		bUpperSizer->Add( bLeftSizer, 2, wxEXPAND, 5 );

	wxBoxSizer* bPlotOptionsSizer;		wxBoxSizer* bPlotOptionsSizer;
	bPlotOptionsSizer = new wxBoxSizer( wxVERTICAL );		bPlotOptionsSizer = new wxBoxSizer( wxVERTICAL );

	wxString m_Drill_Shape_OptChoices[] = { _("No drill mark"), _("Small mark"), _("Real drill") };		wxString m_drillShapeOptChoices[] = { _("No drill mark"), _("Small mark"), _("Real drill") };
	int m_Drill_Shape_OptNChoices = sizeof( m_Drill_Shape_OptChoices ) / sizeof( wxString );		int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
	m_Drill_Shape_Opt = new wxRadioBox( this, ID_DRILL_SHAPE_OPT, _("Pads Drill Opt"), wxDefaultPosition, wxDefaultSize, m_Drill_Shape_OptNChoices, m_Drill_Shape_OptChoices, 1, wxRA_SPECIFY_COLS );		m_drillShapeOpt = new wxRadioBox( this, wxID_ANY, _("Pads Drill Opt"), wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 1, wxRA_SPECIFY_COLS );
	m_Drill_Shape_Opt->SetSelection( 1 );		m_drillShapeOpt->SetSelection( 1 );
	bPlotOptionsSizer->Add( m_Drill_Shape_Opt, 0, wxALL\|wxEXPAND, 5 );		bPlotOptionsSizer->Add( m_drillShapeOpt, 0, wxEXPAND\|wxALL, 5 );

	wxString m_Scale_OptChoices[] = { _("Auto scale"), _("Scale 1"), _("Scale 1.5"), _("Scale 2"), _("Scale 3") };		wxString m_scaleOptChoices[] = { _("Auto scale"), _("Scale 1"), _("Scale 1.5"), _("Scale 2"), _("Scale 3") };
	int m_Scale_OptNChoices = sizeof( m_Scale_OptChoices ) / sizeof( wxString );		int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
	m_Scale_Opt = new wxRadioBox( this, wxID_ANY, _("Scale Opt"), wxDefaultPosition, wxDefaultSize, m_Scale_OptNChoices, m_Scale_OptChoices, 1, wxRA_SPECIFY_COLS );		m_scaleOpt = new wxRadioBox( this, wxID_ANY, _("Scale Opt"), wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 1, wxRA_SPECIFY_COLS );
	m_Scale_Opt->SetSelection( 0 );		m_scaleOpt->SetSelection( 0 );
	bPlotOptionsSizer->Add( m_Scale_Opt, 0, wxALL\|wxEXPAND, 5 );		bPlotOptionsSizer->Add( m_scaleOpt, 0, wxEXPAND\|wxALL, 5 );

	wxString m_PlotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };		wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
	int m_PlotModeOptNChoices = sizeof( m_PlotModeOptChoices ) / sizeof( wxString );		int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
	m_PlotModeOpt = new wxRadioBox( this, wxID_ANY, _("Plot Mode"), wxDefaultPosition, wxDefaultSize, m_PlotModeOptNChoices, m_PlotModeOptChoices, 1, wxRA_SPECIFY_COLS );		m_plotModeOpt = new wxRadioBox( this, wxID_ANY, _("Plot Mode"), wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 1, wxRA_SPECIFY_COLS );
	m_PlotModeOpt->SetSelection( 0 );		m_plotModeOpt->SetSelection( 0 );
	bPlotOptionsSizer->Add( m_PlotModeOpt, 0, wxALL\|wxEXPAND, 5 );		bPlotOptionsSizer->Add( m_plotModeOpt, 0, wxALL\|wxEXPAND, 5 );

	wxString m_Choice_Plot_OffsetChoices[] = { _("Absolute"), _("Auxiliary axis") };		wxString m_choicePlotOffsetChoices[] = { _("Absolute"), _("Auxiliary axis") };
	int m_Choice_Plot_OffsetNChoices = sizeof( m_Choice_Plot_OffsetChoices ) / sizeof( wxString );		int m_choicePlotOffsetNChoices = sizeof( m_choicePlotOffsetChoices ) / sizeof( wxString );
	m_Choice_Plot_Offset = new wxRadioBox( this, wxID_ANY, _("Plot Origin"), wxDefaultPosition, wxDefaultSize, m_Choice_Plot_OffsetNChoices, m_Choice_Plot_OffsetChoices, 1, wxRA_SPECIFY_COLS );		m_choicePlotOffset = new wxRadioBox( this, wxID_ANY, _("Plot Origin"), wxDefaultPosition, wxDefaultSize, m_choicePlotOffsetNChoices, m_choicePlotOffsetChoices, 1, wxRA_SPECIFY_COLS );
	m_Choice_Plot_Offset->SetSelection( 0 );		m_choicePlotOffset->SetSelection( 0 );
	bPlotOptionsSizer->Add( m_Choice_Plot_Offset, 0, wxALL\|wxEXPAND, 5 );		bPlotOptionsSizer->Add( m_choicePlotOffset, 0, wxALL\|wxEXPAND, 5 );

	bUpperSizer->Add( bPlotOptionsSizer, 1, 0, 5 );		bUpperSizer->Add( bPlotOptionsSizer, 1, 0, 5 );

	wxBoxSizer* bSizerFmtPlot;		wxBoxSizer* bSizerFmtPlot;
	bSizerFmtPlot = new wxBoxSizer( wxVERTICAL );		bSizerFmtPlot = new wxBoxSizer( wxVERTICAL );

	wxString m_PlotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF Export") };		wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF Export") };
	int m_PlotFormatOptNChoices = sizeof( m_PlotFormatOptChoices ) / sizeof( wxString );		int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
	m_PlotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Plot Format"), wxDefaultPosition, wxDefaultSize, m_PlotFormatOptNChoices, m_PlotFormatOptChoices, 1, wxRA_SPECIFY_COLS );		m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Plot Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_COLS );
	m_PlotFormatOpt->SetSelection( 1 );		m_plotFormatOpt->SetSelection( 1 );
	bSizerFmtPlot->Add( m_PlotFormatOpt, 0, wxALL\|wxEXPAND, 5 );		bSizerFmtPlot->Add( m_plotFormatOpt, 0, wxALL\|wxEXPAND, 5 );

	wxStaticBoxSizer* m_HPGL_OptionsBox;		wxStaticBoxSizer* m_HPGL_OptionsBox;
	m_HPGL_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options:") ), wxVERTICAL );		m_HPGL_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options:") ), wxVERTICAL );
	@@ -142,39 +142,28 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	m_HPGL_OptionsBox->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );		m_HPGL_OptionsBox->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );

	bSizerFmtPlot->Add( m_HPGL_OptionsBox, 1, wxEXPAND, 5 );		bSizerFmtPlot->Add( m_HPGL_OptionsBox, 0, wxEXPAND, 5 );

	wxStaticBoxSizer* sbSizerPSOpt;		bUpperSizer->Add( bSizerFmtPlot, 1, 0, 5 );
	sbSizerPSOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("PS Options:") ), wxVERTICAL );

	m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Plot negative"), wxDefaultPosition, wxDefaultSize, 0 );		wxBoxSizer* bButtonsSizer;
	sbSizerPSOpt->Add( m_plotPSNegativeOpt, 0, wxALL, 5 );		bButtonsSizer = new wxBoxSizer( wxVERTICAL );

	bSizerFmtPlot->Add( sbSizerPSOpt, 0, wxEXPAND, 5 );

	wxStaticBoxSizer* sbSizerOutputDir;
	sbSizerOutputDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Output Directory:") ), wxVERTICAL );

	m_OutputDirectory = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	sbSizerOutputDir->Add( m_OutputDirectory, 0, wxALIGN_LEFT\|wxEXPAND, 5 );

	m_BrowseButton = new wxButton( this, ID_BROWSE_OUTPUT_DIRECTORY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );		wxStaticBoxSizer* sbSizerPlotOpt;
	sbSizerOutputDir->Add( m_BrowseButton, 0, wxALL, 5 );		sbSizerPlotOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Plot Options:") ), wxVERTICAL );

	bSizerFmtPlot->Add( sbSizerOutputDir, 0, wxEXPAND, 5 );		m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Plot negative"), wxDefaultPosition, wxDefaultSize, 0 );
			sbSizerPlotOpt->Add( m_plotPSNegativeOpt, 0, wxALL, 5 );

	bUpperSizer->Add( bSizerFmtPlot, 1, wxEXPAND, 5 );		m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Plot mirror"), wxDefaultPosition, wxDefaultSize, 0 );
			sbSizerPlotOpt->Add( m_plotMirrorOpt, 0, wxALL, 5 );

	wxBoxSizer* bButtonsSizer;		m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Vias on mask"), wxDefaultPosition, wxDefaultSize, 0 );
	bButtonsSizer = new wxBoxSizer( wxVERTICAL );		m_plotNoViaOnMaskOpt->SetToolTip( _("Print/plot vias on mask layers. They are in this case not protected") );

	m_PlotMirorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Plot mirror"), wxDefaultPosition, wxDefaultSize, 0 );		sbSizerPlotOpt->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 5 );
	bButtonsSizer->Add( m_PlotMirorOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_PlotNoViaOnMaskOpt = new wxCheckBox( this, ID_MASKVIA_OPT, _("Vias on mask"), wxDefaultPosition, wxDefaultSize, 0 );		bButtonsSizer->Add( sbSizerPlotOpt, 0, wxEXPAND\|wxALL, 5 );
	m_PlotNoViaOnMaskOpt->SetToolTip( _("Print/plot vias on mask layers. They are in this case not protected") );

	bButtonsSizer->Add( m_PlotNoViaOnMaskOpt, 0, wxALL, 5 );

	m_staticText6 = new wxStaticText( this, wxID_ANY, _("Default pen size"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText6 = new wxStaticText( this, wxID_ANY, _("Default pen size"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText6->Wrap( -1 );		m_staticText6->Wrap( -1 );
	@@ -182,8 +171,8 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	bButtonsSizer->Add( m_staticText6, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bButtonsSizer->Add( m_staticText6, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_LinesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	bButtonsSizer->Add( m_LinesWidth, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );		bButtonsSizer->Add( m_linesWidth, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );


	bButtonsSizer->Add( 0, 20, 1, wxEXPAND, 5 );		bButtonsSizer->Add( 0, 20, 1, wxEXPAND, 5 );
	@@ -192,24 +181,24 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_staticText7->Wrap( -1 );		m_staticText7->Wrap( -1 );
	bButtonsSizer->Add( m_staticText7, 0, wxRIGHT\|wxLEFT, 5 );		bButtonsSizer->Add( m_staticText7, 0, wxRIGHT\|wxLEFT, 5 );

	m_FineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_fineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	m_FineAdjustXscaleOpt->SetToolTip( _("Set X scale adjust for exact scale plotting") );		m_fineAdjustXscaleOpt->SetToolTip( _("Set X scale adjust for exact scale plotting") );

	bButtonsSizer->Add( m_FineAdjustXscaleOpt, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );		bButtonsSizer->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale adjust"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale adjust"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText8->Wrap( -1 );		m_staticText8->Wrap( -1 );
	bButtonsSizer->Add( m_staticText8, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bButtonsSizer->Add( m_staticText8, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_FineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	bButtonsSizer->Add( m_FineAdjustYscaleOpt, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );		bButtonsSizer->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );


	bButtonsSizer->Add( 0, 20, 1, wxEXPAND, 5 );		bButtonsSizer->Add( 0, 20, 1, wxEXPAND, 5 );

	m_PlotButton = new wxButton( this, ID_EXEC_PLOT, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
	m_PlotButton->SetDefault();		m_plotButton->SetDefault();
	bButtonsSizer->Add( m_PlotButton, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		bButtonsSizer->Add( m_plotButton, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

	m_buttonSaveOpt = new wxButton( this, ID_SAVE_OPT_PLOT, _("Save Options"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonSaveOpt = new wxButton( this, ID_SAVE_OPT_PLOT, _("Save Options"), wxDefaultPosition, wxDefaultSize, 0 );
	bButtonsSizer->Add( m_buttonSaveOpt, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		bButtonsSizer->Add( m_buttonSaveOpt, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );
	@@ -224,14 +213,34 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 );		bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 );

			wxBoxSizer* bSizerDirChoice;
			bSizerDirChoice = new wxBoxSizer( wxVERTICAL );

			m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output Directory:"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticTextDir->Wrap( -1 );
			bSizerDirChoice->Add( m_staticTextDir, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

			wxBoxSizer* bSizerDirNmae;
			bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );

			m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
			bSizerDirNmae->Add( m_outputDirectoryName, 1, wxALIGN_LEFT\|wxALIGN_CENTER_VERTICAL\|wxRIGHT\|wxLEFT, 5 );

			m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
			bSizerDirNmae->Add( m_browseButton, 0, wxRIGHT\|wxLEFT, 5 );

			bSizerDirChoice->Add( bSizerDirNmae, 1, wxEXPAND\|wxRIGHT, 5 );

			bMainSizer->Add( bSizerDirChoice, 0, wxEXPAND, 5 );

	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText2->Wrap( -1 );		m_staticText2->Wrap( -1 );
	bMainSizer->Add( m_staticText2, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bMainSizer->Add( m_staticText2, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );		m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
	m_MessagesBox->SetMinSize( wxSize( -1,120 ) );		m_messagesBox->SetMinSize( wxSize( -1,120 ) );

	bMainSizer->Add( m_MessagesBox, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );		bMainSizer->Add( m_messagesBox, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );

	this->SetSizer( bMainSizer );		this->SetSizer( bMainSizer );
	this->Layout();		this->Layout();
	@@ -240,12 +249,12 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	// Connect Events		// Connect Events
	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );		this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );
	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );		this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
	m_PlotFormatOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );		m_plotFormatOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
	m_BrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );		m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
	m_PlotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );		m_buttonSaveOpt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::savePlotOptions ), NULL, this );
	m_buttonSaveOpt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::SaveOptPlot ), NULL, this );
	m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );		m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );		m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
			m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
	}		}

	DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()		DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
	@@ -253,11 +262,11 @@ DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
	// Disconnect Events		// Disconnect Events
	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );		this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );
	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );		this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
	m_PlotFormatOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );		m_plotFormatOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
	m_BrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );		m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
	m_PlotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );		m_buttonSaveOpt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::savePlotOptions ), NULL, this );
	m_buttonSaveOpt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::SaveOptPlot ), NULL, this );
	m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );		m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );		m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
			m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );

	}		}

pcbnew/dialogs/dialog_plot_base.fbp

+231 −167

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_plot_base.h

+26 −33

Original line number	Original line	Diff line number	Diff line
	@@ -36,37 +36,29 @@ class DIALOG_PLOT_BASE : public wxDialog
	protected:		protected:
	enum		enum
	{		{
	ID_USE_GERBER_EXTENSIONS = 1000,		ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
	ID_ALLOW_PRINT_PAD_ON_SILKSCREEN,
	ID_PRINT_VALUE,
	ID_PRINT_REF,		ID_PRINT_REF,
	ID_PRINT_MODULE_TEXTS,
	ID_FORCE_PRINT_INVISIBLE_TEXT,
	ID_DRILL_SHAPE_OPT,
	ID_BROWSE_OUTPUT_DIRECTORY,
	ID_MIROR_OPT,		ID_MIROR_OPT,
	ID_MASKVIA_OPT,
	ID_EXEC_PLOT,
	ID_SAVE_OPT_PLOT,		ID_SAVE_OPT_PLOT,
	ID_CREATE_DRILL_FILE,		ID_CREATE_DRILL_FILE,
	};		};

	wxStaticBoxSizer* m_CopperLayersBoxSizer;		wxStaticBoxSizer* m_CopperLayersBoxSizer;
	wxStaticBoxSizer* m_TechnicalLayersBoxSizer;		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
	wxCheckBox* m_Use_Gerber_Extensions;		wxCheckBox* m_useGerberExtensions;
	wxCheckBox* m_excludeEdgeLayerOpt;		wxCheckBox* m_excludeEdgeLayerOpt;
	wxCheckBox* m_SubtractMaskFromSilk;		wxCheckBox* m_subtractMaskFromSilk;
	wxCheckBox* m_Plot_Sheet_Ref;		wxCheckBox* m_plotSheetRef;
	wxCheckBox* m_Plot_Pads_on_Silkscreen;		wxCheckBox* m_plotPads_on_Silkscreen;
	wxCheckBox* m_Plot_Text_Value;		wxCheckBox* m_plotModuleValueOpt;
	wxCheckBox* m_Plot_Text_Ref;		wxCheckBox* m_plotModuleRefOpt;
	wxCheckBox* m_Plot_Text_Div;		wxCheckBox* m_plotTextOther;
	wxCheckBox* m_Plot_Invisible_Text;		wxCheckBox* m_plotInvisibleText;
	wxRadioBox* m_Drill_Shape_Opt;		wxRadioBox* m_drillShapeOpt;
	wxRadioBox* m_Scale_Opt;		wxRadioBox* m_scaleOpt;
	wxRadioBox* m_PlotModeOpt;		wxRadioBox* m_plotModeOpt;
	wxRadioBox* m_Choice_Plot_Offset;		wxRadioBox* m_choicePlotOffset;
	wxRadioBox* m_PlotFormatOpt;		wxRadioBox* m_plotFormatOpt;
	wxStaticText* m_textPenSize;		wxStaticText* m_textPenSize;
	wxTextCtrl* m_HPGLPenSizeOpt;		wxTextCtrl* m_HPGLPenSizeOpt;
	wxStaticText* m_staticText3;		wxStaticText* m_staticText3;
	@@ -74,34 +66,35 @@ class DIALOG_PLOT_BASE : public wxDialog
	wxStaticText* m_textPenOvr;		wxStaticText* m_textPenOvr;
	wxTextCtrl* m_HPGLPenOverlayOpt;		wxTextCtrl* m_HPGLPenOverlayOpt;
	wxCheckBox* m_plotPSNegativeOpt;		wxCheckBox* m_plotPSNegativeOpt;
	wxTextCtrl* m_OutputDirectory;		wxCheckBox* m_plotMirrorOpt;
	wxButton* m_BrowseButton;		wxCheckBox* m_plotNoViaOnMaskOpt;
	wxCheckBox* m_PlotMirorOpt;
	wxCheckBox* m_PlotNoViaOnMaskOpt;
	wxStaticText* m_staticText6;		wxStaticText* m_staticText6;
	wxTextCtrl* m_LinesWidth;		wxTextCtrl* m_linesWidth;

	wxStaticText* m_staticText7;		wxStaticText* m_staticText7;
	wxTextCtrl* m_FineAdjustXscaleOpt;		wxTextCtrl* m_fineAdjustXscaleOpt;
	wxStaticText* m_staticText8;		wxStaticText* m_staticText8;
	wxTextCtrl* m_FineAdjustYscaleOpt;		wxTextCtrl* m_fineAdjustYscaleOpt;

	wxButton* m_PlotButton;		wxButton* m_plotButton;
	wxButton* m_buttonSaveOpt;		wxButton* m_buttonSaveOpt;
	wxButton* m_buttonDrill;		wxButton* m_buttonDrill;
	wxButton* m_buttonQuit;		wxButton* m_buttonQuit;
			wxStaticText* m_staticTextDir;
			wxTextCtrl* m_outputDirectoryName;
			wxButton* m_browseButton;
	wxStaticText* m_staticText2;		wxStaticText* m_staticText2;
	wxTextCtrl* m_MessagesBox;		wxTextCtrl* m_messagesBox;

	// Virtual event handlers, overide them in your derived class		// Virtual event handlers, overide them in your derived class
	virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
	virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
	virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }		virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
	virtual void Plot( wxCommandEvent& event ) { event.Skip(); }		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
	virtual void SaveOptPlot( wxCommandEvent& event ) { event.Skip(); }		virtual void savePlotOptions( wxCommandEvent& event ) { event.Skip(); }
	virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
			virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }


	public:		public:

pcbnew/pcbplot.cpp

+110 −110

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/pcbplot.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,8 @@ public:
	bool m_PlotFrameRef; // True to plot/print frame references		bool m_PlotFrameRef; // True to plot/print frame references
	bool m_PlotViaOnMaskLayer; // True if vias are drawn on Mask layer		bool m_PlotViaOnMaskLayer; // True if vias are drawn on Mask layer
	// (ie protected by mask)		// (ie protected by mask)
	GRTraceMode Trace_Mode;		GRTraceMode m_PlotMode; // = FILAIRE, FILLED or SKETCH: select how to plot filled objects.
			// depending on plot format or layers, all options are not always allowed
	int m_HPGLPenNum;		int m_HPGLPenNum;
	int m_HPGLPenSpeed;		int m_HPGLPenSpeed;
	int m_HPGLPenDiam;		int m_HPGLPenDiam;

Admin message