Pcbnew: remove not used old files. Minor enhancements

pcbnew/modedit.cpp

@@ -804,6 +804,7 @@ void WinEDA_ModuleEditFrame::Transform( MODULE* module, int transform )
                 /* Invert local coordinates */
                 NEGATE( edgemod->m_Start0.y );
                 NEGATE( edgemod->m_End0.y );
+                NEGATE( edgemod->m_Angle );
                 break;
 
             case TYPE_TEXTE_MODULE:

pcbnew/pcbnew_config.cpp

@@ -12,6 +12,7 @@
 #include "wxPcbStruct.h"
 #include "class_board_design_settings.h"
 #include "pcbplot.h"
+#include "plot_common.h"
 #include "worksheet.h"
 #include "pcbnew_id.h"
 #include "hotkeys.h"
@@ -409,6 +410,15 @@ PARAM_CFG_ARRAY& WinEDA_PcbFrame::GetConfigurationSettings()
                                                     &g_Show_Module_Ratsnest, TRUE ) );
     m_configSettings.push_back( new PARAM_CFG_BOOL( true, wxT( "TwoSegT" ),
                                                     &g_TwoSegmentTrackBuild, TRUE ) );
+    // Plot options:
+    m_configSettings.push_back( new PARAM_CFG_INT( true, wxT( "PlotOutputFormat" ),
+                                                    &g_pcb_plot_options.PlotFormat, PLOT_FORMAT_GERBER ) );
+    m_configSettings.push_back( new PARAM_CFG_BOOL( true, wxT( "EdgeLayerGerberOpt" ),
+                                                    &g_pcb_plot_options.Exclude_Edges_Pcb, true ) );
+    m_configSettings.push_back( new PARAM_CFG_BOOL( true, wxT( "SubstractMasktoSilk" ),
+                                                    &g_pcb_plot_options.m_SubtractMaskFromSilk, false ) );
+    m_configSettings.push_back( new PARAM_CFG_BOOL( true, wxT( "PlotPadsOnSilkscreen" ),
+                                                    &g_pcb_plot_options.PlotPadsOnSilkLayer, false ) );
 
     return m_configSettings;
 }

pcbnew/pcbplot.cpp

@@ -21,12 +21,9 @@
 #define PLOT_DEFAULT_MARGE 300      // mils
 
 /* Keywords to r/w options in m_Config */
-#define OPTKEY_EDGELAYER_GERBER   wxT( "EdgeLayerGerberOpt" )
 #define OPTKEY_GERBER_EXTENSIONS  wxT( "GerberOptUseLayersExt" )
 #define OPTKEY_XFINESCALE_ADJ     wxT( "PlotXFineScaleAdj" )
 #define OPTKEY_YFINESCALE_ADJ     wxT( "PlotYFineScaleAdj" )
-#define OPTKEY_PADS_ON_SILKSCREEN wxT( "PlotPadsOnSilkscreen" )
-#define OPTKEY_OUTPUT_FORMAT      wxT( "PlotOutputFormat" )
 
 // Define min and max reasonable values for print scale
 #define MIN_SCALE 0.01
@@ -35,7 +32,7 @@
 // PCB_Plot_Options constructor: set the default values for plot options:
 PCB_Plot_Options::PCB_Plot_Options()
 {
-    subtractMaskFromSilk = true;
+    m_SubtractMaskFromSilk = false;
     Sel_Texte_Reference = true;
     Sel_Texte_Valeur    = true;
     Sel_Texte_Divers    = true;
@@ -145,8 +142,6 @@ void DIALOG_PLOT::Init_Dialog()
 
     BOARD*   board = m_Parent->GetBoard();
 
-    m_Config->Read( OPTKEY_OUTPUT_FORMAT, &g_pcb_plot_options.PlotFormat );
-    m_Config->Read( OPTKEY_EDGELAYER_GERBER, &g_pcb_plot_options.Exclude_Edges_Pcb );
     m_Config->Read( OPTKEY_XFINESCALE_ADJ, &m_XScaleAdjust );
     m_Config->Read( OPTKEY_YFINESCALE_ADJ, &m_YScaleAdjust );
 
@@ -263,9 +258,6 @@ void DIALOG_PLOT::Init_Dialog()
     }
 
     // Option to plot pads on silkscreen layers or all layers
-    m_Config->Read( OPTKEY_PADS_ON_SILKSCREEN,
-                    &g_pcb_plot_options.PlotPadsOnSilkLayer );
-
     m_Plot_Pads_on_Silkscreen->SetValue( g_pcb_plot_options.PlotPadsOnSilkLayer );
 
     // Options to plot texts on footprints
@@ -497,17 +489,12 @@ void DIALOG_PLOT::SaveOptPlot( wxCommandEvent& event )
     msg = m_FineAdjustYscaleOpt->GetValue();
     msg.ToDouble( &m_YScaleAdjust );
 
-    m_Config->Write( OPTKEY_EDGELAYER_GERBER,
-                     g_pcb_plot_options.Exclude_Edges_Pcb );
     m_Config->Write( OPTKEY_GERBER_EXTENSIONS,
                     m_Use_Gerber_Extensions->GetValue() );
     m_Config->Write( OPTKEY_XFINESCALE_ADJ, m_XScaleAdjust );
     m_Config->Write( OPTKEY_YFINESCALE_ADJ, m_YScaleAdjust );
-    m_Config->Write( OPTKEY_PADS_ON_SILKSCREEN,
-                     g_pcb_plot_options.PlotPadsOnSilkLayer );
 
-    int formatNdx = m_PlotFormatOpt->GetSelection();
-    m_Config->Write( OPTKEY_OUTPUT_FORMAT, formatNdx );
+    g_pcb_plot_options.PlotFormat = m_PlotFormatOpt->GetSelection();
 
     wxString layerKey;
     for( int layer = 0;  layer<NB_LAYERS;  ++layer )

pcbnew/pcbplot.h

@@ -49,6 +49,7 @@ public:
     bool        Sel_Texte_Divers;
     bool        Sel_Texte_Invisible;
     bool        PlotPadsOnSilkLayer; /* allows pads on silkscreen */
+    bool        m_SubtractMaskFromSilk;
 
     /* id for plot format (see enum PlotFormat in plot_common.h) */
     int PlotFormat;
@@ -66,14 +67,13 @@ public:
 
 private:
     wxString       outputDirectory;
-    bool           subtractMaskFromSilk;
 
 public:
     PCB_Plot_Options();
     void SetOutputDirectory( wxString aDir ) { outputDirectory = aDir; };
     wxString GetOutputDirectory() { return outputDirectory; };
-    void SetSubtractMaskFromSilk( bool aSubtract ) { subtractMaskFromSilk = aSubtract; };
-    bool GetSubtractMaskFromSilk() { return subtractMaskFromSilk; };
+    void SetSubtractMaskFromSilk( bool aSubtract ) { m_SubtractMaskFromSilk = aSubtract; };
+    bool GetSubtractMaskFromSilk() { return m_SubtractMaskFromSilk; };
 };
 
 extern PCB_Plot_Options g_pcb_plot_options;