fixups for dialog and formatting to Marco's patch (f0790efd) · Commits · Elphel / kicad-source-mirror

include/plot_common.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -169,7 +169,8 @@ public:
	bool aBold );		bool aBold );
	void marker( const wxPoint& position, int diametre, int aShapeId );		void marker( const wxPoint& position, int diametre, int aShapeId );

	/** Function SetLayerPolarity		/**
			* Function SetLayerPolarity
	* sets current Gerber layer polarity to positive or negative		* sets current Gerber layer polarity to positive or negative
	* by writing \%LPD\% or \%LPC\% to the Gerber file, respectively.		* by writing \%LPD\% or \%LPC\% to the Gerber file, respectively.
	* param @aPositive = layer polarity, true for positive		* param @aPositive = layer polarity, true for positive

pcbnew/dialogs/dialog_plot_base.cpp

+9 −8

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 Oct 18 2009)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -74,7 +74,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

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

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

	wxBoxSizer* bPlotOptionsSizer;		wxBoxSizer* bPlotOptionsSizer;
	bPlotOptionsSizer = new wxBoxSizer( wxVERTICAL );		bPlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
	@@ -103,7 +103,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_Choice_Plot_Offset->SetSelection( 0 );		m_Choice_Plot_Offset->SetSelection( 0 );
	bPlotOptionsSizer->Add( m_Choice_Plot_Offset, 0, wxALL\|wxEXPAND, 5 );		bPlotOptionsSizer->Add( m_Choice_Plot_Offset, 0, wxALL\|wxEXPAND, 5 );

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

	wxBoxSizer* bSizerFmtPlot;		wxBoxSizer* bSizerFmtPlot;
	bSizerFmtPlot = new wxBoxSizer( wxVERTICAL );		bSizerFmtPlot = new wxBoxSizer( wxVERTICAL );
	@@ -142,7 +142,7 @@ 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, 0, wxEXPAND, 5 );		bSizerFmtPlot->Add( m_HPGL_OptionsBox, 1, wxEXPAND, 5 );

	wxStaticBoxSizer* sbSizerPSOpt;		wxStaticBoxSizer* sbSizerPSOpt;
	sbSizerPSOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("PS Options:") ), wxVERTICAL );		sbSizerPSOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("PS Options:") ), wxVERTICAL );
	@@ -150,7 +150,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_Plot_PS_Negative = new wxCheckBox( this, wxID_ANY, _("Plot negative"), wxDefaultPosition, wxDefaultSize, 0 );		m_Plot_PS_Negative = new wxCheckBox( this, wxID_ANY, _("Plot negative"), wxDefaultPosition, wxDefaultSize, 0 );
	sbSizerPSOpt->Add( m_Plot_PS_Negative, 0, wxALL, 5 );		sbSizerPSOpt->Add( m_Plot_PS_Negative, 0, wxALL, 5 );

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

	wxStaticBoxSizer* sbSizerOutputDir;		wxStaticBoxSizer* sbSizerOutputDir;
	sbSizerOutputDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Output Directory:") ), wxVERTICAL );		sbSizerOutputDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Output Directory:") ), wxVERTICAL );
	@@ -161,9 +161,9 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_BrowseButton = new wxButton( this, ID_BROWSE_OUTPUT_DIRECTORY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );		m_BrowseButton = new wxButton( this, ID_BROWSE_OUTPUT_DIRECTORY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
	sbSizerOutputDir->Add( m_BrowseButton, 0, wxALL, 5 );		sbSizerOutputDir->Add( m_BrowseButton, 0, wxALL, 5 );

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

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

	wxBoxSizer* bButtonsSizer;		wxBoxSizer* bButtonsSizer;
	bButtonsSizer = new wxBoxSizer( wxVERTICAL );		bButtonsSizer = new wxBoxSizer( wxVERTICAL );
	@@ -220,7 +220,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Quit"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Quit"), wxDefaultPosition, wxDefaultSize, 0 );
	bButtonsSizer->Add( m_buttonQuit, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		bButtonsSizer->Add( m_buttonQuit, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

	bUpperSizer->Add( bButtonsSizer, 0, wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );		bUpperSizer->Add( bButtonsSizer, 1, wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );

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

	@@ -235,6 +235,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr

	this->SetSizer( bMainSizer );		this->SetSizer( bMainSizer );
	this->Layout();		this->Layout();
			bMainSizer->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 ) );

pcbnew/dialogs/dialog_plot_base.fbp

+10 −10

pcbnew/dialogs/dialog_plot_base.h

+2 −2

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 Oct 18 2009)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -106,7 +106,7 @@ class DIALOG_PLOT_BASE : public wxDialog

	public:		public:

	DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 575,590 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );		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();		~DIALOG_PLOT_BASE();

	};		};

pcbnew/plot_rtn.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -746,6 +746,7 @@ void WinEDA_BasePcbFrame::Plot_Layer( PLOTTER* plotter, int Layer,

	default:		default:
	Plot_Serigraphie( plotter, layer_mask, trace_mode );		Plot_Serigraphie( plotter, layer_mask, trace_mode );

	// Gerber: Subtract soldermask from silkscreen if enabled		// Gerber: Subtract soldermask from silkscreen if enabled
	if( plotter->GetPlotterType() == PLOT_FORMAT_GERBER		if( plotter->GetPlotterType() == PLOT_FORMAT_GERBER
	&& g_pcb_plot_options.GetSubtractMaskFromSilk() )		&& g_pcb_plot_options.GetSubtractMaskFromSilk() )
	@@ -758,6 +759,7 @@ void WinEDA_BasePcbFrame::Plot_Layer( PLOTTER* plotter, int Layer,
	{		{
	layer_mask = g_TabOneLayerMask[SOLDERMASK_N_BACK];		layer_mask = g_TabOneLayerMask[SOLDERMASK_N_BACK];
	}		}

	// Set layer polarity to negative		// Set layer polarity to negative
	plotter->SetLayerPolarity( false );		plotter->SetLayerPolarity( false );
	Plot_Standard_Layer( plotter, layer_mask,		Plot_Standard_Layer( plotter, layer_mask,

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@
	<property name="minimum_size">-1,350</property>		<property name="minimum_size">-1,350</property>
	<property name="name">DIALOG_PLOT_BASE</property>		<property name="name">DIALOG_PLOT_BASE</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="size">575,590</property>		<property name="size">-1,-1</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
	<property name="subclass"></property>		<property name="subclass"></property>
	<property name="title">Plot</property>		<property name="title">Plot</property>
	@@ -96,7 +96,7 @@
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">1</property>		<property name="proportion">2</property>
	<object class="wxBoxSizer" expanded="0">		<object class="wxBoxSizer" expanded="0">
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">bLeftSizer</property>		<property name="name">bLeftSizer</property>
	@@ -661,8 +661,8 @@
	</object>		</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag"></property>
	<property name="proportion">0</property>		<property name="proportion">1</property>
	<object class="wxBoxSizer" expanded="0">		<object class="wxBoxSizer" expanded="0">
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">bPlotOptionsSizer</property>		<property name="name">bPlotOptionsSizer</property>
	@@ -909,8 +909,8 @@
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">0</property>		<property name="proportion">1</property>
	<object class="wxBoxSizer" expanded="0">		<object class="wxBoxSizer" expanded="1">
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">bSizerFmtPlot</property>		<property name="name">bSizerFmtPlot</property>
	<property name="orient">wxVERTICAL</property>		<property name="orient">wxVERTICAL</property>
	@@ -977,7 +977,7 @@
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">0</property>		<property name="proportion">1</property>
	<object class="wxStaticBoxSizer" expanded="0">		<object class="wxStaticBoxSizer" expanded="0">

Admin message