Pcbnew - plot dialog: fix Bug #1417435 (Gerber(and some others) plot mode is...

Pcbnew - plot dialog: fix Bug #1417435 (Gerber(and some others)  plot mode is fixed as”sketch” instead of "filled" )

pcbnew/dialogs/dialog_plot.cpp

@@ -193,7 +193,7 @@ void DIALOG_PLOT::Init_Dialog()
     m_scaleOpt->SetSelection( m_plotOpts.GetScaleSelection() );
 
     // Plot mode
-    m_plotModeOpt->SetSelection( m_plotOpts.GetPlotMode() == SKETCH ? 1 : 0 );
+    setPlotModeChoiceSelection( m_plotOpts.GetPlotMode() );
 
     // Plot mirror option
     m_plotMirrorOpt->SetValue( m_plotOpts.GetMirror() );
@@ -335,7 +335,7 @@ void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
 }
 
 
-PlotFormat DIALOG_PLOT::GetPlotFormat()
+PlotFormat DIALOG_PLOT::getPlotFormat()
 {
     // plot format id's are ordered like displayed in m_plotFormatOpt
     static const PlotFormat plotFmt[] =
@@ -356,13 +356,13 @@ PlotFormat DIALOG_PLOT::GetPlotFormat()
 // and clear also some optional values
 void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
 {
-    switch( GetPlotFormat() )
+    switch( getPlotFormat() )
     {
     case PLOT_FORMAT_PDF:
     case PLOT_FORMAT_SVG:
         m_drillShapeOpt->Enable( true );
         m_plotModeOpt->Enable( false );
-        m_plotModeOpt->SetSelection( 1 );
+        setPlotModeChoiceSelection( FILLED );
         m_plotMirrorOpt->Enable( true );
         m_useAuxOriginCheckBox->Enable( false );
         m_useAuxOriginCheckBox->SetValue( false );
@@ -422,7 +422,7 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
         m_drillShapeOpt->Enable( false );
         m_drillShapeOpt->SetSelection( 0 );
         m_plotModeOpt->Enable( false );
-        m_plotModeOpt->SetSelection( 1 );
+        setPlotModeChoiceSelection( FILLED );
         m_plotMirrorOpt->Enable( false );
         m_plotMirrorOpt->SetValue( false );
         m_useAuxOriginCheckBox->Enable( true );
@@ -669,7 +669,7 @@ void DIALOG_PLOT::applyPlotSettings()
     ConfigBaseWriteDouble( m_config, CONFIG_PS_FINEWIDTH_ADJ,
                            (double)m_PSWidthAdjust / IU_PER_MM );
 
-    tempOptions.SetFormat( GetPlotFormat() );
+    tempOptions.SetFormat( getPlotFormat() );
 
     tempOptions.SetUseGerberExtensions( m_useGerberExtensions->GetValue() );
     tempOptions.SetUseGerberAttributes( m_useGerberAttributes->GetValue() );

pcbnew/dialogs/dialog_plot.h

@@ -57,6 +57,7 @@ private:
 
     PCB_PLOT_PARAMS     m_plotOpts;
 
+    // Event called functions
     void        Init_Dialog();
     void        Plot( wxCommandEvent& event );
     void        OnQuit( wxCommandEvent& event );
@@ -66,7 +67,14 @@ private:
     void        OnPopUpLayers( wxCommandEvent& event );
     void        SetPlotFormat( wxCommandEvent& event );
     void        OnSetScaleOpt( wxCommandEvent& event );
-    void        applyPlotSettings();
     void        CreateDrillFile( wxCommandEvent& event );
-    PlotFormat  GetPlotFormat();
+
+    // orther functions
+    void        applyPlotSettings();
+    PlotFormat  getPlotFormat();
+
+    void        setPlotModeChoiceSelection( EDA_DRAW_MODE_T aPlotMode )
+    {
+        m_plotModeOpt->SetSelection( aPlotMode == SKETCH ? 1 : 0 );
+    }
 };