diff --git a/demos/interf_u/interf_u.pro b/demos/interf_u/interf_u.pro
index f6b9f6d960..05b66d70e8 100644
--- a/demos/interf_u/interf_u.pro
+++ b/demos/interf_u/interf_u.pro
@@ -1,15 +1,47 @@
-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
diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp
index 40fe0f7101..1dcd81c654 100644
--- a/pcbnew/dialogs/dialog_plot_base.cpp
+++ b/pcbnew/dialogs/dialog_plot_base.cpp
@@ -1,345 +1,345 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_plot_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_PLOT_BASE::DIALOG_PLOT_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,350 ), wxDefaultSize );
-
- wxBoxSizer* bMainSizer;
- bMainSizer = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer* bSizer12;
- bSizer12 = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* bSizer181;
- bSizer181 = new wxBoxSizer( wxHORIZONTAL );
-
- wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") };
- int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
- m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, 0 );
- m_plotFormatOpt->SetSelection( 0 );
- bSizer181->Add( m_plotFormatOpt, 1, wxEXPAND, 5 );
-
- bSizer12->Add( bSizer181, 0, wxEXPAND, 5 );
-
- wxBoxSizer* bUpperSizer;
- bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
-
- wxStaticBoxSizer* sbLayersSizer;
- sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
-
- m_CopperLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers") ), wxVERTICAL );
-
- sbLayersSizer->Add( m_CopperLayersBoxSizer, 1, wxALL, 5 );
-
- m_TechnicalLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Technical Layers") ), wxVERTICAL );
-
- sbLayersSizer->Add( m_TechnicalLayersBoxSizer, 1, wxALL, 5 );
-
- bUpperSizer->Add( sbLayersSizer, 1, wxALL, 3 );
-
- wxBoxSizer* bPlotOptionsSizer;
- bPlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
-
- wxStaticBoxSizer* sbOptionsSizer;
- sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
-
- m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
- sbOptionsSizer->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
- m_plotPads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );
-
- sbOptionsSizer->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
- sbOptionsSizer->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
- sbOptionsSizer->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_plotTextOther = new wxCheckBox( this, wxID_ANY, _("Plot other module texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
- m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );
-
- sbOptionsSizer->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_plotInvisibleText = new wxCheckBox( this, wxID_ANY, _("Plot invisible texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
- m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );
-
- sbOptionsSizer->Add( m_plotInvisibleText, 0, wxALL, 2 );
-
- m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );
- m_plotNoViaOnMaskOpt->SetToolTip( _("Print/plot vias on mask layers. They are in this case not protected") );
-
- sbOptionsSizer->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );
-
- m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
- sbOptionsSizer->Add( m_plotMirrorOpt, 0, wxALL, 2 );
-
- wxBoxSizer* bSizer14;
- bSizer14 = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer* bSizer15;
- bSizer15 = new wxBoxSizer( wxVERTICAL );
-
- m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText11->Wrap( -1 );
- bSizer15->Add( m_staticText11, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };
- int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
- m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );
- m_drillShapeOpt->SetSelection( 0 );
- bSizer15->Add( m_drillShapeOpt, 0, wxEXPAND, 5 );
-
- m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText12->Wrap( -1 );
- bSizer15->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };
- int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
- m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );
- m_scaleOpt->SetSelection( 0 );
- bSizer15->Add( m_scaleOpt, 0, wxEXPAND, 5 );
-
- bSizer14->Add( bSizer15, 1, wxALL|wxEXPAND, 3 );
-
- wxBoxSizer* bSizer16;
- bSizer16 = new wxBoxSizer( wxVERTICAL );
-
- m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText13->Wrap( -1 );
- bSizer16->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
- int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
- m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
- m_plotModeOpt->SetSelection( 0 );
- bSizer16->Add( m_plotModeOpt, 0, wxEXPAND, 5 );
-
- m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );
- m_textDefaultPenSize->Wrap( -1 );
- m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
-
- bSizer16->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );
-
- bSizer16->Add( m_linesWidth, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
- bSizer14->Add( bSizer16, 1, wxALL|wxEXPAND, 3 );
-
- sbOptionsSizer->Add( bSizer14, 1, wxALL|wxEXPAND, 3 );
-
- bPlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
-
- bUpperSizer->Add( bPlotOptionsSizer, 1, 0, 5 );
-
- wxBoxSizer* bPlotIndOptionsSizer;
- bPlotIndOptionsSizer = new wxBoxSizer( wxVERTICAL );
-
- wxStaticBoxSizer* m_Gerber_OptionsBox;
- m_Gerber_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
-
- m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper file extensions"), wxDefaultPosition, wxDefaultSize, 0 );
- m_useGerberExtensions->SetToolTip( _("Use proper Gerber extensions - .GBL, .GTL, etc...") );
-
- m_Gerber_OptionsBox->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
-
- m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer\nfrom other layers"), wxDefaultPosition, wxDefaultSize, 0 );
- m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );
-
- m_Gerber_OptionsBox->Add( m_excludeEdgeLayerOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract mask from\nsilkscren"), wxDefaultPosition, wxDefaultSize, 0 );
- m_subtractMaskFromSilk->SetValue(true);
- m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
-
- m_Gerber_OptionsBox->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-
- m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary origin"), wxDefaultPosition, wxDefaultSize, 0 );
- m_Gerber_OptionsBox->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
-
- bPlotIndOptionsSizer->Add( m_Gerber_OptionsBox, 0, wxALL|wxEXPAND, 3 );
-
- wxStaticBoxSizer* m_HPGL_OptionsBox;
- m_HPGL_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
-
- wxBoxSizer* bSizer22;
- bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer* bSizer20;
- bSizer20 = new wxBoxSizer( wxVERTICAL );
-
- m_textPenSize = new wxStaticText( this, wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 );
- m_textPenSize->Wrap( -1 );
- bSizer20->Add( m_textPenSize, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-
- m_HPGLPenSizeOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- bSizer20->Add( m_HPGLPenSizeOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
- m_textPenOvr = new wxStaticText( this, wxID_ANY, _("Pen overlay"), wxDefaultPosition, wxDefaultSize, 0 );
- m_textPenOvr->Wrap( -1 );
- bSizer20->Add( m_textPenOvr, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_HPGLPenOverlayOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- m_HPGLPenOverlayOpt->SetToolTip( _("Set plot overlay for filling") );
-
- bSizer20->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
- bSizer22->Add( bSizer20, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizer21;
- bSizer21 = new wxBoxSizer( wxVERTICAL );
-
- m_textPenSpeed = new wxStaticText( this, wxID_ANY, _("Pen speed (cm/s):"), wxDefaultPosition, wxDefaultSize, 0 );
- m_textPenSpeed->Wrap( -1 );
- bSizer21->Add( m_textPenSpeed, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_HPGLPenSpeedOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- m_HPGLPenSpeedOpt->SetToolTip( _("Set pen speed in cm/s") );
-
- bSizer21->Add( m_HPGLPenSpeedOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
- bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );
-
- m_HPGL_OptionsBox->Add( bSizer22, 1, wxEXPAND, 5 );
-
- bPlotIndOptionsSizer->Add( m_HPGL_OptionsBox, 0, wxALL|wxEXPAND, 3 );
-
- wxStaticBoxSizer* m_PS_OptionsBox;
- m_PS_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
-
- wxBoxSizer* bSizer17;
- bSizer17 = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer* bSizer18;
- bSizer18 = new wxBoxSizer( wxVERTICAL );
-
- m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText7->Wrap( -1 );
- bSizer18->Add( m_staticText7, 0, wxTOP|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") );
-
- bSizer18->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
- bSizer17->Add( bSizer18, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizer19;
- bSizer19 = new wxBoxSizer( wxVERTICAL );
-
- m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText8->Wrap( -1 );
- bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
- bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );
-
- m_PS_OptionsBox->Add( bSizer17, 1, wxEXPAND, 5 );
-
- m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
- m_PS_OptionsBox->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );
-
- bPlotIndOptionsSizer->Add( m_PS_OptionsBox, 1, wxALL|wxEXPAND, 3 );
-
- bUpperSizer->Add( bPlotIndOptionsSizer, 0, 0, 5 );
-
- bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );
-
- wxBoxSizer* bSizerDirChoice;
- bSizerDirChoice = new wxBoxSizer( wxVERTICAL );
-
- m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextDir->Wrap( -1 );
- bSizerDirChoice->Add( m_staticTextDir, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- wxBoxSizer* bSizerDirNmae;
- bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );
-
- m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be relative or absolute.") );
-
- bSizerDirNmae->Add( m_outputDirectoryName, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
- m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
- bSizerDirNmae->Add( m_browseButton, 0, wxRIGHT|wxLEFT, 5 );
-
- bSizerDirChoice->Add( bSizerDirNmae, 0, wxRIGHT|wxEXPAND, 5 );
-
- bSizer12->Add( bSizerDirChoice, 0, wxEXPAND, 5 );
-
- m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText2->Wrap( -1 );
- bSizer12->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
- m_messagesBox->SetMinSize( wxSize( -1,100 ) );
-
- bSizer12->Add( m_messagesBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
- wxBoxSizer* bSizer191;
- bSizer191 = new wxBoxSizer( wxHORIZONTAL );
-
-
- bSizer191->Add( 0, 0, 1, wxEXPAND, 5 );
-
- m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
- m_plotButton->SetDefault();
- bSizer191->Add( m_plotButton, 0, wxALL, 5 );
-
- m_buttonSaveOpt = new wxButton( this, ID_SAVE_OPT_PLOT, _("Apply Settings"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer191->Add( m_buttonSaveOpt, 0, wxALL, 5 );
-
- m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer191->Add( m_buttonDrill, 0, wxALL, 5 );
-
- m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );
-
- bSizer12->Add( bSizer191, 0, wxEXPAND, 5 );
-
- bMainSizer->Add( bSizer12, 1, wxALL, 5 );
-
- this->SetSizer( bMainSizer );
- this->Layout();
- bMainSizer->Fit( this );
-
- // Connect Events
- this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );
- this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
- m_plotFormatOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
- m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
- m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
- m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
- m_buttonSaveOpt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), NULL, this );
- m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
- m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
-}
-
-DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
-{
- // Disconnect Events
- this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );
- this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
- m_plotFormatOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
- m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
- m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
- m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
- m_buttonSaveOpt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), NULL, this );
- m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
- m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
-
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Sep 8 2010)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_plot_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PLOT_BASE::DIALOG_PLOT_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,350 ), wxDefaultSize );
+
+ wxBoxSizer* bMainSizer;
+ bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ wxBoxSizer* bSizer12;
+ bSizer12 = new wxBoxSizer( wxVERTICAL );
+
+ wxBoxSizer* bSizer181;
+ bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+
+ wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") };
+ int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
+ m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_ROWS );
+ m_plotFormatOpt->SetSelection( 1 );
+ bSizer181->Add( m_plotFormatOpt, 1, wxEXPAND, 5 );
+
+ bSizer12->Add( bSizer181, 0, wxEXPAND, 5 );
+
+ wxBoxSizer* bUpperSizer;
+ bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ wxStaticBoxSizer* sbLayersSizer;
+ sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
+
+ m_CopperLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers") ), wxVERTICAL );
+
+ sbLayersSizer->Add( m_CopperLayersBoxSizer, 1, wxALL, 5 );
+
+ m_TechnicalLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Technical Layers") ), wxVERTICAL );
+
+ sbLayersSizer->Add( m_TechnicalLayersBoxSizer, 1, wxALL, 5 );
+
+ bUpperSizer->Add( sbLayersSizer, 1, wxALL, 3 );
+
+ wxBoxSizer* bPlotOptionsSizer;
+ bPlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBoxSizer* sbOptionsSizer;
+ sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
+
+ m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
+ sbOptionsSizer->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_plotPads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );
+
+ sbOptionsSizer->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+ sbOptionsSizer->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+ sbOptionsSizer->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_plotTextOther = new wxCheckBox( this, wxID_ANY, _("Plot other module texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );
+
+ sbOptionsSizer->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_plotInvisibleText = new wxCheckBox( this, wxID_ANY, _("Plot invisible texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );
+
+ sbOptionsSizer->Add( m_plotInvisibleText, 0, wxALL, 2 );
+
+ m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_plotNoViaOnMaskOpt->SetToolTip( _("Print/plot vias on mask layers. They are in this case not protected") );
+
+ sbOptionsSizer->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );
+
+ m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
+ sbOptionsSizer->Add( m_plotMirrorOpt, 0, wxALL, 2 );
+
+ wxBoxSizer* bSizer14;
+ bSizer14 = new wxBoxSizer( wxHORIZONTAL );
+
+ wxBoxSizer* bSizer15;
+ bSizer15 = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText11->Wrap( -1 );
+ bSizer15->Add( m_staticText11, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };
+ int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
+ m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );
+ m_drillShapeOpt->SetSelection( 0 );
+ bSizer15->Add( m_drillShapeOpt, 0, wxEXPAND, 5 );
+
+ m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText12->Wrap( -1 );
+ bSizer15->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };
+ int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
+ m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );
+ m_scaleOpt->SetSelection( 0 );
+ bSizer15->Add( m_scaleOpt, 0, wxEXPAND, 5 );
+
+ bSizer14->Add( bSizer15, 1, wxALL|wxEXPAND, 3 );
+
+ wxBoxSizer* bSizer16;
+ bSizer16 = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText13->Wrap( -1 );
+ bSizer16->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
+ int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
+ m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
+ m_plotModeOpt->SetSelection( 0 );
+ bSizer16->Add( m_plotModeOpt, 0, wxEXPAND, 5 );
+
+ m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_textDefaultPenSize->Wrap( -1 );
+ m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
+
+ bSizer16->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );
+
+ bSizer16->Add( m_linesWidth, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+ bSizer14->Add( bSizer16, 1, wxALL|wxEXPAND, 3 );
+
+ sbOptionsSizer->Add( bSizer14, 1, wxALL|wxEXPAND, 3 );
+
+ bPlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
+
+ bUpperSizer->Add( bPlotOptionsSizer, 1, 0, 5 );
+
+ wxBoxSizer* bPlotIndOptionsSizer;
+ bPlotIndOptionsSizer = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBoxSizer* m_Gerber_OptionsBox;
+ m_Gerber_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
+
+ m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper file extensions"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_useGerberExtensions->SetToolTip( _("Use proper Gerber extensions - .GBL, .GTL, etc...") );
+
+ m_Gerber_OptionsBox->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
+
+ m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer\nfrom other layers"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );
+
+ m_Gerber_OptionsBox->Add( m_excludeEdgeLayerOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract mask from\nsilkscren"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_subtractMaskFromSilk->SetValue(true);
+ m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
+
+ m_Gerber_OptionsBox->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+
+ m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary origin"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_Gerber_OptionsBox->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
+
+ bPlotIndOptionsSizer->Add( m_Gerber_OptionsBox, 0, wxALL|wxEXPAND, 3 );
+
+ wxStaticBoxSizer* m_HPGL_OptionsBox;
+ m_HPGL_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
+
+ wxBoxSizer* bSizer22;
+ bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+ wxBoxSizer* bSizer20;
+ bSizer20 = new wxBoxSizer( wxVERTICAL );
+
+ m_textPenSize = new wxStaticText( this, wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_textPenSize->Wrap( -1 );
+ bSizer20->Add( m_textPenSize, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+
+ m_HPGLPenSizeOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer20->Add( m_HPGLPenSizeOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+ m_textPenOvr = new wxStaticText( this, wxID_ANY, _("Pen overlay"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_textPenOvr->Wrap( -1 );
+ bSizer20->Add( m_textPenOvr, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_HPGLPenOverlayOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_HPGLPenOverlayOpt->SetToolTip( _("Set plot overlay for filling") );
+
+ bSizer20->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+ bSizer22->Add( bSizer20, 1, wxEXPAND, 5 );
+
+ wxBoxSizer* bSizer21;
+ bSizer21 = new wxBoxSizer( wxVERTICAL );
+
+ m_textPenSpeed = new wxStaticText( this, wxID_ANY, _("Pen speed (cm/s):"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_textPenSpeed->Wrap( -1 );
+ bSizer21->Add( m_textPenSpeed, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_HPGLPenSpeedOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_HPGLPenSpeedOpt->SetToolTip( _("Set pen speed in cm/s") );
+
+ bSizer21->Add( m_HPGLPenSpeedOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+ bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );
+
+ m_HPGL_OptionsBox->Add( bSizer22, 1, wxEXPAND, 5 );
+
+ bPlotIndOptionsSizer->Add( m_HPGL_OptionsBox, 0, wxALL|wxEXPAND, 3 );
+
+ wxStaticBoxSizer* m_PS_OptionsBox;
+ m_PS_OptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
+
+ wxBoxSizer* bSizer17;
+ bSizer17 = new wxBoxSizer( wxHORIZONTAL );
+
+ wxBoxSizer* bSizer18;
+ bSizer18 = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText7->Wrap( -1 );
+ bSizer18->Add( m_staticText7, 0, wxTOP|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") );
+
+ bSizer18->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+ bSizer17->Add( bSizer18, 1, wxEXPAND, 5 );
+
+ wxBoxSizer* bSizer19;
+ bSizer19 = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText8->Wrap( -1 );
+ bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+ bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );
+
+ m_PS_OptionsBox->Add( bSizer17, 1, wxEXPAND, 5 );
+
+ m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_PS_OptionsBox->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );
+
+ bPlotIndOptionsSizer->Add( m_PS_OptionsBox, 1, wxALL|wxEXPAND, 3 );
+
+ bUpperSizer->Add( bPlotIndOptionsSizer, 0, 0, 5 );
+
+ bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );
+
+ wxBoxSizer* bSizerDirChoice;
+ bSizerDirChoice = new wxBoxSizer( wxVERTICAL );
+
+ m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextDir->Wrap( -1 );
+ bSizerDirChoice->Add( m_staticTextDir, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ wxBoxSizer* bSizerDirNmae;
+ bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );
+
+ m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be relative or absolute.") );
+
+ bSizerDirNmae->Add( m_outputDirectoryName, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+ m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerDirNmae->Add( m_browseButton, 0, wxRIGHT|wxLEFT, 5 );
+
+ bSizerDirChoice->Add( bSizerDirNmae, 0, wxRIGHT|wxEXPAND, 5 );
+
+ bSizer12->Add( bSizerDirChoice, 0, wxEXPAND, 5 );
+
+ m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText2->Wrap( -1 );
+ bSizer12->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+ m_messagesBox->SetMinSize( wxSize( -1,100 ) );
+
+ bSizer12->Add( m_messagesBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+ wxBoxSizer* bSizer191;
+ bSizer191 = new wxBoxSizer( wxHORIZONTAL );
+
+
+ bSizer191->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_plotButton->SetDefault();
+ bSizer191->Add( m_plotButton, 0, wxALL, 5 );
+
+ m_buttonSaveOpt = new wxButton( this, ID_SAVE_OPT_PLOT, _("Apply Settings"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer191->Add( m_buttonSaveOpt, 0, wxALL, 5 );
+
+ m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer191->Add( m_buttonDrill, 0, wxALL, 5 );
+
+ m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );
+
+ bSizer12->Add( bSizer191, 0, wxEXPAND, 5 );
+
+ bMainSizer->Add( bSizer12, 1, wxALL, 5 );
+
+ this->SetSizer( bMainSizer );
+ this->Layout();
+ bMainSizer->Fit( this );
+
+ // Connect Events
+ this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );
+ this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
+ m_plotFormatOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
+ m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
+ m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
+ m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
+ m_buttonSaveOpt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), NULL, this );
+ m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
+ m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
+}
+
+DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
+{
+ // Disconnect Events
+ this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );
+ this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
+ m_plotFormatOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
+ m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
+ m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
+ m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
+ m_buttonSaveOpt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), NULL, this );
+ m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
+ m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
+
+}
diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp
index 3eb616aed9..2fe25fd898 100644
--- a/pcbnew/dialogs/dialog_plot_base.fbp
+++ b/pcbnew/dialogs/dialog_plot_base.fbp
@@ -1,3911 +1,2734 @@
-
-
-
-
-
+
+
+
+
+
+ C++
+ 1
+ source_name
+ 0
+ UTF-8
+ connect
+ dialog_plot_base
+ 1000
+ none
+ 1
+ Dialog_Plot_base
+
+ .
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+ 1
+ 1
+ impl_virtual
+
+
+
+ 0
+ wxID_ANY
+
+ -1,350
+ DIALOG_PLOT_BASE
+
+ -1,-1
+ wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
+
+ Plot
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+ OnCloseWindow
+
+
+
+
+
+ OnInitDialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bMainSizer
+ wxHORIZONTAL
+ none
+
+ 5
+ wxALL
+ 1
+
+
+ bSizer12
+ wxVERTICAL
+ none
+
+ 5
+ wxEXPAND
+ 0
+
+
+ bSizer181
+ wxHORIZONTAL
+ none
+
+ 5
+ wxEXPAND
+ 1
+
+
+ "HPGL" "Gerber" "Postscript" "Postscript A4" "DXF"
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Format
+ 1
+
+
+ m_plotFormatOpt
+ protected
+
+ 1
+
+ wxRA_SPECIFY_ROWS
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SetPlotFormat
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 0
+
+
+ bUpperSizer
+ wxHORIZONTAL
+ none
+
+ 3
+ wxALL
+ 1
+
+ wxID_ANY
+ Layers
+
+ sbLayersSizer
+ wxHORIZONTAL
+ none
+
+
+ 5
+ wxALL
+ 1
+
+ wxID_ANY
+ Copper Layers
+
+ m_CopperLayersBoxSizer
+ wxVERTICAL
+ protected
+
+
+
+
+ 5
+ wxALL
+ 1
+
+ wxID_ANY
+ Technical Layers
+
+ m_TechnicalLayersBoxSizer
+ wxVERTICAL
+ protected
+
+
+
+
+
+
+ 5
+
+ 1
+
+
+ bPlotOptionsSizer
+ wxVERTICAL
+ none
+
+ 3
+ wxALL|wxEXPAND
+ 0
+
+ wxID_ANY
+ Options
+
+ sbOptionsSizer
+ wxVERTICAL
+ none
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Plot sheet reference on all layers
+
+
+ m_plotSheetRef
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ ID_ALLOW_PRINT_PAD_ON_SILKSCREEN
+ Plot pads on silkscreen
+
+
+ m_plotPads_on_Silkscreen
+ protected
+
+
+
+
+ Enable/disable print/plot pads on silkscreen layers
When disable, pads are never potted on silkscreen layers
When enable, pads are potted only if they appear on silkscreen layers
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Plot module value on silkscreen
+
+
+ m_plotModuleValueOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ ID_PRINT_REF
+ Plot module reference on silkscreen
+
+
+ m_plotModuleRefOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Plot other module texts on silkscreen
+
+
+ m_plotTextOther
+ protected
+
+
+
+
+ Enable/disable print/plot module field texts on silkscreen layers
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxALL
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Plot invisible texts on silkscreen
+
+
+ m_plotInvisibleText
+ protected
+
+
+
+
+ Force print/plot module invisible texts on silkscreen layers
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxALL
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Do not tent vias
+
+
+ m_plotNoViaOnMaskOpt
+ protected
+
+
+
+
+ Print/plot vias on mask layers. They are in this case not protected
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxALL
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ ID_MIROR_OPT
+ Mirrored plot
+
+
+ m_plotMirrorOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ wxALL|wxEXPAND
+ 1
+
+
+ bSizer14
+ wxHORIZONTAL
+ none
+
+ 3
+ wxALL|wxEXPAND
+ 1
+
+
+ bSizer15
+ wxVERTICAL
+ none
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Drill marks:
+
+
+ m_staticText11
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 0
+
+
+ "None" "Small" "Actual size"
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+
+ m_drillShapeOpt
+ protected
+
+ 0
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Scaling:
+
+
+ m_staticText12
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 0
+
+
+ "Auto" "1:1" "3:2" "2:1" "3:1"
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+
+ m_scaleOpt
+ protected
+
+ 0
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+ OnSetScaleOpt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ wxALL|wxEXPAND
+ 1
+
+
+ bSizer16
+ wxVERTICAL
+ none
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Plot mode:
+
+
+ m_staticText13
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 0
+
+
+ "Line" "Filled" "Sketch"
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+
+ m_plotModeOpt
+ protected
+
+ 0
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Default linewidth
+
+
+ m_textDefaultPenSize
+ protected
+
+
+
+
+ Pen size used to draw items that have no pen size specified.
Used mainly to draw items in sketch mode.
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_linesWidth
+ protected
+
+
+
+
+ Line width for, e.g., sheet references.
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+ 0
+
+
+ bPlotIndOptionsSizer
+ wxVERTICAL
+ none
+
+ 3
+ wxALL|wxEXPAND
+ 0
+
+ wxID_ANY
+ Gerber Options
+
+ m_Gerber_OptionsBox
+ wxVERTICAL
+ none
+
+
+ 2
+ wxLEFT|wxRIGHT|wxTOP
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Use proper file extensions
+
+
+ m_useGerberExtensions
+ protected
+
+
+
+
+ Use proper Gerber extensions - .GBL, .GTL, etc...
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Exclude PCB edge layer
from other layers
+
+
+ m_excludeEdgeLayerOpt
+ protected
+
+
+
+
+ Exclude contents of the pcb edge layer from all other layers
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+ 1
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Subtract mask from
silkscren
+
+
+ m_subtractMaskFromSilk
+ protected
+
+
+
+
+ Remove silkscreen from areas without soldermask
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxALL
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Use auxiliary origin
+
+
+ m_useAuxOriginCheckBox
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ wxALL|wxEXPAND
+ 0
+
+ wxID_ANY
+ HPGL Options
+
+ m_HPGL_OptionsBox
+ wxVERTICAL
+ none
+
+
+ 5
+ wxEXPAND
+ 1
+
+
+ bSizer22
+ wxHORIZONTAL
+ none
+
+ 5
+ wxEXPAND
+ 1
+
+
+ bSizer20
+ wxVERTICAL
+ none
+
+ 5
+ wxLEFT|wxRIGHT|wxTOP
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Pen size
+
+
+ m_textPenSize
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_HPGLPenSizeOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Pen overlay
+
+
+ m_textPenOvr
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_HPGLPenOverlayOpt
+ protected
+
+
+
+
+ Set plot overlay for filling
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 1
+
+
+ bSizer21
+ wxVERTICAL
+ none
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Pen speed (cm/s):
+
+
+ m_textPenSpeed
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_HPGLPenSpeedOpt
+ protected
+
+
+
+
+ Set pen speed in cm/s
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+ wxALL|wxEXPAND
+ 1
+
+ wxID_ANY
+ Postscript Options
+
+ m_PS_OptionsBox
+ wxVERTICAL
+ none
+
+
+ 5
+ wxEXPAND
+ 1
+
+
+ bSizer17
+ wxHORIZONTAL
+ none
+
+ 5
+ wxEXPAND
+ 1
+
+
+ bSizer18
+ wxVERTICAL
+ none
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ X scale:
+
+
+ m_staticText7
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_fineAdjustXscaleOpt
+ protected
+
+
+
+
+ Set X scale adjust for exact scale plotting
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 1
+
+
+ bSizer19
+ wxVERTICAL
+ none
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Y scale:
+
+
+ m_staticText8
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_fineAdjustYscaleOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ wxALL
+ 0
+
+
+ 0
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Negative plot
+
+
+ m_plotPSNegativeOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 0
+
+
+ bSizerDirChoice
+ wxVERTICAL
+ none
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Output directory:
+
+
+ m_staticTextDir
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxRIGHT|wxEXPAND
+ 0
+
+
+ bSizerDirNmae
+ wxHORIZONTAL
+ none
+
+ 5
+ wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT
+ 1
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+
+ m_outputDirectoryName
+ protected
+
+
+
+
+ Target directory for plot files. Can be relative or absolute.
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 0
+ 1
+
+
+ 0
+ wxID_ANY
+ Browse...
+
+
+ m_browseButton
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ OnOutputDirectoryBrowseClicked
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxTOP|wxRIGHT|wxLEFT
+ 0
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Messages:
+
+
+ m_staticText2
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND
+ 1
+
+
+
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+
+ 0
+ -1,100
+ m_messagesBox
+ protected
+
+
+ wxTE_MULTILINE
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxEXPAND
+ 0
+
+
+ bSizer191
+ wxHORIZONTAL
+ none
+
+ 5
+ wxEXPAND
+ 1
+
+ 0
+ protected
+ 0
+
+
+
+ 5
+ wxALL
+ 0
+
+
+
+ 1
+ 1
+ 1
+
+
+ 0
+ wxID_ANY
+ Plot
+
+
+ m_plotButton
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ Plot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxALL
+ 0
+
+
+
+ 1
+ 0
+ 1
+
+
+ 0
+ ID_SAVE_OPT_PLOT
+ Apply Settings
+
+
+ m_buttonSaveOpt
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ applyPlotSettings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxALL
+ 0
+
+
+
+ 1
+ 0
+ 1
+
+
+ 0
+ ID_CREATE_DRILL_FILE
+ Generate Drill File
+
+
+ m_buttonDrill
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ CreateDrillFile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ wxALL
+ 0
+
+
+
+ 1
+ 0
+ 1
+
+
+ 0
+ wxID_CANCEL
+ Close
+
+
+ m_buttonQuit
+ protected
+
+
+
+
+
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ OnQuit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h
index f1f3ad453f..bfbaf00010 100644
--- a/pcbnew/dialogs/dialog_plot_base.h
+++ b/pcbnew/dialogs/dialog_plot_base.h
@@ -1,111 +1,111 @@
-///////////////////////////////////////////////////////////////////////////
-// 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
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// 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
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// 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__
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index b5d3190133..6056c0daff 100644
--- a/pcbnew/pcbplot.cpp
+++ b/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;