Pcbnew and Gerbview: Refactor dialogs for plot and print.

CHANGELOG.txt

@@ -4,6 +4,15 @@ KiCad ChangeLog 2009
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2010-Jan-01 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+================================================================================
+++pcbnew
+    Rewrite plot dialog using wxDialogBlocks.
+    Display layers list according to the Setup layers dialog order.
+++Gerbview
+    Write Gerbview plot dialog using wxDialogBlocks.
+    Do not use anymore the Pcbnew one.
+
 2009-Dec-30 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
 ================================================================================
 ++pcbnew

common/CMakeLists.txt

@@ -83,7 +83,6 @@ set(PCB_COMMON_SRCS
     ../pcbnew/collectors.cpp
     ../pcbnew/sel_layer.cpp
     ../pcbnew/tracemod.cpp
-    ../pcbnew/dialog_print_using_printer_base.cpp
 )
 
 add_library(pcbcommon ${PCB_COMMON_SRCS})

eeschema/dialog_print_using_printer.cpp

@@ -41,11 +41,11 @@ static bool         s_Print_Frame_Ref = true;
 class DIALOG_PRINT_USING_PRINTER : public DIALOG_PRINT_USING_PRINTER_base
 {
 private:
-    WinEDA_DrawFrame* m_Parent;
+    WinEDA_SchematicFrame* m_Parent;
     wxConfig*         m_Config;
 
 public:
-    DIALOG_PRINT_USING_PRINTER( WinEDA_DrawFrame* parent );
+    DIALOG_PRINT_USING_PRINTER( WinEDA_SchematicFrame* parent );
     ~DIALOG_PRINT_USING_PRINTER() {};
 
 private:
@@ -93,7 +93,7 @@ public:
 /* Virtual function
  * Calls the print dialog for Eeschema
  */
-void WinEDA_DrawFrame::ToPrinter( wxCommandEvent& event )
+void WinEDA_SchematicFrame::ToPrinter( wxCommandEvent& event )
 {
     if( g_PrintData == NULL )   // First call. creates print handlers
     {
@@ -115,7 +115,7 @@ void WinEDA_DrawFrame::ToPrinter( wxCommandEvent& event )
 }
 
 
-DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( WinEDA_DrawFrame* parent ) :
+DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( WinEDA_SchematicFrame* parent ) :
     DIALOG_PRINT_USING_PRINTER_base( parent )
 {
     m_Parent = parent;

gerbview/CMakeLists.txt

@@ -12,6 +12,8 @@ set(GERBVIEW_SRCS
     controle.cpp
     dcode.cpp
     deltrack.cpp
+    dialog_print_using_printer.cpp
+	dialog_print_using_printer_base.cpp
     dummy_functions.cpp
     edit.cpp
     export_to_pcbnew.cpp
@@ -39,7 +41,6 @@ set(GERBVIEW_SRCS
 
 set(GERBVIEW_EXTRA_SRCS
     ../share/setpage.cpp
-    ../pcbnew/dialog_print_using_printer.cpp
     ../pcbnew/printout_controler.cpp
 )
 

gerbview/dialog_print_using_printer_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_print_using_printer_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_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 );
+	
+	wxStaticBoxSizer* sbLayersSizer;
+	sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );
+	
+	wxBoxSizer* bleftSizer;
+	bleftSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_leftLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );
+	
+	bleftSizer->Add( m_leftLayersBoxSizer, 1, wxALL, 5 );
+	
+	m_rightLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );
+	
+	bleftSizer->Add( m_rightLayersBoxSizer, 1, wxALL, 5 );
+	
+	sbLayersSizer->Add( bleftSizer, 1, wxEXPAND, 5 );
+	
+	bMainSizer->Add( sbLayersSizer, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bmiddleLeftSizer;
+	bmiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_ScaleOptionChoices[] = { _("fit in page"), _("Scale 0.5"), _("Scale 0.7"), _("Approx. Scale 1"), _("Accurate Scale 1"), _("Scale 1.4"), _("Scale 2"), _("Scale 3"), _("Scale 4") };
+	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 );
+	
+	m_FineAdjustXscaleTitle = new wxStaticText( this, wxID_ANY, _("X Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustXscaleTitle->Wrap( -1 );
+	bmiddleLeftSizer->Add( m_FineAdjustXscaleTitle, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_FineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustXscaleOpt->SetToolTip( _("Set X scale adjust for exact scale plotting") );
+	
+	bmiddleLeftSizer->Add( m_FineAdjustXscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_FineAdjustYscaleTitle = new wxStaticText( this, wxID_ANY, _("Y Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustYscaleTitle->Wrap( -1 );
+	bmiddleLeftSizer->Add( m_FineAdjustYscaleTitle, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_FineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustYscaleOpt->SetToolTip( _("Set Y scale adjust for exact scale plotting") );
+	
+	bmiddleLeftSizer->Add( m_FineAdjustYscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 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 );
+	
+	m_Print_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	sbOptionsSizer->Add( m_Print_Mirror, 0, wxALL, 5 );
+	
+	bmiddleRightSizer->Add( sbOptionsSizer, 0, wxEXPAND|wxALL, 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 );
+	
+	wxString m_PagesOptionChoices[] = { _("1 Page per Layer"), _("Single page") };
+	int m_PagesOptionNChoices = sizeof( m_PagesOptionChoices ) / sizeof( wxString );
+	m_PagesOption = new wxRadioBox( this, wxID_PAGE_MODE, _("Page Print"), wxDefaultPosition, wxDefaultSize, m_PagesOptionNChoices, m_PagesOptionChoices, 1, wxRA_SPECIFY_COLS );
+	m_PagesOption->SetSelection( 0 );
+	bmiddleRightSizer->Add( m_PagesOption, 0, wxALL|wxEXPAND, 5 );
+	
+	bMainSizer->Add( bmiddleRightSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* b_buttonsSizer;
+	b_buttonsSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );
+	b_buttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
+	b_buttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );
+	b_buttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	b_buttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	
+	// 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_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 );
+}
+
+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_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.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_print_using_printer_base__
+#define __dialog_print_using_printer_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/gdicmn.h>
+#include <wx/radiobox.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/checkbox.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PRINT_USING_PRINTER_base
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PRINT_USING_PRINTER_base : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			wxID_PRINT_MODE = 1000,
+			wxID_PAGE_MODE,
+			wxID_PRINT_OPTIONS,
+			wxID_PRINT_ALL,
+		};
+		
+		wxStaticBoxSizer* m_leftLayersBoxSizer;
+		wxStaticBoxSizer* m_rightLayersBoxSizer;
+		wxRadioBox* m_ScaleOption;
+		wxStaticText* m_FineAdjustXscaleTitle;
+		wxTextCtrl* m_FineAdjustXscaleOpt;
+		wxStaticText* m_FineAdjustYscaleTitle;
+		wxTextCtrl* m_FineAdjustYscaleOpt;
+		wxStaticText* m_TextPenWidth;
+		wxTextCtrl* m_DialogPenWidth;
+		wxCheckBox* m_Print_Mirror;
+		wxRadioBox* m_ModeColorOption;
+		wxRadioBox* m_PagesOption;
+		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 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_USING_PRINTER_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 551,314 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~DIALOG_PRINT_USING_PRINTER_base();
+	
+};
+
+#endif //__dialog_print_using_printer_base__

gerbview/files.cpp

@@ -116,7 +116,7 @@ bool WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
          */
         filetypes = _( "Gerber files (.gb* .gt* .lgr .ger .pho)" );
         filetypes << wxT("|");
-        filetypes += wxT("*.gb*;*.GB*;.gt*;.GT*;.gko;.GKO;*.GPB;*.gpb;*.lgr;*.LGR;*.ger;*.GER;*.pho;*.PHO" );
+        filetypes += wxT("*.gb*;*.GB*;*.gt*;*.GT*;*.gko;*.GKO;*.GPB;*.gpb;*.lgr;*.LGR;*.ger;*.GER;*.pho;*.PHO" );
         filetypes << wxT("|");
 
         /* Special gerber filetypes */

gerbview/pcbplot.cpp

@@ -19,9 +19,8 @@ PCB_Plot_Options g_pcb_plot_options;
 /* void WinEDA_BasePcbFrame::ToPlotter(wxCommandEvent& event) */
 /***************************************************************/
 
-void WinEDA_BasePcbFrame::ToPlotter(wxCommandEvent& event)
+/** TODO */
+void WinEDA_GerberFrame::ToPlotter(wxCommandEvent& event)
 {
-//	WinEDA_PlotFrame * frame = new WinEDA_PlotFrame(this);
-//	frame->ShowModal(); frame->Destroy();
 }
 

gerbview/pcbplot.h

@@ -11,6 +11,8 @@
 #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_PAGE_FRAME      wxT( "PrintPageFrame" )
+#define OPTKEY_PRINT_MONOCHROME_MODE wxT( "PrintMonochrome" )
 
 /* Plot Options : */
 struct PCB_Plot_Options
@@ -18,8 +20,6 @@ struct PCB_Plot_Options
     bool Exclude_Edges_Pcb;
     int PlotLine_Width;
     bool Plot_Frame_Ref;       // True to plot/print frame references
-    bool DrawViaOnMaskLayer;   // True if vias are drawn on Mask layer
-                               // (ie protected by mask)
     int Plot_Mode;
     bool Plot_Set_MIROIR;
     bool Sel_Rotate_Window;
@@ -31,22 +31,14 @@ struct PCB_Plot_Options
     int PlotPSColorOpt;        // True for color Postscript output
     bool Plot_PS_Negative;     // True to create a negative board ps plot
 
-    /* Settings to trace the various items in silkscreen. */
-    bool Sel_Texte_Reference;
-    bool Sel_Texte_Valeur;
-    bool Sel_Texte_Divers;
-    bool Sel_Texte_Invisible;
-    bool PlotPadsOnSilkLayer;
-    /* Plot pads even outside the layer (useful for silkscreen) */
-    bool Plot_Pads_All_Layers;
-
     /* id for plot format (see enum PlotFormat in plot_common.h) */
     int PlotFormat;
     int PlotOrient;
     int PlotScaleOpt;
     int DrillShapeOpt;
-    double Scale_X;
-    double Scale_Y;
+    double         Scale;
+    double         ScaleAdjX;
+    double         ScaleAdjY;
 };
 extern PCB_Plot_Options g_pcb_plot_options;
 

gerbview/wxGerberFrame.h

 /***********************************************************/
-/*                   wxGerberStruct.h:                     */
+/*                   wxGerberFrame.h:                     */
 /***********************************************************/
 
 #ifndef  WX_GERBER_STRUCT_H
@@ -145,6 +145,18 @@ public:
 
     void         InstallDrillFrame( wxCommandEvent& event );
     void         ToPostProcess( wxCommandEvent& event );
+
+    /** Function ToPlotter
+     * Open a dialog frame to create plot and drill files
+     * relative to the current board
+     */
+    void ToPlotter( wxCommandEvent& event );
+
+    /** Function ToPrinter
+     * Open a dialog frame to print layers
+     */
+    void ToPrinter( wxCommandEvent& event );
+
     void         Genere_HPGL( const wxString& FullFileName, int Layers );
     void         Genere_GERBER( const wxString& FullFileName, int Layers );
     void         Genere_PS( const wxString& FullFileName, int Layers );

include/pcbstruct.h

@@ -69,6 +69,9 @@
 #define ECO2_N                  27
 #define EDGE_N                  28
 #define LAST_NO_COPPER_LAYER    28
+#define UNUSED_LAYER_29         29
+#define UNUSED_LAYER_30         30
+#define UNUSED_LAYER_31         31
 #define NB_LAYERS               (LAST_NO_COPPER_LAYER + 1)
 
 #define LAYER_COUNT             32
@@ -116,6 +119,28 @@
 #define INTERNAL_LAYERS         0x00007FFE
 #define EXTERNAL_LAYERS         0x00008001
 
+
+// layers order in dialogs (plot, print and toolbars)
+// in same order than in setup layers dialog
+// (Front or Top to Back or Bottom)
+#define DECLARE_LAYERS_ORDER_LIST(list) int list[LAYER_COUNT] =\
+{   LAYER_N_FRONT,\
+    LAYER_N_15, LAYER_N_14, LAYER_N_13, LAYER_N_12,\
+    LAYER_N_11, LAYER_N_10, LAYER_N_9, LAYER_N_8,\
+    LAYER_N_7, LAYER_N_6, LAYER_N_5, LAYER_N_4,\
+    LAYER_N_3, LAYER_N_2,\
+    LAYER_N_BACK,\
+    ADHESIVE_N_FRONT , ADHESIVE_N_BACK,\
+    SOLDERPASTE_N_FRONT, SOLDERPASTE_N_BACK,\
+    SILKSCREEN_N_FRONT, SILKSCREEN_N_BACK,\
+    SOLDERMASK_N_FRONT, SOLDERMASK_N_BACK,\
+    DRAW_N,\
+    COMMENT_N,\
+    ECO1_N, ECO2_N,\
+    EDGE_N,\
+    UNUSED_LAYER_29, UNUSED_LAYER_30, UNUSED_LAYER_31\
+};
+
 class NETINFO_ITEM;
 class MARKER_PCB;
 class RATSNEST_ITEM;

include/wxBasePcbFrame.h

@@ -305,20 +305,21 @@ public:
     void     RecalculateAllTracksNetcode();
 
     /* Plotting functions:
+     * Return true if OK, false if the file is not created (or has a problem)
      */
-    void     ToPlotter( wxCommandEvent& event );
-    void     Genere_GERBER( const wxString& FullFileName,
+
+    bool     Genere_GERBER( const wxString& FullFileName,
                             int             Layer,
                             bool            PlotOriginIsAuxAxis,
                             GRTraceMode     trace_mode );
-    void     Genere_HPGL( const wxString& FullFileName,
+    bool     Genere_HPGL( const wxString& FullFileName,
                           int             Layer,
                           GRTraceMode     trace_mode );
-    void     Genere_PS( const wxString& FullFileName,
+    bool     Genere_PS( const wxString& FullFileName,
                         int             Layer,
                         bool            useA4,
                         GRTraceMode     trace_mode );
-    void     Genere_DXF( const wxString& FullFileName,
+    bool     Genere_DXF( const wxString& FullFileName,
                          int             Layer,
                          GRTraceMode     trace_mode );
     void     Plot_Layer( PLOTTER*    plotter,

include/wxEeschemaStruct.h

@@ -202,6 +202,11 @@ public:
      */
     void             SetSheetNumberAndCount();
 
+    /** function ToPrinter
+     * Install the print dialog
+     */
+    void             ToPrinter( wxCommandEvent& event );
+
     // Plot functions:
     void             ToPlot_PS( wxCommandEvent& event );
     void             ToPlot_HPGL( wxCommandEvent& event );

include/wxPcbStruct.h

@@ -87,6 +87,17 @@ public:
 
     ~WinEDA_PcbFrame();
 
+    /** Function ToPlotter
+     * Open a dialog frame to create plot and drill files
+     * relative to the current board
+     */
+    void             ToPlotter( wxCommandEvent& event );
+
+    /** function ToPrinter
+     * Install the print dialog
+     */
+    void             ToPrinter( wxCommandEvent& event );
+
     void             GetKicadAbout( wxCommandEvent& event );
 
     // Configurations:
@@ -183,9 +194,9 @@ public:
      *commands like move
      */
     virtual void     SaveCopyInUndoList( BOARD_ITEM* aItemToCopy,
-                                         UndoRedoOpType aTypeCommand,
-                                         const wxPoint& aTransformPoint =
-                                         wxPoint( 0, 0 ) );
+                                        UndoRedoOpType aTypeCommand,
+                                        const wxPoint& aTransformPoint =
+                                            wxPoint( 0, 0 ) );
 
     /** Function SaveCopyInUndoList (overloaded).
      * Creates a new entry in undo list of commands.
@@ -196,9 +207,9 @@ public:
      *commands like move
      */
     virtual void SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
-                                     UndoRedoOpType aTypeCommand,
-                                     const wxPoint& aTransformPoint =
-                                     wxPoint( 0, 0 ) );
+                                    UndoRedoOpType aTypeCommand,
+                                    const wxPoint& aTransformPoint =
+                                        wxPoint( 0, 0 ) );
 
     /** Function PutDataInPreviousState()
      * Used in undo or redo command.
@@ -859,10 +870,10 @@ public:
      * @param aTransformPoint = the reference point of the transformation, for
      *                          commands like move
      */
-    virtual void SaveCopyInUndoList( BOARD_ITEM*    aItem,
-                                     UndoRedoOpType aTypeCommand,
-                                     const wxPoint& aTransformPoint =
-                                     wxPoint( 0, 0 ) );
+    virtual void SaveCopyInUndoList( BOARD_ITEM* aItem,
+                                    UndoRedoOpType aTypeCommand,
+                                    const wxPoint& aTransformPoint =
+                                        wxPoint( 0, 0 ) );
 
     /** Function SaveCopyInUndoList (overloaded).
      * Creates a new entry in undo list of commands.
@@ -873,25 +884,25 @@ public:
      *                          commands like move
      */
     virtual void SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
-                                     UndoRedoOpType     aTypeCommand,
-                                     const wxPoint& aTransformPoint =
-                                     wxPoint( 0, 0 ) );
+                                    UndoRedoOpType aTypeCommand,
+                                    const wxPoint& aTransformPoint =
+                                        wxPoint( 0, 0 ) );
 
 private:
-    void    GetComponentFromUndoList( wxCommandEvent& event );
-    void    GetComponentFromRedoList( wxCommandEvent& event );
+    void         GetComponentFromUndoList( wxCommandEvent& event );
+    void         GetComponentFromRedoList( wxCommandEvent& event );
 
 public:
 
     // Footprint edition
-    void    Place_Ancre( MODULE* module );
-    void    RemoveStruct( EDA_BaseStruct* Item );
-    void    Transform( MODULE* module, int transform );
+    void         Place_Ancre( MODULE* module );
+    void         RemoveStruct( EDA_BaseStruct* Item );
+    void         Transform( MODULE* module, int transform );
 
     // loading Footprint
-    MODULE* Import_Module( wxDC* DC );
-    void    Export_Module( MODULE* ptmod, bool createlib );
-    void    Load_Module_From_BOARD( MODULE* Module );
+    MODULE*      Import_Module( wxDC* DC );
+    void         Export_Module( MODULE* ptmod, bool createlib );
+    void         Load_Module_From_BOARD( MODULE* Module );
 
     // functions to edit footprint edges
 

include/wxstruct.h

@@ -269,7 +269,6 @@ public:
     /* Return the current zoom level */
     int              GetZoom( void );
 
-    void             ToPrinter( wxCommandEvent& event );
     void             SVG_Print( wxCommandEvent& event );
 
     void             TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_width );

pcbnew/CMakeLists.txt

@@ -65,8 +65,10 @@ set(PCBNEW_SRCS
     dialog_pcbnew_config_libs_and_paths.cpp
     dialog_pcbnew_config_libs_and_paths_fbp.cpp
     dialog_print_for_modedit.cpp
+    dialog_plot_base.cpp
     dialog_print_for_modedit_base.cpp
     dialog_print_using_printer.cpp
+    dialog_print_using_printer_base.cpp
     dialog_orient_footprints.cpp
     dialog_mask_clearance.cpp
     dialog_mask_clearance_base.cpp

pcbnew/dialog_layers_setup.cpp

@@ -545,6 +545,7 @@ void DIALOG_LAYERS_SETUP::OnOkButtonClick( wxCommandEvent& event )
             }
         }
 
+        m_Parent->GetScreen()->SetModify();
         m_Parent->ReCreateLayerBox( NULL );
 
         EndModal( wxID_OK );

pcbnew/dialog_plot_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_plot_base__
+#define __dialog_plot_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/gdicmn.h>
+#include <wx/checkbox.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/radiobox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PLOT_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PLOT_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			ID_USE_GERBER_EXTENSIONS = 1000,
+			ID_PRINT_PAD_ON_SILKSCREEN,
+			ID_FORCE_PRINT_PAD,
+			ID_PRINT_VALUE,
+			ID_PRINT_REF,
+			ID_PRINT_MODULE_TEXTS,
+			ID_FORCE_PRINT_INVISIBLE_TEXT,
+			ID_DRILL_SHAPE_OPT,
+			ID_MIROR_OPT,
+			ID_MASKVIA_OPT,
+			ID_EXEC_PLOT,
+			ID_SAVE_OPT_PLOT,
+			ID_CREATE_DRILL_FILE,
+		};
+		
+		wxStaticBoxSizer* m_CopperLayersBoxSizer;
+		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
+		wxCheckBox* m_Use_Gerber_Extensions;
+		wxCheckBox* m_Exclude_Edges_Pcb;
+		wxCheckBox* m_Plot_Sheet_Ref;
+		wxCheckBox* m_Plot_Pads_on_Silkscreen;
+		wxCheckBox* m_Force_Plot_Pads;
+		wxCheckBox* m_Plot_Text_Value;
+		wxCheckBox* m_Plot_Text_Ref;
+		wxCheckBox* m_Plot_Text_Div;
+		wxCheckBox* m_Plot_Invisible_Text;
+		wxRadioBox* m_Drill_Shape_Opt;
+		wxRadioBox* m_Scale_Opt;
+		wxRadioBox* m_PlotModeOpt;
+		wxRadioBox* m_Choice_Plot_Offset;
+		wxRadioBox* m_PlotFormatOpt;
+		wxStaticText* m_textPenSize;
+		wxTextCtrl* m_HPGLPenSizeOpt;
+		wxStaticText* m_staticText3;
+		wxTextCtrl* m_HPGLPenSpeedOpt;
+		wxStaticText* m_textPenOvr;
+		wxTextCtrl* m_HPGLPenOverlayOpt;
+		wxCheckBox* m_Plot_PS_Negative;
+		wxCheckBox* m_PlotMirorOpt;
+		wxCheckBox* m_PlotNoViaOnMaskOpt;
+		wxStaticText* m_staticText6;
+		wxTextCtrl* m_LinesWidth;
+		
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_FineAdjustXscaleOpt;
+		wxStaticText* m_staticText8;
+		wxTextCtrl* m_FineAdjustYscaleOpt;
+		
+		wxButton* m_PlotButton;
+		wxButton* m_buttonSaveOpt;
+		wxButton* m_buttonDrill;
+		wxButton* m_buttonQuit;
+		wxStaticText* m_staticText2;
+		wxTextCtrl* m_MessagesBox;
+		
+		// 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 SetPlotFormat( wxCommandEvent& event ){ event.Skip(); }
+		virtual void Plot( wxCommandEvent& event ){ event.Skip(); }
+		virtual void SaveOptPlot( wxCommandEvent& event ){ event.Skip(); }
+		virtual void CreateDrillFile( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnQuit( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	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();
+	
+};
+
+#endif //__dialog_plot_base__

pcbnew/dialog_print_using_printer.cpp

@@ -15,7 +15,9 @@
 #include "printout_controler.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "pcbplot.h"
+#include "class_board_design_settings.h"
 
 #define WIDTH_MAX_VALUE           1000
 #define WIDTH_MIN_VALUE           1
@@ -41,13 +43,13 @@ static PRINT_PARAMETERS  s_Parameters;
 class DIALOG_PRINT_USING_PRINTER : public DIALOG_PRINT_USING_PRINTER_base
 {
 private:
-    WinEDA_DrawFrame* m_Parent;
+    WinEDA_PcbFrame* m_Parent;
     wxConfig*         m_Config;
     wxCheckBox*       m_BoxSelectLayer[32];
     static bool       m_ExcludeEdgeLayer;
 
 public:
-    DIALOG_PRINT_USING_PRINTER( WinEDA_DrawFrame* parent );
+    DIALOG_PRINT_USING_PRINTER( WinEDA_PcbFrame* parent );
     ~DIALOG_PRINT_USING_PRINTER() {};
 
 private:
@@ -74,7 +76,7 @@ bool DIALOG_PRINT_USING_PRINTER::m_ExcludeEdgeLayer;
 
 
 /*******************************************************/
-void WinEDA_DrawFrame::ToPrinter( wxCommandEvent& event )
+void WinEDA_PcbFrame::ToPrinter( wxCommandEvent& event )
 /*******************************************************/
 
 /* Virtual function:
@@ -100,13 +102,13 @@ void WinEDA_DrawFrame::ToPrinter( wxCommandEvent& event )
 
 
 /*************************************************************************************/
-DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( WinEDA_DrawFrame* parent ) :
+DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( WinEDA_PcbFrame* parent ) :
     DIALOG_PRINT_USING_PRINTER_base( parent )
 /*************************************************************************************/
 {
     m_Parent = parent;
     m_Config = wxGetApp().m_EDA_Config;
-    
+
     InitValues( );
 
     if( GetSizer() )
@@ -123,45 +125,56 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
     SetFocus();
     int      layer_max = NB_LAYERS;
     wxString msg;
+    BOARD*   board = m_Parent->GetBoard();
 
-    #ifdef GERBVIEW
-    layer_max = 32;
-    m_ExcludeEdgeLayer = true;    // no meaning in gerbview
-    m_Exclude_Edges_Pcb->Show( false );
-    msg = _( "Layers:" );
-
-    // Set wxRadioBox title to "Layers:" for copper layers and thechincal layers
-    // Because in Gerbview , al layers are only graphic layers (layer id has no meaning)
-    m_CopperLayersBoxSizer->GetStaticBox()->SetLabel( msg );
-    m_TechnicalLayersBoxSizer->GetStaticBox()->SetLabel( msg );
-    #endif
-
-    /* Create layer list */
-    int mask = 1, ii;
-    for( ii = 0; ii < layer_max; ii++, mask <<= 1 )
+     // Create layer list.
+    int      layer;
+    wxString layerKey;
+    for( layer = 0; layer < NB_LAYERS; ++layer )
     {
-#ifdef GERBVIEW
-        msg = _( "Layer" );
-        msg << wxT( " " ) << ii + 1;
-#else
-        msg = ( (WinEDA_BasePcbFrame*) m_Parent )->GetBoard()->GetLayerName( ii );
-#endif
-        m_BoxSelectLayer[ii] = new wxCheckBox( this, -1, msg );
+        if( !board->m_BoardSettings->IsLayerEnabled( layer ) )
+            m_BoxSelectLayer[layer] = NULL;
+        else
+        m_BoxSelectLayer[layer] =
+            new wxCheckBox( this, -1, board->GetLayerName( layer ) );
+    }
+
+    // Add wxCheckBoxes in layers lists dialog
+    //  List layers in same order than in setup layers dialog
+    // (Front or Top to Back or Bottom)
+    DECLARE_LAYERS_ORDER_LIST(layersOrder);
+    for( int layer_idx = 0; layer_idx < NB_LAYERS; ++layer_idx )
+    {
+        layer = layersOrder[layer_idx];
+
+        wxASSERT(layer < NB_LAYERS);
+
+        if( m_BoxSelectLayer[layer] == NULL )
+            continue;
 
-        if( mask & s_SelectedLayers )
-            m_BoxSelectLayer[ii]->SetValue( TRUE );
-        if( ii < 16 )
-            m_CopperLayersBoxSizer->Add( m_BoxSelectLayer[ii],
-                                         wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
+        if( layer < NB_COPPER_LAYERS )
+            m_CopperLayersBoxSizer->Add( m_BoxSelectLayer[layer],
+                                     0, wxGROW | wxALL, 1 );
         else
-            m_TechnicalLayersBoxSizer->Add( m_BoxSelectLayer[ii],
-                                            wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
+            m_TechnicalLayersBoxSizer->Add( m_BoxSelectLayer[layer],
+                                     0, wxGROW | wxALL, 1 );
+
+
+        layerKey.Printf( OPTKEY_LAYERBASE, layer );
+        bool option;
+        if( m_Config->Read( layerKey, &option ) )
+            m_BoxSelectLayer[layer]->SetValue( option );
+        else
+        {
+            long mask = 1 << layer;
+            if( mask & s_SelectedLayers )
+                m_BoxSelectLayer[layer]->SetValue( true );
+        }
     }
 
+
     // Option for excluding contents of "Edges Pcb" layer
-#ifndef GERBVIEW
     m_Exclude_Edges_Pcb->Show( true );
-#endif
 
     // Read the scale adjust option
     int scale_idx = 4; // default selected scale = ScaleList[4] = 1.000
@@ -185,6 +198,9 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
         s_SelectedLayers = 0;
         for( int layer = 0;  layer<layer_max;  ++layer )
         {
+            if( m_BoxSelectLayer[layer] == NULL )
+                continue;
+
             wxString layerKey;
             bool     option;
 
@@ -231,20 +247,19 @@ int DIALOG_PRINT_USING_PRINTER::SetLayerMaskFromListSelection()
     int page_count;
     int layers_count = NB_LAYERS;
 
-    if( m_Parent->m_Ident == GERBER_FRAME )
-        layers_count = 32;
-
     s_Parameters.m_PrintMaskLayer = 0;
     int ii;
     for( ii = 0, page_count = 0; ii < layers_count; ii++ )
     {
+        if( m_BoxSelectLayer[ii] == NULL )
+            continue;
         if( m_BoxSelectLayer[ii]->IsChecked() )
         {
             page_count++;
             s_Parameters.m_PrintMaskLayer |= 1 << ii;
         }
     }
-    
+
     // In pcbnew: force the EDGE layer to be printed or not with the other layers
     m_ExcludeEdgeLayer = m_Exclude_Edges_Pcb->IsChecked();
     if( m_ExcludeEdgeLayer )
@@ -273,11 +288,10 @@ void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event )
         m_Config->Write( OPTKEY_PRINT_PAGE_FRAME, s_Parameters.m_Print_Sheet_Ref);
         m_Config->Write( OPTKEY_PRINT_MONOCHROME_MODE, s_Parameters.m_Print_Black_and_White);
         wxString layerKey;
-        int      layers_count = NB_LAYERS;
-        if( m_Parent->m_Ident == GERBER_FRAME )
-            layers_count = 32;
-        for( int layer = 0;  layer<layers_count;  ++layer )
+        for( int layer = 0; layer < NB_LAYERS;  ++layer )
         {
+            if( m_BoxSelectLayer[layer] == NULL )
+                continue;
             layerKey.Printf( OPTKEY_LAYERBASE, layer );
             m_Config->Write( layerKey, m_BoxSelectLayer[layer]->IsChecked() );
         }
@@ -292,12 +306,12 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( )
 {
     s_Parameters.m_PrintMirror = m_Print_Mirror->GetValue();
     s_Parameters.m_Print_Sheet_Ref = m_Print_Sheet_Ref->GetValue();
-    s_Parameters.m_Print_Black_and_White = 
+    s_Parameters.m_Print_Black_and_White =
         m_ModeColorOption->GetSelection() != 0;
 
     if( m_PagesOption )
         s_Parameters.m_OptionPrintPage = m_PagesOption->GetSelection() != 0;
-    
+
 
     SetLayerMaskFromListSelection();
 

pcbnew/pcbframe.cpp

@@ -129,7 +129,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
     EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
     EVT_TOOL( ID_UNDO_BUTT, WinEDA_PcbFrame::GetBoardFromUndoList )
     EVT_TOOL( ID_REDO_BUTT, WinEDA_PcbFrame::GetBoardFromRedoList )
-    EVT_TOOL( ID_GEN_PRINT, WinEDA_DrawFrame::ToPrinter )
+    EVT_TOOL( ID_GEN_PRINT, WinEDA_PcbFrame::ToPrinter )
     EVT_TOOL( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print )
     EVT_TOOL( ID_GEN_PLOT, WinEDA_PcbFrame::Process_Special_Functions )
     EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )

pcbnew/pcbnew_config.h

@@ -592,6 +592,7 @@ static PARAM_CFG_SETCOLOR ColorCheveluCfg
 
 static PARAM_CFG_INT HPGLpenNumCfg
 (
+    INSETUP,
     wxT( "HPGLnum" ),
     &g_pcb_plot_options.HPGL_Pen_Num,
     1,
@@ -600,6 +601,7 @@ static PARAM_CFG_INT HPGLpenNumCfg
 
 static PARAM_CFG_INT HPGLdiamCfg    // HPGL pen size (mils)
 (
+    INSETUP,
     wxT( "HPGdiam" ),
     &g_pcb_plot_options.HPGL_Pen_Diam,
     15,
@@ -608,6 +610,7 @@ static PARAM_CFG_INT HPGLdiamCfg    // HPGL pen size (mils)
 
 static PARAM_CFG_INT HPGLspeedCfg   //HPGL pen speed (cm/s)
 (
+    INSETUP,
     wxT( "HPGLSpd" ),
     &g_pcb_plot_options.HPGL_Pen_Speed,
     20,
@@ -616,6 +619,7 @@ static PARAM_CFG_INT HPGLspeedCfg   //HPGL pen speed (cm/s)
 
 static PARAM_CFG_INT HPGLrecouvrementCfg
 (
+    INSETUP,
     wxT( "HPGLrec" ),
     &g_pcb_plot_options.HPGL_Pen_Recouvrement,
     2,

pcbnew/plotdxf.cpp

@@ -12,23 +12,18 @@
 
 #include "protos.h"
 
-void WinEDA_BasePcbFrame::Genere_DXF( const wxString& FullFileName, int Layer,
+bool WinEDA_BasePcbFrame::Genere_DXF( const wxString& FullFileName, int Layer,
                                       GRTraceMode trace_mode )
 {
     Ki_PageDescr* currentsheet = GetScreen()->m_CurrentSheetDesc;
 
-    ClearMsgPanel();
-
     FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
     if( output_file == NULL )
     {
-        wxString msg = _( "Unable to create file " ) + FullFileName;
-        DisplayError( this, msg );
-        return;
+        return false;
     }
 
     SetLocaleTo_C_standard();
-    AppendMsgPanel( _( "File" ), FullFileName, CYAN );
 
     DXF_PLOTTER* plotter = new DXF_PLOTTER();
     plotter->set_paper_size( currentsheet );
@@ -44,4 +39,6 @@ void WinEDA_BasePcbFrame::Genere_DXF( const wxString& FullFileName, int Layer,
     plotter->end_plot();
     delete plotter;
     SetLocaleTo_Default();
+
+    return true;
 }

pcbnew/plotgerb.cpp

@@ -21,7 +21,7 @@
 #include "protos.h"
 
 /********************************************************************************/
-void WinEDA_BasePcbFrame::Genere_GERBER( const wxString& FullFileName, int Layer,
+bool WinEDA_BasePcbFrame::Genere_GERBER( const wxString& FullFileName, int Layer,
                                          bool PlotOriginIsAuxAxis,
                                          GRTraceMode trace_mode )
 /********************************************************************************/
@@ -33,9 +33,13 @@ void WinEDA_BasePcbFrame::Genere_GERBER( const wxString& FullFileName, int Layer
  * format 3.4 uses the native pcbnew units (1/10000 inch).
  */
 {
-    wxPoint offset;
+    FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
+    if( output_file == NULL )
+    {
+        return false;
+    }
 
-    ClearMsgPanel();
+    wxPoint offset;
 
     /* Calculate scaling from pcbnew units (in 0.1 mil or 0.0001 inch) to gerber units */
     double scale = g_pcb_plot_options.Scale;
@@ -48,14 +52,6 @@ void WinEDA_BasePcbFrame::Genere_GERBER( const wxString& FullFileName, int Layer
         offset.y = 0;
     }
 
-    FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
-    if( output_file == NULL )
-    {
-        wxString msg = _( "unable to create file " ) + FullFileName;
-        DisplayError( this, msg );
-        return;
-    }
-
     SetLocaleTo_C_standard();
     PLOTTER* plotter = new GERBER_PLOTTER();
     /* No mirror and scaling for gerbers! */
@@ -64,8 +60,6 @@ void WinEDA_BasePcbFrame::Genere_GERBER( const wxString& FullFileName, int Layer
     plotter->set_creator( wxT( "PCBNEW-RS274X" ) );
     plotter->set_filename( FullFileName );
 
-    AppendMsgPanel( _( "File" ), FullFileName, CYAN );
-
     plotter->start_plot( output_file );
 
     // Sheet refs on gerber CAN be useful... and they're always 1:1
@@ -76,4 +70,6 @@ void WinEDA_BasePcbFrame::Genere_GERBER( const wxString& FullFileName, int Layer
     plotter->end_plot();
     delete plotter;
     SetLocaleTo_Default();
+
+    return true;
 }

pcbnew/plothpgl.cpp

@@ -13,7 +13,7 @@
 #include "protos.h"
 
 
-void WinEDA_BasePcbFrame::Genere_HPGL( const wxString& FullFileName, int Layer,
+bool WinEDA_BasePcbFrame::Genere_HPGL( const wxString& FullFileName, int Layer,
                                        GRTraceMode trace_mode )
 {
     wxSize        SheetSize;
@@ -24,8 +24,11 @@ void WinEDA_BasePcbFrame::Genere_HPGL( const wxString& FullFileName, int Layer,
     double        scale;
     wxPoint       offset;
 
-    ClearMsgPanel();
-
+    FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
+    if( output_file == NULL )
+    {
+        return false;
+    }
     // Compute pen_dim (from g_HPGL_Pen_Diam in mils) in pcb units,
     // with plot scale (if Scale is 2, pen diameter is always g_HPGL_Pen_Diam
     // so apparent pen diam is real pen diam / Scale
@@ -40,16 +43,8 @@ void WinEDA_BasePcbFrame::Genere_HPGL( const wxString& FullFileName, int Layer,
     int   pen_recouvrement = wxRound(
         g_pcb_plot_options.HPGL_Pen_Recouvrement * 10.0 / g_pcb_plot_options.Scale );
 
-    FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
-    if( output_file == NULL )
-    {
-        wxString msg = _( "Unable to create file " ) + FullFileName;
-        DisplayError( this, msg );
-        return;
-    }
 
     SetLocaleTo_C_standard();
-    AppendMsgPanel( _( "File" ), FullFileName, CYAN );
 
     if( g_pcb_plot_options.PlotScaleOpt != 1 )
         Center = TRUE; // Scale != 1 so center PCB plot.
@@ -112,4 +107,6 @@ void WinEDA_BasePcbFrame::Genere_HPGL( const wxString& FullFileName, int Layer,
     plotter->end_plot();
     delete plotter;
     SetLocaleTo_Default();
+
+    return true;
 }

pcbnew/plotps.cpp

@@ -16,7 +16,7 @@
 /* Generate a PostScript file (*. ps) of the circuit layer.
  * If layer < 0: all layers are plotted.
  */
-void WinEDA_BasePcbFrame::Genere_PS( const wxString& FullFileName, int Layer,
+bool WinEDA_BasePcbFrame::Genere_PS( const wxString& FullFileName, int Layer,
                                      bool useA4, GRTraceMode trace_mode )
 {
     wxSize        SheetSize;
@@ -29,18 +29,13 @@ void WinEDA_BasePcbFrame::Genere_PS( const wxString& FullFileName, int Layer,
     Ki_PageDescr* SheetPS;
     wxPoint       offset;
 
-    ClearMsgPanel();
-
     FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
     if( output_file == NULL )
     {
-        wxString msg = _( "Unable to create file " ) + FullFileName;
-        DisplayError( this, msg );
-        return;
+        return false;
     }
 
     SetLocaleTo_C_standard();
-    AppendMsgPanel( _( "File" ), FullFileName, CYAN );
 
     if( g_pcb_plot_options.PlotScaleOpt != 1 )
         Center = TRUE;        // Scale != 1 so center plot.
@@ -131,4 +126,6 @@ void WinEDA_BasePcbFrame::Genere_PS( const wxString& FullFileName, int Layer,
     plotter->end_plot();
     delete plotter;
     SetLocaleTo_Default();
+
+    return true;
 }