Tune pcb plot dialog layout. Make output directory accept relative paths.

pcbnew/dialogs/dialog_plot_base.h

@@ -11,15 +11,16 @@
 #include <wx/intl.h>
 
 #include <wx/string.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
+#include <wx/radiobox.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/sizer.h>
+#include <wx/statbox.h>
+#include <wx/checkbox.h>
 #include <wx/stattext.h>
+#include <wx/choice.h>
 #include <wx/textctrl.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
@@ -43,63 +44,65 @@ class DIALOG_PLOT_BASE : public wxDialog
 			ID_CREATE_DRILL_FILE,
 		};
 		
+		wxRadioBox* m_plotFormatOpt;
 		wxStaticBoxSizer* m_CopperLayersBoxSizer;
 		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
-		wxCheckBox* m_useGerberExtensions;
-		wxCheckBox* m_excludeEdgeLayerOpt;
-		wxCheckBox* m_subtractMaskFromSilk;
 		wxCheckBox* m_plotSheetRef;
 		wxCheckBox* m_plotPads_on_Silkscreen;
 		wxCheckBox* m_plotModuleValueOpt;
 		wxCheckBox* m_plotModuleRefOpt;
 		wxCheckBox* m_plotTextOther;
 		wxCheckBox* m_plotInvisibleText;
-		wxRadioBox* m_drillShapeOpt;
-		wxRadioBox* m_scaleOpt;
-		wxRadioBox* m_plotModeOpt;
-		wxRadioBox* m_choicePlotOffset;
-		wxRadioBox* m_plotFormatOpt;
+		wxCheckBox* m_plotNoViaOnMaskOpt;
+		wxCheckBox* m_plotMirrorOpt;
+		wxStaticText* m_staticText11;
+		wxChoice* m_drillShapeOpt;
+		wxStaticText* m_staticText12;
+		wxChoice* m_scaleOpt;
+		wxStaticText* m_staticText13;
+		wxChoice* m_plotModeOpt;
+		wxStaticText* m_textDefaultPenSize;
+		wxTextCtrl* m_linesWidth;
+		wxCheckBox* m_useGerberExtensions;
+		wxCheckBox* m_excludeEdgeLayerOpt;
+		wxCheckBox* m_subtractMaskFromSilk;
+		wxCheckBox* m_useAuxOriginCheckBox;
 		wxStaticText* m_textPenSize;
 		wxTextCtrl* m_HPGLPenSizeOpt;
-		wxStaticText* m_staticText3;
-		wxTextCtrl* m_HPGLPenSpeedOpt;
 		wxStaticText* m_textPenOvr;
 		wxTextCtrl* m_HPGLPenOverlayOpt;
-		wxCheckBox* m_plotPSNegativeOpt;
-		wxCheckBox* m_plotMirrorOpt;
-		wxCheckBox* m_plotNoViaOnMaskOpt;
-		wxStaticText* m_staticText6;
-		wxTextCtrl* m_linesWidth;
-		
+		wxStaticText* m_textPenSpeed;
+		wxTextCtrl* m_HPGLPenSpeedOpt;
 		wxStaticText* m_staticText7;
 		wxTextCtrl* m_fineAdjustXscaleOpt;
 		wxStaticText* m_staticText8;
 		wxTextCtrl* m_fineAdjustYscaleOpt;
-		
-		wxButton* m_plotButton;
-		wxButton* m_buttonSaveOpt;
-		wxButton* m_buttonDrill;
-		wxButton* m_buttonQuit;
+		wxCheckBox* m_plotPSNegativeOpt;
 		wxStaticText* m_staticTextDir;
 		wxTextCtrl* m_outputDirectoryName;
 		wxButton* m_browseButton;
 		wxStaticText* m_staticText2;
 		wxTextCtrl* m_messagesBox;
