Pcbnew:Rework on print function: fixed the fully broken print function in Modedit

See also changelog

CHANGELOG.txt

@@ -4,6 +4,14 @@ KiCad ChangeLog 2009
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2009-oct-23 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+================================================================================
+++pcbnew
+    Rework on print function: fixed the fully broken print function in Modedit
+    and better code.
+    Removed the display vias option tool in Modedit and Gerbview left toolbar,
+    because this option has no sense here.
+
 2009-oct-21 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
 ================================================================================
 ++pcbnew

gerbview/CMakeLists.txt

@@ -37,12 +37,9 @@ set(GERBVIEW_SRCS
     trpiste.cpp )
 
 set(GERBVIEW_EXTRA_SRCS
-#    ../pcbnew/class_board_item.cpp
-#    ../pcbnew/class_drawsegment.cpp
-#    ../pcbnew/undelete.cpp
-
     ../share/setpage.cpp
     ../pcbnew/dialog_print_using_printer.cpp
+    ../pcbnew/printout_controler.cpp
 )
 
 if(WIN32)

gerbview/gerberframe.cpp

@@ -277,9 +277,6 @@ void WinEDA_GerberFrame::SetToolbars()
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_PADS_SKETCH,
                                       !m_DisplayPadFill );
 
-        m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
-                                      !m_DisplayViaFill );
-
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_TRACKS_SKETCH,
                                       !m_DisplayPcbTrackFill );
 

gerbview/tool_gerber.cpp

@@ -362,10 +362,6 @@ create or update the left vertical toolbar (option toolbar
                                wxBitmap( pad_sketch_xpm ),
                                _( "Show Spots in Sketch Mode" ), wxITEM_CHECK );
 
-    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_VIAS_SKETCH, wxEmptyString,
-                               wxBitmap( via_sketch_xpm ),
-                               _( "Show Vias in Sketch Mode" ), wxITEM_CHECK );
-
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_TRACKS_SKETCH, wxEmptyString,
                                wxBitmap( showtrack_xpm ),
                                _( "Show Lines in Sketch Mode" ), wxITEM_CHECK );

include/wxPcbStruct.h

@@ -747,6 +747,11 @@ public:
     void         GeneralControle( wxDC* DC, wxPoint Mouse );
     void         LoadModuleFromBoard( wxCommandEvent& event );
 
