Pcbnew+Gerbview: Fixed some issues in print dialog (ac00eede) · Commits · Elphel / kicad-source-mirror

gerbview/dialog_print_using_printer.cpp

+19 −13

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ static double s_ScaleList[] =

		// static print data and page setup data, to remember settings during the session
		static wxPrintData* g_PrintData;
		static wxPageSetupDialogData* g_pageSetupData = (wxPageSetupDialogData*) NULL;

		// Variables locales
		static PRINT_PARAMETERS s_Parameters;
		@@ -58,7 +59,7 @@ public:
		private:
		void OnCloseWindow( wxCloseEvent& event );
		void OnInitDialog( wxInitDialogEvent& event );
		void OnPrintSetup( wxCommandEvent& event );
		void OnPageSetup( wxCommandEvent& event );
		void OnPrintPreview( wxCommandEvent& event );
		void OnPrintButtonClick( wxCommandEvent& event );

		@@ -130,8 +131,18 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
		int layer_max = NB_LAYERS;
		wxString msg;

		layer_max = 32;
		if( g_pageSetupData == NULL )
		{
		g_pageSetupData = new wxPageSetupDialogData;
		// Set initial page margins.
		// Margins are already set in Pcbnew, so we cans use 0
		g_pageSetupData->SetMarginTopLeft(wxPoint(0, 0));
		g_pageSetupData->SetMarginBottomRight(wxPoint(0, 0));
		}

		s_Parameters.m_PageSetupData = g_pageSetupData;

		layer_max = 32;
		/* Create layer list */
		int mask = 1, ii;
		for( ii = 0; ii < layer_max; ii++, mask <<= 1 )
		@@ -326,24 +337,19 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( )
		}

		/**********************************************************/
		void DIALOG_PRINT_USING_PRINTER::OnPrintSetup( wxCommandEvent& event )
		void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )
		/**********************************************************/

		/* Open a dialog box for printer setup (printer options, page size ...)
		*/
		{
		wxPrintDialogData printDialogData( *g_PrintData );

		if( printDialogData.Ok() )
		{
		wxPrintDialog printerDialog( this, &printDialogData );
		g_pageSetupData = g_PrintData;

		printerDialog.ShowModal();
		wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
		pageSetupDialog.ShowModal();

		*g_PrintData = printerDialog.GetPrintDialogData().GetPrintData();
		}
		else
		DisplayError( this, _( "Printer Problem!" ) );
		(*g_PrintData) = pageSetupDialog.GetPageSetupDialogData().GetPrintData();
		(*g_pageSetupData) = pageSetupDialog.GetPageSetupDialogData();
		}

gerbview/dialog_print_using_printer_base.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare

		// Connect Events
		this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
		m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), NULL, this );
		m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );
		m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
		m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
		m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
		@@ -123,7 +123,7 @@ DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base()
		{
		// Disconnect Events
		this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
		m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), NULL, this );
		m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );
		m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
		m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
		m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );

gerbview/dialog_print_using_printer_base.fbp

+1 −1

Original line number	Diff line number	Diff line
		@@ -625,7 +625,7 @@
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		<property name="window_style"></property>
		<event name="OnButtonClick">OnPrintSetup</event>
		<event name="OnButtonClick">OnPageSetup</event>
		<event name="OnChar"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>

gerbview/dialog_print_using_printer_base.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog

		// Virtual event handlers, overide them in your derived class
		virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
		virtual void OnPrintSetup( wxCommandEvent& event ){ event.Skip(); }
		virtual void OnPageSetup( wxCommandEvent& event ){ event.Skip(); }
		virtual void OnPrintPreview( wxCommandEvent& event ){ event.Skip(); }
		virtual void OnPrintButtonClick( wxCommandEvent& event ){ event.Skip(); }
		virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }

pcbnew/dialog_print_using_printer.cpp

+16 −10

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ static double s_ScaleList[] =

		// static print data and page setup data, to remember settings during the session
		static wxPrintData* g_PrintData;
		static wxPageSetupDialogData* g_pageSetupData = (wxPageSetupDialogData*) NULL;

		static PRINT_PARAMETERS s_Parameters;

		@@ -138,6 +139,16 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
		int layer_max = NB_LAYERS;
		wxString msg;
		BOARD* board = m_Parent->GetBoard();
		if( g_pageSetupData == NULL )
		{
		g_pageSetupData = new wxPageSetupDialogData;
		// Set initial page margins.
		// Margins are already set in Pcbnew, so we cans use 0
		g_pageSetupData->SetMarginTopLeft(wxPoint(0, 0));
		g_pageSetupData->SetMarginBottomRight(wxPoint(0, 0));
		}

		s_Parameters.m_PageSetupData = g_pageSetupData;

		// Create layer list.
		int layer;
		@@ -420,18 +431,13 @@ void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )
		/* Open a dialog box for printer setup (printer options, page size ...)
		*/
		{
		wxPrintDialogData printDialogData( *g_PrintData );

		if( printDialogData.Ok() )
		{
		wxPrintDialog printerDialog( this, &printDialogData );
		g_pageSetupData = g_PrintData;

		printerDialog.ShowModal();
		wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
		pageSetupDialog.ShowModal();

		*g_PrintData = printerDialog.GetPrintDialogData().GetPrintData();
		}
		else
		DisplayError( this, _( "Printer Problem!" ) );
		(*g_PrintData) = pageSetupDialog.GetPageSetupDialogData().GetPrintData();
		(*g_pageSetupData) = pageSetupDialog.GetPageSetupDialogData();
		}

Admin message