Tune pcbnew plot dialog layout. (c9b27ee7) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_plot_base.cpp

+359 −345

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Sep 8 2010)		// C++ code generated with wxFormBuilder (version Nov 18 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -11,24 +11,54 @@

	DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )		DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
	{		{
	this->SetSizeHints( wxSize( -1,350 ), wxDefaultSize );		this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );

	wxBoxSizer* bMainSizer;		m_MainSizer = new wxBoxSizer( wxHORIZONTAL );
	bMainSizer = new wxBoxSizer( wxHORIZONTAL );

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

	wxBoxSizer* bSizer181;		wxBoxSizer* bSizer26;
	bSizer181 = new wxBoxSizer( wxHORIZONTAL );		bSizer26 = new wxBoxSizer( wxHORIZONTAL );

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

			m_staticText121 = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticText121->Wrap( -1 );
			bSizer27->Add( m_staticText121, 0, wxALL, 5 );

	wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") };		wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") };
	int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );		int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
	m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_ROWS );		m_plotFormatOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 0 );
	m_plotFormatOpt->SetSelection( 1 );		m_plotFormatOpt->SetSelection( 0 );
	bSizer181->Add( m_plotFormatOpt, 1, wxEXPAND, 5 );		bSizer27->Add( m_plotFormatOpt, 0, wxALL, 5 );

			bSizer26->Add( bSizer27, 0, wxEXPAND, 5 );

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

			m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticTextDir->Wrap( -1 );
			bSizer28->Add( m_staticTextDir, 0, wxALL\|wxEXPAND, 5 );

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

			m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
			m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be relative or absolute.") );

			bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 5 );

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

	bSizer12->Add( bSizer181, 0, wxEXPAND, 5 );		bSizer28->Add( bSizer29, 1, wxEXPAND, 5 );

			bSizer26->Add( bSizer28, 1, 0, 5 );

			bSizer12->Add( bSizer26, 0, wxEXPAND, 5 );

	wxBoxSizer* bUpperSizer;		wxBoxSizer* bUpperSizer;
	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );		bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
	@@ -46,43 +76,50 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	bUpperSizer->Add( sbLayersSizer, 1, wxALL, 3 );		bUpperSizer->Add( sbLayersSizer, 1, wxALL, 3 );

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

	wxStaticBoxSizer* sbOptionsSizer;		wxStaticBoxSizer* sbOptionsSizer;
	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );		sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );

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

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

	m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
	sbOptionsSizer->Add( m_plotSheetRef, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		bSizer201->Add( m_plotSheetRef, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

	m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot 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_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") );		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") );

	sbOptionsSizer->Add( m_plotPads_on_Silkscreen, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		bSizer201->Add( m_plotPads_on_Silkscreen, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

	m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
	sbOptionsSizer->Add( m_plotModuleValueOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		bSizer201->Add( m_plotModuleValueOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

	m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
	sbOptionsSizer->Add( m_plotModuleRefOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		bSizer201->Add( m_plotModuleRefOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

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

	sbOptionsSizer->Add( m_plotTextOther, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		bSizer201->Add( m_plotTextOther, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

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

	sbOptionsSizer->Add( m_plotInvisibleText, 0, wxALL, 2 );		bSizer201->Add( m_plotInvisibleText, 0, wxALL, 2 );

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

	sbOptionsSizer->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );		bSizer201->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );

	m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
	sbOptionsSizer->Add( m_plotMirrorOpt, 0, wxALL, 2 );		bSizer201->Add( m_plotMirrorOpt, 0, wxALL, 2 );

			bSizer192->Add( bSizer201, 0, wxEXPAND, 5 );

	wxBoxSizer* bSizer14;		wxBoxSizer* bSizer14;
	bSizer14 = new wxBoxSizer( wxHORIZONTAL );		bSizer14 = new wxBoxSizer( wxHORIZONTAL );
	@@ -110,69 +147,59 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_scaleOpt->SetSelection( 0 );		m_scaleOpt->SetSelection( 0 );
	bSizer15->Add( m_scaleOpt, 0, wxEXPAND, 5 );		bSizer15->Add( m_scaleOpt, 0, wxEXPAND, 5 );

	bSizer14->Add( bSizer15, 1, wxALL\|wxEXPAND, 3 );

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

	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText13->Wrap( -1 );		m_staticText13->Wrap( -1 );
	bSizer16->Add( m_staticText13, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bSizer15->Add( m_staticText13, 0, wxTOP\|wxRIGHT\|wxLEFT, 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 wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );		m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
	m_plotModeOpt->SetSelection( 0 );		m_plotModeOpt->SetSelection( 0 );
	bSizer16->Add( m_plotModeOpt, 0, wxEXPAND, 5 );		bSizer15->Add( m_plotModeOpt, 0, wxEXPAND, 5 );

	m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );		m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );
	m_textDefaultPenSize->Wrap( -1 );		m_textDefaultPenSize->Wrap( -1 );
	m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );		m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );

	bSizer16->Add( m_textDefaultPenSize, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bSizer15->Add( m_textDefaultPenSize, 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 );
	m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );		m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );

	bSizer16->Add( m_linesWidth, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );		bSizer15->Add( m_linesWidth, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

	bSizer14->Add( bSizer16, 1, wxALL\|wxEXPAND, 3 );		bSizer14->Add( bSizer15, 1, wxALL, 3 );

	sbOptionsSizer->Add( bSizer14, 1, wxALL\|wxEXPAND, 3 );		bSizer192->Add( bSizer14, 1, wxALL, 3 );

	bPlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL\|wxEXPAND, 3 );		sbOptionsSizer->Add( bSizer192, 0, wxEXPAND, 5 );

	bUpperSizer->Add( bPlotOptionsSizer, 1, 0, 5 );		m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL\|wxEXPAND, 3 );

	wxBoxSizer* bPlotIndOptionsSizer;		m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
	bPlotIndOptionsSizer = new wxBoxSizer( wxVERTICAL );

	wxStaticBoxSizer* m_Gerber_OptionsBox;		m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper filename extensions"), wxDefaultPosition, wxDefaultSize, 0 );
	m_Gerber_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );

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

	m_Gerber_OptionsBox->Add( m_useGerberExtensions, 0, wxLEFT\|wxRIGHT\|wxTOP, 2 );		m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT\|wxRIGHT\|wxTOP, 2 );

	m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer\nfrom other layers"), wxDefaultPosition, wxDefaultSize, 0 );		m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer from other layers"), 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") );

	m_Gerber_OptionsBox->Add( m_excludeEdgeLayerOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		m_GerberOptionsSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

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

	m_Gerber_OptionsBox->Add( m_subtractMaskFromSilk, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );		m_GerberOptionsSizer->Add( m_subtractMaskFromSilk, 0, wxTOP\|wxRIGHT\|wxLEFT, 2 );

	m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary origin"), wxDefaultPosition, wxDefaultSize, 0 );		m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary origin"), wxDefaultPosition, wxDefaultSize, 0 );
	m_Gerber_OptionsBox->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );		m_GerberOptionsSizer->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );

	bPlotIndOptionsSizer->Add( m_Gerber_OptionsBox, 0, wxALL\|wxEXPAND, 3 );		m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL\|wxEXPAND, 3 );

	wxStaticBoxSizer* m_HPGL_OptionsBox;		m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
	m_HPGL_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );

	wxBoxSizer* bSizer22;		wxBoxSizer* bSizer22;
	bSizer22 = new wxBoxSizer( wxHORIZONTAL );		bSizer22 = new wxBoxSizer( wxHORIZONTAL );
	@@ -212,12 +239,11 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );		bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );

	m_HPGL_OptionsBox->Add( bSizer22, 1, wxEXPAND, 5 );		m_HPGLOptionsSizer->Add( bSizer22, 1, wxEXPAND, 5 );

	bPlotIndOptionsSizer->Add( m_HPGL_OptionsBox, 0, wxALL\|wxEXPAND, 3 );		m_PlotOptionsSizer->Add( m_HPGLOptionsSizer, 0, wxALL\|wxEXPAND, 3 );

	wxStaticBoxSizer* m_PS_OptionsBox;		m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
	m_PS_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );

	wxBoxSizer* bSizer17;		wxBoxSizer* bSizer17;
	bSizer17 = new wxBoxSizer( wxHORIZONTAL );		bSizer17 = new wxBoxSizer( wxHORIZONTAL );
	@@ -248,47 +274,35 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );		bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );

	m_PS_OptionsBox->Add( bSizer17, 1, wxEXPAND, 5 );		m_PSOptionsSizer->Add( bSizer17, 1, wxEXPAND, 5 );

	m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );		m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
	m_PS_OptionsBox->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );		m_PSOptionsSizer->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );

	bPlotIndOptionsSizer->Add( m_PS_OptionsBox, 1, wxALL\|wxEXPAND, 3 );		m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL\|wxEXPAND, 3 );

	bUpperSizer->Add( bPlotIndOptionsSizer, 0, 0, 5 );		bUpperSizer->Add( m_PlotOptionsSizer, 0, 0, 5 );

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

	wxBoxSizer* bSizerDirChoice;		wxBoxSizer* bSizerDirChoice;
	bSizerDirChoice = new wxBoxSizer( wxVERTICAL );		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;		wxBoxSizer* bSizerDirNmae;
	bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );		bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );

	m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		bSizerDirChoice->Add( bSizerDirNmae, 0, wxEXPAND, 5 );
	m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be relative or absolute.") );

	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, 0, wxRIGHT\|wxEXPAND, 5 );

	bSizer12->Add( bSizerDirChoice, 0, wxEXPAND, 5 );		bSizer12->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 );
	bSizer12->Add( m_staticText2, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bSizer12->Add( m_staticText2, 0, wxALL\|wxEXPAND, 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,100 ) );		m_messagesBox->SetMinSize( wxSize( -1,70 ) );

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

	wxBoxSizer* bSizer191;		wxBoxSizer* bSizer191;
	bSizer191 = new wxBoxSizer( wxHORIZONTAL );		bSizer191 = new wxBoxSizer( wxHORIZONTAL );
	@@ -309,20 +323,20 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
	bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );		bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );

	bSizer12->Add( bSizer191, 0, wxEXPAND, 5 );		bSizer12->Add( bSizer191, 0, wxALL\|wxEXPAND\|wxRIGHT, 5 );

	bMainSizer->Add( bSizer12, 1, wxALL, 5 );		m_MainSizer->Add( bSizer12, 1, wxALL, 5 );

	this->SetSizer( bMainSizer );		this->SetSizer( m_MainSizer );
	this->Layout();		this->Layout();
	bMainSizer->Fit( this );		m_MainSizer->Fit( this );

	// 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_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
	m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );		m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
			m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), 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::applyPlotSettings ), NULL, this );		m_buttonSaveOpt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), 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 );
	@@ -334,9 +348,9 @@ 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_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
	m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );		m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
			m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), 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::applyPlotSettings ), NULL, this );		m_buttonSaveOpt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), 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 );