+    /** function ToPrinter
+     * Install the print dialog
+     */
+    void         ToPrinter( wxCommandEvent& event );
+
     // BOARD handling
     /** function Clear_Pcb()
      * delete all and reinitialize the current board

pcbnew/CMakeLists.txt

@@ -60,6 +60,8 @@ set(PCBNEW_SRCS
     dialog_pad_properties_base.cpp
     dialog_pcbnew_config_libs_and_paths.cpp
     dialog_pcbnew_config_libs_and_paths_fbp.cpp
+    dialog_print_for_modedit.cpp
+    dialog_print_for_modedit_base.cpp
     dialog_print_using_printer.cpp
     dialog_orient_footprints.cpp
     dialog_track_options.cpp
@@ -95,6 +97,7 @@ set(PCBNEW_SRCS
     initpcb.cpp
     ioascii.cpp
     print_board_functions.cpp
+    printout_controler.cpp
     librairi.cpp
     loadcmp.cpp
     locate.cpp

pcbnew/dialog_design_rules.cpp

@@ -825,7 +825,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity()
         if( muviadrill < minUViaDrill )
         {
             result = false;
-            msg.Printf( _( "%s: <b>MicroVia Drill</b> &ge; <b>MicroVia Min Drill</b><br>" ),
+            msg.Printf( _( "%s: <b>MicroVia Drill</b> &lt; <b>MicroVia Min Drill</b><br>" ),
                 GetChars( m_grid->GetRowLabelValue(row)) );
 
             m_MessagesList->AppendToPage( msg );

pcbnew/dialog_print_for_modedit.cpp

+/****************************************/
+/* File: dialog_print_for_modedit.cpp */
+/****************************************/
+
+// Set this to 1 if you want to test PostScript printing under MSW.
+#define wxTEST_POSTSCRIPT_IN_MSW 1
+
+#include "fctsys.h"
+#include "appl_wxstruct.h"
+#include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "pcbnew.h"
+#include "wxPcbStruct.h"
+#include "pcbplot.h"
+
+#include "dialog_print_for_modedit_base.h"
+#include "printout_controler.h"
+
+#define WIDTH_MAX_VALUE           1000
+#define WIDTH_MIN_VALUE           1
+
+static double s_ScaleList[] =
+{ 0, 0.5, 0.7, 1.0, 1.4, 2.0, 3.0, 4.0, 8.0, 16.0 };
+
+
+// static print data and page setup data, to remember settings during the session
+static PRINT_PARAMETERS  s_Parameters;
+static wxPrintData* g_PrintData;
+
+
+/* Dialog to print schematic. Class derived from DIALOG_PRINT_FOR_MODEDIT_BASE
+ *  created by wxFormBuilder
+ */
+class DIALOG_PRINT_FOR_MODEDIT : public DIALOG_PRINT_FOR_MODEDIT_BASE
+{
+private:
+    WinEDA_DrawFrame* m_Parent;
+    wxConfig*         m_Config;
+
+public:
+    DIALOG_PRINT_FOR_MODEDIT( WinEDA_DrawFrame* parent );
+    ~DIALOG_PRINT_FOR_MODEDIT() {};
+
+private:
+    void OnCloseWindow( wxCloseEvent& event );
+    void OnInitDialog( wxInitDialogEvent& event );
+    void OnPrintSetup( wxCommandEvent& event );
+    void OnPrintPreview( wxCommandEvent& event );
+    void OnPrintButtonClick( wxCommandEvent& event );
+
+    void OnButtonCancelClick( wxCommandEvent& event ) { Close(); }
+    void SetPenWidth();
+    void InitValues( );
+};
+
+
+/*************************************************************/
+void WinEDA_ModuleEditFrame::ToPrinter( wxCommandEvent& event )
+/*************************************************************/
+/* Virtual function:
+ * Display the print dialog
+ */
+{
+    if( g_PrintData == NULL )  // First print
+    {
+        g_PrintData = new wxPrintData();
+
+        if( !g_PrintData->Ok() )
+        {
+            DisplayError( this, _( "Error Init Printer info" ) );
+        }
+        g_PrintData->SetQuality( wxPRINT_QUALITY_HIGH );      // Default resolution = HIGHT;
+        g_PrintData->SetOrientation( DEFAULT_ORIENTATION_PAPER );
+    }
+
+    DIALOG_PRINT_FOR_MODEDIT* frame = new DIALOG_PRINT_FOR_MODEDIT( this );
+
+    frame->ShowModal(); frame->Destroy();
+}
+
+/*************************************************************************************/
+DIALOG_PRINT_FOR_MODEDIT::DIALOG_PRINT_FOR_MODEDIT( WinEDA_DrawFrame* parent ) :
+    DIALOG_PRINT_FOR_MODEDIT_BASE( parent )
+/*************************************************************************************/
+{
+    m_Parent = parent;
+    s_Parameters.m_ForceCentered = true;
+    m_Config = wxGetApp().m_EDA_Config;
+    InitValues();
+
+    if( GetSizer() )
+    {
+        GetSizer()->SetSizeHints( this );
+    }
+}
+
+
+/************************************************************************/
+void DIALOG_PRINT_FOR_MODEDIT::InitValues( )
+/************************************************************************/
+{
+    SetFocus();
+
+    // Read the scale adjust option
+    int scale_Select = 3; // default selected scale = ScaleList[3] = 1
+    if( m_Config )
+    {
+        m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &s_Parameters.m_PenMinSize );
+        m_Config->Read( OPTKEY_PRINT_MODULE_SCALE, &scale_Select );
+        m_Config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1);
+    }
+
+    m_ScaleOption->SetSelection( scale_Select );
+
+    if( s_Parameters.m_Print_Black_and_White )
+        m_ModeColorOption->SetSelection( 1 );
+
+    AddUnitSymbol( *m_TextPenWidth, g_UnitMetric );
+    m_DialogPenWidth->SetValue(
+        ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenMinSize, m_Parent->m_InternalUnits ) );
+}
+
+
+/********************************************************************/
+void DIALOG_PRINT_FOR_MODEDIT::OnCloseWindow( wxCloseEvent& event )
+/********************************************************************/
+{
+    SetPenWidth();
+
+    if( m_Config )
+    {
+        m_Config->Write( OPTKEY_PLOT_LINEWIDTH_VALUE, s_Parameters.m_PenMinSize );
+        m_Config->Write( OPTKEY_PRINT_MODULE_SCALE, m_ScaleOption->GetSelection() );
+        m_Config->Write( OPTKEY_PRINT_MONOCHROME_MODE, s_Parameters.m_Print_Black_and_White);
+    }
+    EndModal( 0 );
+}
+
+
+/**********************************************/
+
+void DIALOG_PRINT_FOR_MODEDIT::SetPenWidth()
+/***********************************************/
+
+/* Get the new pen width value, and verify min et max value
+ * NOTE: s_Parameters.m_PenMinSize is in internal units
+ */
+{
+    s_Parameters.m_PenMinSize = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits );
+
+    if( s_Parameters.m_PenMinSize > WIDTH_MAX_VALUE )
+    {
+        s_Parameters.m_PenMinSize = WIDTH_MAX_VALUE;
+    }
+
+    if( s_Parameters.m_PenMinSize < WIDTH_MIN_VALUE )
+    {
+        s_Parameters.m_PenMinSize = WIDTH_MIN_VALUE;
+    }
+
+    m_DialogPenWidth->SetValue(
+        ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenMinSize, m_Parent->m_InternalUnits ) );
+}
+
+
+/**********************************************************/
+void DIALOG_PRINT_FOR_MODEDIT::OnPrintSetup( wxCommandEvent& event )
+/**********************************************************/
+
+/* Open a dialog box for printer setup (printer options, page size ...)
+ */
+{
+    wxPrintDialogData printDialogData( *g_PrintData );
+
+    if( printDialogData.Ok() )
+    {
+        wxPrintDialog printerDialog( this, &printDialogData );
+        printerDialog.ShowModal();
+        *g_PrintData = printerDialog.GetPrintDialogData().GetPrintData();
+    }
+    else
+        DisplayError( this, _( "Printer Problem!" ) );
+}
+
+
+/************************************************************/
+void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
+/************************************************************/
+
+/* Open and display a previewer frame for printing
+ */
+{
+    SetPenWidth();
+
+    s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection();
+    s_Parameters.m_PrintScale = s_ScaleList[m_ScaleOption->GetSelection()];
+
+    // Pass two printout objects: for preview, and possible printing.
+    wxString        title   = _( "Print Preview" );
+    wxPrintPreview* preview =
+        new wxPrintPreview( new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_Parent, title ),
+                            new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_Parent, title ),
+                            g_PrintData );
+
+    if( preview == NULL )
+    {
+        DisplayError( this, wxT( "OnPrintPreview() problem" ) );
+        return;
+    }
+
+     // Uses the parent position and size.
+    // @todo uses last position and size ans store them when exit in m_Config
+    wxPoint         WPos  = m_Parent->GetPosition();
+    wxSize          WSize = m_Parent->GetSize();
+
+    wxPreviewFrame* frame = new wxPreviewFrame( preview, this, title, WPos, WSize );
+
+    frame->Initialize();
+    frame->Show( TRUE );
+}
+
+
+/***************************************************************************/
+void DIALOG_PRINT_FOR_MODEDIT::OnPrintButtonClick( wxCommandEvent& event )
+/***************************************************************************/
+
+/* Called on activate Print button
+ */
+{
+    SetPenWidth();
+    s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection();
+    s_Parameters.m_PrintScale = s_ScaleList[m_ScaleOption->GetSelection()];
+
+    g_pcb_plot_options.ScaleAdjX = s_Parameters.m_XScaleAdjust;
+    g_pcb_plot_options.ScaleAdjX = s_Parameters.m_YScaleAdjust;
+    g_pcb_plot_options.Scale = s_Parameters.m_PrintScale;
+
+    wxPrintDialogData printDialogData( *g_PrintData );
+    wxPrinter         printer( &printDialogData );
+
+    BOARD_PRINTOUT_CONTROLER      printout( s_Parameters, m_Parent, _( "Print Footprint" ) );
+
+#if !defined(__WINDOWS__) && !wxCHECK_VERSION(2,9,0)
+    wxDC*             dc = printout.GetDC();
+    ( (wxPostScriptDC*) dc )->SetResolution( 600 );  // Postscript DC resolution is 600 ppi
+#endif
+
+    if( !printer.Print( this, &printout, TRUE ) )
+    {
+        if( wxPrinter::GetLastError() == wxPRINTER_ERROR )
+            DisplayError( this, _( "There was a problem printing" ) );
+        return;
+    }
+    else
+    {
+        *g_PrintData = printer.GetPrintDialogData().GetPrintData();
+    }
+}

