Push a few missed project settings out of the frame

Fixes https://gitlab.com/kicad/code/kicad/-/issues/4823

eeschema/dialogs/dialog_netlist.cpp

@@ -260,7 +260,9 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
 {
     m_Parent = parent;
 
-    m_DefaultNetFmtName = m_Parent->GetNetListFormatName();
+    SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
+
+    m_DefaultNetFmtName = settings.m_NetFormatName;
 
     for( NETLIST_PAGE_DIALOG*& page : m_PanelNetType)
         page = NULL;
@@ -309,10 +311,12 @@ void NETLIST_DIALOG::InstallPageSpice()
     NETLIST_PAGE_DIALOG* page = m_PanelNetType[PANELSPICE] =
                     new NETLIST_PAGE_DIALOG( m_NoteBook, wxT( "Spice" ), NET_TYPE_SPICE );
 
+    SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
+
     page->m_AdjustPassiveValues = new wxCheckBox( page, ID_USE_NETCODE_AS_NETNAME,
                                                   _( "Reformat passive symbol values" ) );
     page->m_AdjustPassiveValues->SetToolTip( _( "Reformat passive symbol values e.g. 1M -> 1Meg" ) );
-    page->m_AdjustPassiveValues->SetValue( m_Parent->GetSpiceAjustPassiveValues() );
+    page->m_AdjustPassiveValues->SetValue( settings.m_SpiceAdjustPassiveValues );
     page->m_LeftBoxSizer->Add( page->m_AdjustPassiveValues, 0, wxGROW | wxBOTTOM | wxRIGHT, 5 );
 }
 
@@ -390,8 +394,10 @@ void NETLIST_DIALOG::SelectDefaultNetlistType( wxCommandEvent& event )
     if( currPage == NULL )
         return;
 
-    m_DefaultNetFmtName = currPage->GetPageNetFmtName();
+    SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
-    m_Parent->SetNetListFormatName( m_DefaultNetFmtName );
+
+    m_DefaultNetFmtName      = currPage->GetPageNetFmtName();
+    settings.m_NetFormatName = m_DefaultNetFmtName;
     currPage->m_IsCurrentFormat->SetValue( true );
 }
 
@@ -411,16 +417,18 @@ void NETLIST_DIALOG::NetlistUpdateOpt()
 {
     bool adjust = m_PanelNetType[ PANELSPICE ]->m_AdjustPassiveValues->IsChecked();
 
-    m_Parent->SetSpiceAdjustPassiveValues( adjust );
+    SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
-    m_Parent->SetNetListFormatName( wxEmptyString );
 
-    for( NETLIST_PAGE_DIALOG*& page : m_PanelNetType)
+    settings.m_SpiceAdjustPassiveValues = adjust;
+    settings.m_NetFormatName            = wxEmptyString;
+
+    for( NETLIST_PAGE_DIALOG*& page : m_PanelNetType )
     {
-        if( page == NULL )
+        if( page == nullptr )
             break;
 
-        if( page->m_IsCurrentFormat->GetValue() == true )
+        if( page->m_IsCurrentFormat->GetValue() )
-            m_Parent->SetNetListFormatName( page->GetPageNetFmtName() );
+            settings.m_NetFormatName = page->GetPageNetFmtName();
     }
 }
 
@@ -711,12 +719,14 @@ int InvokeDialogNetList( SCH_EDIT_FRAME* aCaller )
 {
     NETLIST_DIALOG dlg( aCaller );
 
-    wxString curr_default_netformat = aCaller->GetNetListFormatName();
+    SCHEMATIC_SETTINGS& settings = aCaller->Schematic().Settings();
+
+    wxString curr_default_netformat = settings.m_NetFormatName;
 
     int ret = dlg.ShowModal();
 
     // Update the default netlist and store it in prj config if it was explicitely changed.
-    aCaller->SetNetListFormatName( dlg.m_DefaultNetFmtName );   // can have temporary changed
+    settings.m_NetFormatName = dlg.m_DefaultNetFmtName; // can have temporary changed
 
     if( curr_default_netformat != dlg.m_DefaultNetFmtName )
         aCaller->SaveProjectSettings();

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -127,7 +127,8 @@ void DIALOG_PLOT_SCHEMATIC::initDlg()
     m_penWidth.SetValue( m_HPGLPenSize );
 
     // Plot directory
-    wxString path = m_parent->GetPlotDirectoryName();
+    SCHEMATIC_SETTINGS& settings = m_parent->Schematic().Settings();
+    wxString            path     = settings.m_PlotDirectoryName;
 #ifdef __WINDOWS__
     path.Replace( '/', '\\' );
 #endif
@@ -290,10 +291,12 @@ void DIALOG_PLOT_SCHEMATIC::getPlotOptions( RENDER_SETTINGS* aSettings )
     wxString path = m_outputDirectoryName->GetValue();
     path.Replace( '\\', '/' );
 
-    if(  m_parent->GetPlotDirectoryName() != path )
+    SCHEMATIC_SETTINGS& settings = m_parent->Schematic().Settings();
+
+    if( settings.m_PlotDirectoryName != path )
         m_configChanged = true;
 
-    m_parent->SetPlotDirectoryName( path );
+    settings.m_PlotDirectoryName = path;
 }
 
 

eeschema/sch_edit_frame.cpp

@@ -219,8 +219,6 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
 
     m_findReplaceDialog = nullptr;
 
-    SetSpiceAdjustPassiveValues( false );
-
     // Give an icon
     wxIcon icon;
     icon.CopyFromBitmap( KiBitmap( icon_eeschema_xpm ) );

eeschema/sch_edit_frame.h

@@ -134,12 +134,6 @@ private:
 
     DIALOG_SCH_FIND*        m_findReplaceDialog;
 
-    wxString                m_plotDirectoryName;
-    wxString                m_netListFormat;
-
-    /// Use netcodes (net number) as net names when generating spice net lists.
-    bool                    m_spiceAjustPassiveValues;
-
     static PINSHEETLABEL_SHAPE m_lastSheetPinType;    ///< Last sheet pin type.
 
 protected:
@@ -175,16 +169,6 @@ public:
      */
     bool GetShowAllPins() const override;
 
-    const wxString& GetNetListFormatName() const { return m_netListFormat; }
-    void SetNetListFormatName( const wxString& aFormat ) { m_netListFormat = aFormat; }
-
-    bool GetSpiceAjustPassiveValues() const { return m_spiceAjustPassiveValues; }
-    void SetSpiceAdjustPassiveValues( bool aEnable ) { m_spiceAjustPassiveValues = aEnable; }
-
-    /// accessor to the destination directory to use when generating plot files.
-    const wxString& GetPlotDirectoryName() const { return m_plotDirectoryName; }
-    void SetPlotDirectoryName( const wxString& aDirName ) { m_plotDirectoryName = aDirName; }
-
     /**
      * Save changes to the project settings to the project (.pro) file.
      */