pcbnew/dialogs/dialog_plot_base.fbp

+4025 −2734

File changed.

File size exceeds preview limit.

View original file

View changed file

pcbnew/dialogs/dialog_plot_base.h

+116 −111

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Sep 8 2010)		// C++ code generated with wxFormBuilder (version Nov 18 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -11,18 +11,17 @@
	#include <wx/intl.h>		#include <wx/intl.h>

	#include <wx/string.h>		#include <wx/string.h>
	#include <wx/radiobox.h>		#include <wx/stattext.h>
	#include <wx/gdicmn.h>		#include <wx/gdicmn.h>
	#include <wx/font.h>		#include <wx/font.h>
	#include <wx/colour.h>		#include <wx/colour.h>
	#include <wx/settings.h>		#include <wx/settings.h>
	#include <wx/sizer.h>
	#include <wx/statbox.h>
	#include <wx/checkbox.h>
	#include <wx/stattext.h>
	#include <wx/choice.h>		#include <wx/choice.h>
			#include <wx/sizer.h>
	#include <wx/textctrl.h>		#include <wx/textctrl.h>
	#include <wx/button.h>		#include <wx/button.h>
			#include <wx/statbox.h>
			#include <wx/checkbox.h>
	#include <wx/dialog.h>		#include <wx/dialog.h>

	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	@@ -44,9 +43,15 @@ class DIALOG_PLOT_BASE : public wxDialog
	ID_CREATE_DRILL_FILE,		ID_CREATE_DRILL_FILE,
	};		};

	wxRadioBox* m_plotFormatOpt;		wxBoxSizer* m_MainSizer;
			wxStaticText* m_staticText121;
			wxChoice* m_plotFormatOpt;
			wxStaticText* m_staticTextDir;
			wxTextCtrl* m_outputDirectoryName;
			wxButton* m_browseButton;
	wxStaticBoxSizer* m_CopperLayersBoxSizer;		wxStaticBoxSizer* m_CopperLayersBoxSizer;
	wxStaticBoxSizer* m_TechnicalLayersBoxSizer;		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
			wxBoxSizer* m_PlotOptionsSizer;
	wxCheckBox* m_plotSheetRef;		wxCheckBox* m_plotSheetRef;
	wxCheckBox* m_plotPads_on_Silkscreen;		wxCheckBox* m_plotPads_on_Silkscreen;
	wxCheckBox* m_plotModuleValueOpt;		wxCheckBox* m_plotModuleValueOpt;
	@@ -63,24 +68,24 @@ class DIALOG_PLOT_BASE : public wxDialog
	wxChoice* m_plotModeOpt;		wxChoice* m_plotModeOpt;
	wxStaticText* m_textDefaultPenSize;		wxStaticText* m_textDefaultPenSize;
	wxTextCtrl* m_linesWidth;		wxTextCtrl* m_linesWidth;
			wxStaticBoxSizer* m_GerberOptionsSizer;
	wxCheckBox* m_useGerberExtensions;		wxCheckBox* m_useGerberExtensions;
	wxCheckBox* m_excludeEdgeLayerOpt;		wxCheckBox* m_excludeEdgeLayerOpt;
	wxCheckBox* m_subtractMaskFromSilk;		wxCheckBox* m_subtractMaskFromSilk;
	wxCheckBox* m_useAuxOriginCheckBox;		wxCheckBox* m_useAuxOriginCheckBox;
			wxStaticBoxSizer* m_HPGLOptionsSizer;
	wxStaticText* m_textPenSize;		wxStaticText* m_textPenSize;
	wxTextCtrl* m_HPGLPenSizeOpt;		wxTextCtrl* m_HPGLPenSizeOpt;
	wxStaticText* m_textPenOvr;		wxStaticText* m_textPenOvr;
	wxTextCtrl* m_HPGLPenOverlayOpt;		wxTextCtrl* m_HPGLPenOverlayOpt;
	wxStaticText* m_textPenSpeed;		wxStaticText* m_textPenSpeed;
	wxTextCtrl* m_HPGLPenSpeedOpt;		wxTextCtrl* m_HPGLPenSpeedOpt;
			wxStaticBoxSizer* m_PSOptionsSizer;
	wxStaticText* m_staticText7;		wxStaticText* m_staticText7;
	wxTextCtrl* m_fineAdjustXscaleOpt;		wxTextCtrl* m_fineAdjustXscaleOpt;
	wxStaticText* m_staticText8;		wxStaticText* m_staticText8;
	wxTextCtrl* m_fineAdjustYscaleOpt;		wxTextCtrl* m_fineAdjustYscaleOpt;
	wxCheckBox* m_plotPSNegativeOpt;		wxCheckBox* m_plotPSNegativeOpt;
	wxStaticText* m_staticTextDir;
	wxTextCtrl* m_outputDirectoryName;
	wxButton* m_browseButton;
	wxStaticText* m_staticText2;		wxStaticText* m_staticText2;
	wxTextCtrl* m_messagesBox;		wxTextCtrl* m_messagesBox;

	@@ -93,8 +98,8 @@ class DIALOG_PLOT_BASE : public wxDialog
	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 OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
			virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
	virtual void Plot( wxCommandEvent& event ) { event.Skip(); }		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
	virtual void applyPlotSettings( wxCommandEvent& event ) { event.Skip(); }		virtual void applyPlotSettings( wxCommandEvent& event ) { event.Skip(); }
	virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }

pcbnew/pcbplot.cpp

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -336,6 +336,11 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
	m_fineAdjustXscaleOpt->Enable( true );		m_fineAdjustXscaleOpt->Enable( true );
	m_fineAdjustYscaleOpt->Enable( true );		m_fineAdjustYscaleOpt->Enable( true );
	m_plotPSNegativeOpt->Enable( true );		m_plotPSNegativeOpt->Enable( true );
			m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
			m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
			m_PlotOptionsSizer->Show( m_PSOptionsSizer );
			Layout();
			m_MainSizer->SetSizeHints( this );
	break;		break;

	case PLOT_FORMAT_GERBER:		case PLOT_FORMAT_GERBER:
	@@ -358,6 +363,11 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
	m_fineAdjustYscaleOpt->Enable( false );		m_fineAdjustYscaleOpt->Enable( false );
	m_plotPSNegativeOpt->SetValue( false );		m_plotPSNegativeOpt->SetValue( false );
	m_plotPSNegativeOpt->Enable( false );		m_plotPSNegativeOpt->Enable( false );
			m_PlotOptionsSizer->Show( m_GerberOptionsSizer );
			m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
			m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
			Layout();
			m_MainSizer->SetSizeHints( this );
	break;		break;

	case PLOT_FORMAT_HPGL:		case PLOT_FORMAT_HPGL:
	@@ -378,6 +388,11 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
	m_fineAdjustYscaleOpt->Enable( false );		m_fineAdjustYscaleOpt->Enable( false );
	m_plotPSNegativeOpt->SetValue( false );		m_plotPSNegativeOpt->SetValue( false );
	m_plotPSNegativeOpt->Enable( false );		m_plotPSNegativeOpt->Enable( false );
			m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
			m_PlotOptionsSizer->Show( m_HPGLOptionsSizer );
			m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
			Layout();
			m_MainSizer->SetSizeHints( this );
	break;		break;

	case PLOT_FORMAT_DXF:		case PLOT_FORMAT_DXF:
	@@ -400,6 +415,11 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
	m_fineAdjustYscaleOpt->Enable( false );		m_fineAdjustYscaleOpt->Enable( false );
	m_plotPSNegativeOpt->SetValue( false );		m_plotPSNegativeOpt->SetValue( false );
	m_plotPSNegativeOpt->Enable( false );		m_plotPSNegativeOpt->Enable( false );
			m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
			m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
			m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
			Layout();
			m_MainSizer->SetSizeHints( this );
	break;		break;
	}		}
	}		}

Admin message