pcbnew/dialog_print_for_modedit_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_print_for_modedit_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PRINT_FOR_MODEDIT_BASE::DIALOG_PRINT_FOR_MODEDIT_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,-1 ), wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bmiddleLeftSizer;
+	bmiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_ScaleOptionChoices[] = { _("fit in page"), _("Scale 0.5"), _("Scale 0.7"), _("Scale 1"), _("Scale 1.4"), _("Scale 2"), _("Scale 3"), _("Scale 4"), _("Scale 8"), _("Scale 16") };
+	int m_ScaleOptionNChoices = sizeof( m_ScaleOptionChoices ) / sizeof( wxString );
+	m_ScaleOption = new wxRadioBox( this, wxID_ANY, _("Approx. Scale:"), wxDefaultPosition, wxDefaultSize, m_ScaleOptionNChoices, m_ScaleOptionChoices, 1, wxRA_SPECIFY_COLS );
+	m_ScaleOption->SetSelection( 3 );
+	bmiddleLeftSizer->Add( m_ScaleOption, 0, wxALL, 5 );
+	
+	bMainSizer->Add( bmiddleLeftSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bmiddleRightSizer;
+	bmiddleRightSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbOptionsSizer;
+	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
+	
+	m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Pen Width Mini"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_TextPenWidth->Wrap( -1 );
+	sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_DialogPenWidth->SetToolTip( _("Selection of the minimum pen thickness used to draw items.") );
+	
+	sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	bmiddleRightSizer->Add( sbOptionsSizer, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	bmiddleRightSizer->Add( 10, 10, 0, 0, 5 );
+	
+	wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
+	int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
+	m_ModeColorOption = new wxRadioBox( this, wxID_PRINT_MODE, _("Print Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
+	m_ModeColorOption->SetSelection( 1 );
+	m_ModeColorOption->SetToolTip( _("Choose if you wand to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using  black and white printers") );
+	
+	bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
+	
+	bMainSizer->Add( bmiddleRightSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bbuttonsSizer;
+	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	bMainSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnCloseWindow ) );
+	m_ScaleOption->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::SetScale ), NULL, this );
+	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintSetup ), NULL, this );
+	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintPreview ), NULL, this );
+	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintButtonClick ), NULL, this );
+	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnButtonCancelClick ), NULL, this );
+}
+
+DIALOG_PRINT_FOR_MODEDIT_BASE::~DIALOG_PRINT_FOR_MODEDIT_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnCloseWindow ) );
+	m_ScaleOption->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::SetScale ), NULL, this );
+	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintSetup ), NULL, this );
+	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintPreview ), NULL, this );
+	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintButtonClick ), NULL, this );
+	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnButtonCancelClick ), NULL, this );
+}