+		wxButton* m_plotButton;
+		wxButton* m_buttonSaveOpt;
+		wxButton* m_buttonDrill;
+		wxButton* m_buttonQuit;
 		
 		// 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 OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
 		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
 		virtual void applyPlotSettings( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOutputDirectoryBrowseClicked( 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( 571,616 ), 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( 800,616 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~DIALOG_PLOT_BASE();
 	
 };

pcbnew/pcb_plot_params.cpp

@@ -145,37 +145,6 @@ void PCB_PLOT_PARAMS::Parse( PCB_PLOT_PARAMS_PARSER* aParser ) throw( IO_ERROR,
 }
 
 
-PCB_PLOT_PARAMS& PCB_PLOT_PARAMS::operator=( const PCB_PLOT_PARAMS &aPcbPlotParams )
-{
-    layerSelection = aPcbPlotParams.layerSelection;
-    useGerberExtensions = aPcbPlotParams.useGerberExtensions;
-    m_ExcludeEdgeLayer = aPcbPlotParams.m_ExcludeEdgeLayer;
-    m_PlotLineWidth = aPcbPlotParams.m_PlotLineWidth;
-    m_PlotFrameRef = aPcbPlotParams.m_PlotFrameRef;
-    m_PlotViaOnMaskLayer = aPcbPlotParams.m_PlotViaOnMaskLayer;
-    m_PlotMode = aPcbPlotParams.m_PlotMode;
-    useAuxOrigin = aPcbPlotParams.useAuxOrigin;
-    m_HPGLPenNum = aPcbPlotParams.m_HPGLPenNum;
-    m_HPGLPenSpeed = aPcbPlotParams.m_HPGLPenSpeed;
-    m_HPGLPenDiam = aPcbPlotParams.m_HPGLPenDiam;
-    m_HPGLPenOvr = aPcbPlotParams.m_HPGLPenOvr;
-    m_PlotPSColorOpt = aPcbPlotParams.m_PlotPSColorOpt;
-    m_PlotPSNegative = aPcbPlotParams.m_PlotPSNegative;
-    m_PlotReference = aPcbPlotParams.m_PlotReference;
-    m_PlotValue = aPcbPlotParams.m_PlotValue;
-    m_PlotTextOther = aPcbPlotParams.m_PlotTextOther;
-    m_PlotInvisibleTexts = aPcbPlotParams.m_PlotInvisibleTexts;
-    m_PlotPadsOnSilkLayer = aPcbPlotParams.m_PlotPadsOnSilkLayer;
-    subtractMaskFromSilk = aPcbPlotParams.subtractMaskFromSilk;
-    m_PlotFormat = aPcbPlotParams.m_PlotFormat;
-    m_PlotMirror = aPcbPlotParams.m_PlotMirror;
-    m_DrillShapeOpt = aPcbPlotParams.m_DrillShapeOpt;
-    scaleSelection = aPcbPlotParams.scaleSelection;
-    outputDirectory = aPcbPlotParams.outputDirectory;
-    return *this;
-}
-
-
 bool PCB_PLOT_PARAMS::operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const
 {
     if( layerSelection != aPcbPlotParams.layerSelection )
@@ -345,9 +314,6 @@ void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) throw( IO_
             break;
         case T_outputdirectory:
             NeedSYMBOL();
-            // token = NextTok();
-            // if( token != T_STRING )
-            //     Expecting( T_STRING );
             aPcbPlotParams->outputDirectory = CONV_FROM_UTF8( CurText() );
             break;
         default:

pcbnew/pcb_plot_params.h

@@ -99,7 +99,6 @@ public:
     void        Format( OUTPUTFORMATTER* aFormatter, int aNestLevel ) const throw( IO_ERROR );
     void        Parse( PCB_PLOT_PARAMS_PARSER* aParser ) throw( IO_ERROR, PARSE_ERROR );
 
-    PCB_PLOT_PARAMS& operator=( const PCB_PLOT_PARAMS &aPcbPlotParams);
     bool        operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const;
     bool        operator!=( const PCB_PLOT_PARAMS &aPcbPlotParams ) const;