Pcbnew: plot dialog: minor enhancement and minor issue fix (could be a wxFromBuilder issue)

demos/interf_u/interf_u.pro

-update=22/01/2011 11:10:15
+update=01/02/2011 18:49:08
 version=1
-last_client=pcbnew
+last_client=eeschema
 [common]
 NetDir=
 [general]
 version=1
 RootSch=interf_u.sch
 BoardNm=interf_u.brd
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
+[pcbnew]
+version=1
+PadDrlX=354
+PadDimH=550
+PadDimV=550
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+VEgarde=100
+DrawLar=150
+EdgeLar=50
+TxtLar=170
+MSegLar=400
+LastNetListRead=interf_u.net
+[pcbnew/libraries]
+LibDir=F:\\kicad\\share\\modules\\packages3d
+LibName1=connect
+LibName2=discret
+LibName3=dip_sockets
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
 [eeschema]
 version=1
-LibDir=F:\\kicad\\share\\library
+LibDir=
 NetFmt=1
 HPGLSpd=20
 HPGLDm=15
@@ -50,35 +82,3 @@ LibName8=adc-dac
 LibName9=memory
 LibName10=xilinx
 LibName11=special
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
-[pcbnew]
-version=1
-PadDrlX=354
-PadDimH=550
-PadDimV=550
-BoardThickness=630
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=50
-TxtLar=170
-MSegLar=400
-LastNetListRead=interf_u.net
-[pcbnew/libraries]
-LibDir=F:\\kicad\\share\\modules\\packages3d
-LibName1=connect
-LibName2=discret
-LibName3=dip_sockets
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display

pcbnew/dialogs/dialog_plot_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// 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/radiobox.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.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>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_PLOT_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PLOT_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
-			ID_PRINT_REF,
-			ID_MIROR_OPT,
-			ID_SAVE_OPT_PLOT,
-			ID_CREATE_DRILL_FILE,
-		};
-		
-		wxRadioBox* m_plotFormatOpt;
-		wxStaticBoxSizer* m_CopperLayersBoxSizer;
-		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
-		wxCheckBox* m_plotSheetRef;
-		wxCheckBox* m_plotPads_on_Silkscreen;
-		wxCheckBox* m_plotModuleValueOpt;
-		wxCheckBox* m_plotModuleRefOpt;
-		wxCheckBox* m_plotTextOther;
-		wxCheckBox* m_plotInvisibleText;
-		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_textPenOvr;
-		wxTextCtrl* m_HPGLPenOverlayOpt;
-		wxStaticText* m_textPenSpeed;
-		wxTextCtrl* m_HPGLPenSpeedOpt;
-		wxStaticText* m_staticText7;
-		wxTextCtrl* m_fineAdjustXscaleOpt;
-		wxStaticText* m_staticText8;
-		wxTextCtrl* m_fineAdjustYscaleOpt;
-		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(); }
-		
-	
-	public:
-		
-		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();
-	
-};
-
-#endif //__dialog_plot_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Sep  8 2010)
+// 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/radiobox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.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>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PLOT_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PLOT_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
+			ID_PRINT_REF,
+			ID_MIROR_OPT,
+			ID_SAVE_OPT_PLOT,
+			ID_CREATE_DRILL_FILE,
+		};
+		
+		wxRadioBox* m_plotFormatOpt;
+		wxStaticBoxSizer* m_CopperLayersBoxSizer;
+		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
+		wxCheckBox* m_plotSheetRef;
+		wxCheckBox* m_plotPads_on_Silkscreen;
+		wxCheckBox* m_plotModuleValueOpt;
+		wxCheckBox* m_plotModuleRefOpt;
+		wxCheckBox* m_plotTextOther;
+		wxCheckBox* m_plotInvisibleText;
+		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_textPenOvr;
+		wxTextCtrl* m_HPGLPenOverlayOpt;
+		wxStaticText* m_textPenSpeed;
+		wxTextCtrl* m_HPGLPenSpeedOpt;
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_fineAdjustXscaleOpt;
+		wxStaticText* m_staticText8;
+		wxTextCtrl* m_fineAdjustYscaleOpt;
+		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(); }
+		
+	
+	public:
+		
+		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();
+	
+};
+
+#endif //__dialog_plot_base__

pcbnew/pcbplot.cpp

@@ -280,8 +280,16 @@ void DIALOG_PLOT::OnSetScaleOpt( wxCommandEvent& event )
 
 void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
 {
-    wxDirDialog dirDialog( this, _( "Select Output Directory" ),
-                           m_outputDirectoryName->GetValue() );
+    // Build the absolute path of current output plot directory
+    // to preselect it when opening the Di Dialog.
+    wxFileName fn( m_outputDirectoryName->GetValue() );
+    wxString path;
+    if( fn.IsRelative() )
+        path = wxGetCwd() + fn.GetPathSeparator() + m_outputDirectoryName->GetValue();
+    else
+        path = m_outputDirectoryName->GetValue();
+
+    wxDirDialog dirDialog( this, _( "Select Output Directory" ), path );
 
     if( dirDialog.ShowModal() == wxID_CANCEL )
         return;