pcbnew/dialog_print_for_modedit_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_print_for_modedit_base__
+#define __dialog_print_for_modedit_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/radiobox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/statbox.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PRINT_FOR_MODEDIT_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PRINT_FOR_MODEDIT_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			wxID_PRINT_MODE = 1000,
+			wxID_PRINT_OPTIONS,
+			wxID_PRINT_ALL,
+		};
+		
+		wxRadioBox* m_ScaleOption;
+		wxStaticText* m_TextPenWidth;
+		wxTextCtrl* m_DialogPenWidth;
+		
+		wxRadioBox* m_ModeColorOption;
+		wxButton* m_buttonOption;
+		wxButton* m_buttonPreview;
+		wxButton* m_buttonPrint;
+		wxButton* m_buttonQuit;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
+		virtual void SetScale( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnPrintSetup( 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(); }
+		
+	
+	public:
+		DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 369,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~DIALOG_PRINT_FOR_MODEDIT_BASE();
+	
+};
+
+#endif //__dialog_print_for_modedit_base__

pcbnew/dialog_print_using_printer_base.cpp

@@ -135,8 +135,6 @@ 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 ) );
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnInitDialog ) );
-	m_ScaleOption->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::SetScale ), NULL, this );
 	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), 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 );
@@ -147,8 +145,6 @@ DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base()
 {
 	// Disconnect Events
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
-	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnInitDialog ) );
-	m_ScaleOption->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::SetScale ), NULL, this );
 	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), 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 );

