diff --git a/common/jobs/job_export_pcb_plot.h b/common/jobs/job_export_pcb_plot.h index 286a94c9f8..dc73e5ed8c 100644 --- a/common/jobs/job_export_pcb_plot.h +++ b/common/jobs/job_export_pcb_plot.h @@ -50,6 +50,7 @@ public: wxString m_filename; wxString m_colorTheme; wxString m_drawingSheet; + wxString m_variant; /** * Common Options diff --git a/eeschema/dialogs/dialog_plot_schematic_base.cpp b/eeschema/dialogs/dialog_plot_schematic_base.cpp index e49b311b5b..5e3b2f657a 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_base.cpp @@ -19,41 +19,35 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - wxFlexGridSizer* fgSizerTop; - fgSizerTop = new wxFlexGridSizer( 0, 2, 5, 0 ); - fgSizerTop->AddGrowableCol( 1 ); - fgSizerTop->SetFlexibleDirection( wxBOTH ); - fgSizerTop->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_variantLabel = new wxStaticText( this, wxID_ANY, _("Design variant:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_variantLabel->Wrap( -1 ); - fgSizerTop->Add( m_variantLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - wxArrayString m_variantChoiceCtrlChoices; - m_variantChoiceCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_variantChoiceCtrlChoices, 0 ); - m_variantChoiceCtrl->SetSelection( 0 ); - fgSizerTop->Add( m_variantChoiceCtrl, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + wxBoxSizer* bOutputDir; + bOutputDir = new wxBoxSizer( wxHORIZONTAL ); m_outputPathLabel = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 ); m_outputPathLabel->Wrap( -1 ); - fgSizerTop->Add( m_outputPathLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - wxBoxSizer* bSizerDir; - bSizerDir = new wxBoxSizer( wxHORIZONTAL ); + bOutputDir->Add( m_outputPathLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_outputPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_outputPath->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the schematic main file location.") ); - bSizerDir->Add( m_outputPath, 1, wxEXPAND|wxLEFT, 5 ); + bOutputDir->Add( m_outputPath, 1, wxEXPAND|wxLEFT, 5 ); m_browseButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizerDir->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bOutputDir->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - fgSizerTop->Add( bSizerDir, 0, wxEXPAND, 5 ); + bOutputDir->Add( 20, 0, 0, 0, 5 ); + + m_variantLabel = new wxStaticText( this, wxID_ANY, _("Design variant:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_variantLabel->Wrap( -1 ); + bOutputDir->Add( m_variantLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + + wxArrayString m_variantChoiceCtrlChoices; + m_variantChoiceCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_variantChoiceCtrlChoices, 0 ); + m_variantChoiceCtrl->SetSelection( 0 ); + bOutputDir->Add( m_variantChoiceCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - bMainSizer->Add( fgSizerTop, 0, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( bOutputDir, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_optionsSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/eeschema/dialogs/dialog_plot_schematic_base.fbp b/eeschema/dialogs/dialog_plot_schematic_base.fbp index 3394f1bc68..47ffe525f0 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.fbp +++ b/eeschema/dialogs/dialog_plot_schematic_base.fbp @@ -67,147 +67,13 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 - - 2 - wxBOTH - 1 - - 0 + - fgSizerTop - wxFLEX_GROWMODE_SPECIFIED + bOutputDir + wxHORIZONTAL none - 0 - 5 - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Design variant: - 0 - - 0 - - - 0 - - 1 - m_variantLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_variantChoiceCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - 5 wxALIGN_CENTER_VERTICAL|wxLEFT @@ -270,155 +136,281 @@ -1 + + 5 + wxEXPAND|wxLEFT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_outputPath + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Target directory for plot files. Can be absolute or relative to the schematic main file location. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Browse + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_browseButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onOutputDirectoryBrowseClicked + + 5 - wxEXPAND + 0 - + + 0 + protected + 20 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Design variant: + 0 + + 0 + + + 0 - bSizerDir - wxHORIZONTAL - none - - 5 - wxEXPAND|wxLEFT - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_outputPath - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Target directory for plot files. Can be absolute or relative to the schematic main file location. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Browse - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_browseButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onOutputDirectoryBrowseClicked - - + 1 + m_variantLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_variantChoiceCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + diff --git a/eeschema/dialogs/dialog_plot_schematic_base.h b/eeschema/dialogs/dialog_plot_schematic_base.h index a201a4e00c..633c014515 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.h +++ b/eeschema/dialogs/dialog_plot_schematic_base.h @@ -20,13 +20,13 @@ class WX_HTML_REPORT_PANEL; #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -45,11 +45,11 @@ class DIALOG_PLOT_SCHEMATIC_BASE : public DIALOG_SHIM private: protected: - wxStaticText* m_variantLabel; - wxChoice* m_variantChoiceCtrl; wxStaticText* m_outputPathLabel; wxTextCtrl* m_outputPath; STD_BITMAP_BUTTON* m_browseButton; + wxStaticText* m_variantLabel; + wxChoice* m_variantChoiceCtrl; wxBoxSizer* m_optionsSizer; wxRadioBox* m_plotFormatOpt; wxStaticText* m_staticText4; diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index f31b124f80..36f95b85de 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -149,6 +149,9 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aEditFrame, wxWindow* aParent, JOB_EXP // non-job versions. m_hash_key = TO_UTF8( GetTitle() ); + m_variantChoiceCtrl->Append( board->GetVariantNamesForUI() ); + m_variantChoiceCtrl->SetSelection( 0 ); + int order = 0; wxArrayInt plotAllLayersOrder; wxArrayString plotAllLayersChoicesStrings; @@ -281,6 +284,30 @@ bool DIALOG_PLOT::TransferDataToWindow() // Could devote a PlotOrder() function in place of UIOrder(). m_layerList = board->GetEnabledLayers().UIOrder(); + // Select the current board variant in the variant choice + if( m_job ) + { + if( !m_job->m_variant.IsEmpty() ) + { + int idx = m_variantChoiceCtrl->FindString( m_job->m_variant ); + + if( idx != wxNOT_FOUND ) + m_variantChoiceCtrl->SetSelection( idx ); + } + } + else + { + wxString currentVariant = board->GetCurrentVariant(); + + if( !currentVariant.IsEmpty() ) + { + int idx = m_variantChoiceCtrl->FindString( currentVariant ); + + if( idx != wxNOT_FOUND ) + m_variantChoiceCtrl->SetSelection( idx ); + } + } + if( !m_job && !projectFile.m_PcbLastPath[ LAST_PATH_PLOT ].IsEmpty() ) m_plotOpts.SetOutputDirectory( projectFile.m_PcbLastPath[ LAST_PATH_PLOT ] ); @@ -520,6 +547,8 @@ void DIALOG_PLOT::transferPlotParamsToJob() // this exists outside plot opts because its usually globally saved m_job->m_checkZonesBeforePlot = m_zoneFillCheck->GetValue(); + + m_job->m_variant = getSelectedVariant(); } @@ -570,6 +599,18 @@ void DIALOG_PLOT::reInitDialog() } +wxString DIALOG_PLOT::getSelectedVariant() const +{ + wxString variant; + int selection = m_variantChoiceCtrl->GetSelection(); + + if( ( selection != 0 ) && ( selection != wxNOT_FOUND ) ) + variant = m_variantChoiceCtrl->GetString( selection ); + + return variant; +} + + void DIALOG_PLOT::arrangeAllLayersList( const LSEQ& aSeq ) { auto findLayer = @@ -1246,6 +1287,9 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) // Save the current plot options in the board m_editFrame->SetPlotSettings( m_plotOpts ); + wxString oldVariant = board->GetCurrentVariant(); + board->SetCurrentVariant( getSelectedVariant() ); + PCB_PLOTTER pcbPlotter( m_editFrame->GetBoard(), &reporter, m_plotOpts ); LSEQ layersToPlot = m_plotOpts.GetLayerSelection().UIOrder(); @@ -1267,6 +1311,8 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) } pcbPlotter.Plot( outputDir.GetPath(), layersToPlot, commonLayers, m_useGerberExtensions->GetValue() ); + + board->SetCurrentVariant( oldVariant ); } } diff --git a/pcbnew/dialogs/dialog_plot.h b/pcbnew/dialogs/dialog_plot.h index a76c9cf30c..c23afebeb7 100644 --- a/pcbnew/dialogs/dialog_plot.h +++ b/pcbnew/dialogs/dialog_plot.h @@ -72,6 +72,7 @@ private: void reInitDialog(); // initialization after calling drill dialog void applyPlotSettings(); PLOT_FORMAT getPlotFormat(); + wxString getSelectedVariant() const; void arrangeAllLayersList( const LSEQ& aSeq ); void transferPlotParamsToJob(); diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 7d9ec89c56..70b1a7b5d0 100644 --- a/pcbnew/dialogs/dialog_plot_base.cpp +++ b/pcbnew/dialogs/dialog_plot_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -19,22 +19,52 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_MainSizer = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bupperSizer; - bupperSizer = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizerTop; + fgSizerTop = new wxFlexGridSizer( 0, 2, 5, 0 ); + fgSizerTop->AddGrowableCol( 1 ); + fgSizerTop->SetFlexibleDirection( wxBOTH ); + fgSizerTop->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + wxBoxSizer* bVariantSizer; + bVariantSizer = new wxBoxSizer( wxHORIZONTAL ); m_staticTextPlotFmt = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPlotFmt->Wrap( -1 ); - bupperSizer->Add( m_staticTextPlotFmt, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bVariantSizer->Add( m_staticTextPlotFmt, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + fgSizerTop->Add( bVariantSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + wxBoxSizer* bFormatSizer; + bFormatSizer = new wxBoxSizer( wxHORIZONTAL ); wxString m_plotFormatOptChoices[] = { _("Gerber"), _("Postscript"), _("SVG"), _("DXF"), _("PDF") }; int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString ); m_plotFormatOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 0 ); m_plotFormatOpt->SetSelection( 0 ); - bupperSizer->Add( m_plotFormatOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 28 ); + bFormatSizer->Add( m_plotFormatOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 28 ); + + + bFormatSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_variantLabel = new wxStaticText( this, wxID_ANY, _("Design variant:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_variantLabel->Wrap( -1 ); + bFormatSizer->Add( m_variantLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + wxArrayString m_variantChoiceCtrlChoices; + m_variantChoiceCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_variantChoiceCtrlChoices, 0 ); + m_variantChoiceCtrl->SetSelection( 0 ); + bFormatSizer->Add( m_variantChoiceCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + + + fgSizerTop->Add( bFormatSizer, 0, wxEXPAND, 5 ); m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDir->Wrap( -1 ); - bupperSizer->Add( m_staticTextDir, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTop->Add( m_staticTextDir, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + wxBoxSizer* bupperSizer; + bupperSizer = new wxBoxSizer( wxHORIZONTAL ); m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") ); @@ -53,7 +83,10 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr bupperSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT, 5 ); - m_MainSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerTop->Add( bupperSizer, 0, wxEXPAND, 5 ); + + + m_MainSizer->Add( fgSizerTop, 0, wxALL|wxEXPAND, 5 ); bmiddleSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index 519a280ce9..1200e00c6e 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -67,146 +67,312 @@ protected 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxALL|wxEXPAND 0 - + + 2 + wxBOTH + 1 + + 0 - bupperSizer - wxHORIZONTAL + fgSizerTop + wxFLEX_GROWMODE_SPECIFIED none - + 0 + 5 + 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Plot format: - 0 - - 0 - - - 0 + - 1 - m_staticTextPlotFmt - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 + bVariantSizer + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Plot format: + 0 + + 0 + + + 0 + + 1 + m_staticTextPlotFmt + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + - - 28 - wxALIGN_CENTER_VERTICAL|wxRIGHT + + 5 + wxEXPAND 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Gerber" "Postscript" "SVG" "DXF" "PDF" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + - 1 - m_plotFormatOpt - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - SetPlotFormat + bFormatSizer + wxHORIZONTAL + none + + 28 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Gerber" "Postscript" "SVG" "DXF" "PDF" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_plotFormatOpt + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + SetPlotFormat + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Design variant: + 0 + + 0 + + + 0 + + 1 + m_variantLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_variantChoiceCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + - + 5 wxALL|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -266,227 +432,238 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 + wxEXPAND + 0 + - 1 - m_outputDirectoryName - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Target directory for plot files. Can be absolute or relative to the board file location. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Browse - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_browseButton - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onOutputDirectoryBrowseClicked - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - OpenDir - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_openDirButton - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Open output directory - - wxFILTER_NONE - wxDefaultValidator - - - - - onOpenOutputDirectory - - - - 5 - wxEXPAND|wxRIGHT - 0 - - 0 - protected - 0 + bupperSizer + wxHORIZONTAL + none + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_outputDirectoryName + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Target directory for plot files. Can be absolute or relative to the board file location. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Browse + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_browseButton + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onOutputDirectoryBrowseClicked + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + OpenDir + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_openDirButton + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Open output directory + + wxFILTER_NONE + wxDefaultValidator + + + + + onOpenOutputDirectory + + + + 5 + wxEXPAND|wxRIGHT + 0 + + 0 + protected + 0 + + diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h index 0c052d8d27..420ed8fb2d 100644 --- a/pcbnew/dialogs/dialog_plot_base.h +++ b/pcbnew/dialogs/dialog_plot_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -21,6 +21,7 @@ class WX_HTML_REPORT_PANEL; #include #include #include +#include #include #include #include @@ -28,7 +29,6 @@ class WX_HTML_REPORT_PANEL; #include #include #include -#include #include #include #include @@ -56,6 +56,8 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM wxBoxSizer* m_MainSizer; wxStaticText* m_staticTextPlotFmt; wxChoice* m_plotFormatOpt; + wxStaticText* m_variantLabel; + wxChoice* m_variantChoiceCtrl; wxStaticText* m_staticTextDir; wxTextCtrl* m_outputDirectoryName; STD_BITMAP_BUTTON* m_browseButton;