pcbnew/dialog_print_using_printer_base.fbp

@@ -11,7 +11,7 @@
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
         <property name="internationalize">1</property>
-        <property name="name">DialogSVGPrint_base</property>
+        <property name="name">DialogPrint_base</property>
         <property name="namespace"></property>
         <property name="path">.</property>
         <property name="precompiled_header"></property>
@@ -49,7 +49,7 @@
             <event name="OnHibernate"></event>
             <event name="OnIconize"></event>
             <event name="OnIdle"></event>
-            <event name="OnInitDialog">OnInitDialog</event>
+            <event name="OnInitDialog"></event>
             <event name="OnKeyDown"></event>
             <event name="OnKeyUp"></event>
             <event name="OnKillFocus"></event>
@@ -234,7 +234,7 @@
                                 <event name="OnMouseEvents"></event>
                                 <event name="OnMouseWheel"></event>
                                 <event name="OnPaint"></event>
-                                <event name="OnRadioBox">SetScale</event>
+                                <event name="OnRadioBox"></event>
                                 <event name="OnRightDClick"></event>
                                 <event name="OnRightDown"></event>
                                 <event name="OnRightUp"></event>

pcbnew/dialog_print_using_printer_base.h

@@ -64,8 +64,6 @@ 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 OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); }
-		virtual void SetScale( wxCommandEvent& event ){ event.Skip(); }
 		virtual void OnPrintSetup( wxCommandEvent& event ){ event.Skip(); }
 		virtual void OnPrintPreview( wxCommandEvent& event ){ event.Skip(); }
 		virtual void OnPrintButtonClick( wxCommandEvent& event ){ event.Skip(); }

pcbnew/moduleframe.cpp

@@ -57,7 +57,7 @@ EVT_TOOL( ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
           WinEDA_ModuleEditFrame::Process_Special_Functions )
 EVT_TOOL( ID_MODEDIT_SHEET_SET,
           WinEDA_ModuleEditFrame::Process_Special_Functions )
-EVT_TOOL( ID_GEN_PRINT, WinEDA_DrawFrame::ToPrinter )
+EVT_TOOL( ID_GEN_PRINT, WinEDA_ModuleEditFrame::ToPrinter )
 EVT_TOOL( ID_MODEDIT_LOAD_MODULE,
           WinEDA_ModuleEditFrame::Process_Special_Functions )
 EVT_TOOL( ID_MODEDIT_CHECK,
@@ -333,14 +333,9 @@ void WinEDA_ModuleEditFrame::SetToolbars()
                                       m_CursorShape );
 
 
-        m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
-                                      !m_DisplayViaFill );
-        m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
-                                            m_DisplayViaFill ?
-                                            _( "Show Vias Sketch mode" ) :
-                                            _( "Show vias filled mode" ) );
         m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_PADS_SKETCH,
                                       !m_DisplayPadFill );
+
         m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_PADS_SKETCH,
                                            m_DisplayPadFill ?
                                            _( "Show Pads Sketch mode" ) :

pcbnew/pcbplot.h

@@ -12,6 +12,9 @@
 #define OPTKEY_PRINT_X_FINESCALE_ADJ wxT( "PrintXFineScaleAdj" )
 #define OPTKEY_PRINT_Y_FINESCALE_ADJ wxT( "PrintYFineScaleAdj" )
 #define OPTKEY_PRINT_SCALE           wxT( "PrintScale" )
+#define OPTKEY_PRINT_MODULE_SCALE    wxT( "PrintModuleScale" )
+#define OPTKEY_PRINT_PAGE_FRAME      wxT( "PrintPageFrame" )
+#define OPTKEY_PRINT_MONOCHROME_MODE      wxT( "PrintMonochrome" )
 
 /* Constantes de conversion d'unites */
 /* coeff de conversion dim en 0.1 mil -> dim en unite PS: (unite PS = pouce) */

pcbnew/printout_controler.h

+/**************************/
+/* printout_controler.h */
+/**************************/
+
+#ifndef PRINTOUT_CONTROLER_H
+#define PRINTOUT_CONTROLER_H
+
+
+#include <wx/dcps.h>
+
+#define DEFAULT_ORIENTATION_PAPER wxLANDSCAPE   // other option is wxPORTRAIT
+
+
+/**
+ *  This class handle parameters used to draw (print) a board
+ *  layers, scale and others options
+ */
+
+class PRINT_PARAMETERS
+{
+public:
+    int    m_PenMinSize;                        // A minimal value pen size to plot/print items
+    double m_PrintScale;                        // general scale when printing
+    double m_XScaleAdjust, m_YScaleAdjust;      // fine scale adjust for X and Y axis
+    bool   m_Print_Sheet_Ref;                   // Option: pring page references
+    long   m_PrintMaskLayer;                    // Layers to print
+    bool   m_PrintMirror;                       // Option: Print mirroed
+    bool   m_Print_Black_and_White;             // Option: Print in B&W ou Color
+    int    m_OptionPrintPage;                   // Option: 0 = a layer per page, all layers at once
+    int    m_PageCount;                         // Nmuber of page to print
+    bool   m_ForceCentered;                     // Forge plot origin to page centre (used in modedit)
+    int    m_Flags;                             // auxiliary variable: can be used to pass some other info
+
+public:
+    PRINT_PARAMETERS();
+};
+
+/**
+ *  This class derived from wxPrintout handle the necessary info
+ *  to control a printer when printing a board
+ */
+
+class BOARD_PRINTOUT_CONTROLER : public wxPrintout
+{
+private:
+    WinEDA_DrawFrame* m_Parent;
+    PRINT_PARAMETERS m_PrintParams;
+
+public:
+    BOARD_PRINTOUT_CONTROLER( const PRINT_PARAMETERS& print_params,
+                              WinEDA_DrawFrame* parent,
+                              const wxString&   title );
+
+    bool OnPrintPage( int page );
+
+    bool HasPage( int page ) { return true; }       // do not test page num
+    void GetPageInfo( int* minPage, int* maxPage, int* selPageFrom, int* selPageTo );
+
+    void DrawPage();
+};
+
+#endif      // ifndef PRINTOUT_CONTROLER_H

pcbnew/tool_modedit.cpp

@@ -229,10 +229,6 @@ void WinEDA_ModuleEditFrame::ReCreateOptToolbar()
                                wxBitmap( pad_sketch_xpm ),
                                _( "Show Pads Sketch" ) );
 
-    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_VIAS_SKETCH, wxEmptyString,
-                               wxBitmap( via_sketch_xpm ),
-                               _( "Show Vias Sketch" ) );
-
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MODULE_TEXT_SKETCH,
                                wxEmptyString,
                                wxBitmap( text_sketch_xpm ),