Moved NETCLASSES to BOARD_DESIGN_SETTINGS.

Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses.
More complex changes:
class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ).
class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific).
kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.

include/class_board_design_settings.h

@@ -8,6 +8,7 @@
 #include <pcbstruct.h>      // NB_COLORS
 #include <class_pad.h>
 #include <class_track.h>
+#include <class_netclass.h>
 #include <config_params.h>
 
 /**
@@ -61,6 +62,9 @@ public:
     /// Track width list
     std::vector<int> m_TrackWidthList;
 
+    /// List of current netclasses. There is always the default netclass.
+    NETCLASSES m_NetClasses;
+
     bool    m_MicroViasAllowed;             ///< true to allow micro vias
     bool    m_BlindBuriedViaAllowed;        ///< true to allow blind/buried vias
     VIATYPE_T m_CurrentViaType;             ///< via type (VIA_BLIND_BURIED, VIA_THROUGH VIA_MICROVIA)
@@ -97,6 +101,56 @@ public:
 
     BOARD_DESIGN_SETTINGS();
 
+    /**
+     * Function SetCurrentNetClassName
+     * sets the current net class name to \a aName.
+     *
+     * @param aName is a reference to a wxString object containing the current net class name.
+     */
+    void SetCurrentNetClassName( const wxString& aName ) { m_currentNetClassName = aName; }
+
+    /**
+     * Function GetCurrentNetClassName
+     * @return the current net class name.
+     */
+    const wxString& GetCurrentNetClassName() const { return m_currentNetClassName; }
+
+    /**
+     * Function SetCurrentNetClass
+     * Must be called after a netclass selection (or after a netclass parameter change
+     * Initialize vias and tracks values displayed in comb boxes of the auxiliary toolbar
+     * and some others parameters (netclass name ....)
+     * @param aNetClassName = the new netclass name
+     * @return true if lists of tracks and vias sizes are modified
+     */
+    bool SetCurrentNetClass( const wxString& aNetClassName );
+
+    /**
+     * Function GetBiggestClearanceValue
+     * @return the biggest clearance value found in NetClasses list
+     */
+    int GetBiggestClearanceValue();
+
+    /**
+     * Function GetSmallestClearanceValue
+     * @return the smallest clearance value found in NetClasses list
+     */
+    int GetSmallestClearanceValue();
+
+    /**
+     * Function GetCurrentMicroViaSize
+     * @return the current micro via size,
+     * that is the current netclass value
+     */
+    int GetCurrentMicroViaSize();
+
+    /**
+     * Function GetCurrentMicroViaDrill
+     * @return the current micro via drill,
+     * that is the current netclass value
+     */
+    int GetCurrentMicroViaDrill();
+
     /**
      * Function GetTrackWidthIndex
      * @return the current track width list index.
@@ -413,6 +467,13 @@ private:
     LAYER_MSK m_visibleLayers;      ///< Bit-mask for layer visibility
     int       m_visibleElements;    ///< Bit-mask for element category visibility
     int       m_boardThickness;     ///< Board thickness for 3D viewer
+
+    /// Current net class name used to display netclass info.
+    /// This is also the last used netclass after starting a track.
+    wxString  m_currentNetClassName;
+
+    void formatNetClass( NETCLASS* aNetClass, OUTPUTFORMATTER* aFormatter, int aNestLevel,
+                         int aControlBits ) const throw( IO_ERROR );
 };
 
 #endif  // BOARD_DESIGN_SETTINGS_H_

pcbnew/autorouter/routing_matrix.cpp

@@ -201,7 +201,7 @@ void PlaceCells( BOARD* aPcb, int net_code, int flag )
     LAYER_MSK layerMask;
 
     // use the default NETCLASS?
-    NETCLASS* nc = aPcb->m_NetClasses.GetDefault();
+    NETCLASS* nc = aPcb->GetDesignSettings().m_NetClasses.GetDefault();
 
     int       trackWidth = nc->GetTrackWidth();
     int       clearance  = nc->GetClearance();

pcbnew/autorouter/solve.cpp

@@ -280,7 +280,7 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int aLayersCount )
 
     m_canvas->SetAbortRequest( false );
 
-    s_Clearance = GetBoard()->m_NetClasses.GetDefault()->GetClearance();
+    s_Clearance = GetBoard()->GetDesignSettings().m_NetClasses.GetDefault()->GetClearance();
 
     // Prepare the undo command info
     s_ItemsListPicker.ClearListAndDeleteItems();  // Should not be necessary, but...

pcbnew/class_board.cpp

@@ -66,8 +66,7 @@ wxPoint BOARD_ITEM::ZeroOffset( 0, 0 );
 BOARD::BOARD() :
     BOARD_ITEM( (BOARD_ITEM*) NULL, PCB_T ),
     m_NetInfo( this ),
-    m_paper( PAGE_INFO::A4 ),
-    m_NetClasses( this )
+    m_paper( PAGE_INFO::A4 )
 {
     // we have not loaded a board yet, assume latest until then.
     m_fileFormatVersionAtLoad = LEGACY_BOARD_FILE_VERSION;
@@ -92,19 +91,12 @@ BOARD::BOARD() :
             m_Layer[layer].m_Type = LT_UNDEFINED;
     }
 
-    m_NetClasses.GetDefault()->SetDescription( _( "This is the default net class." ) );
+    NETCLASS* defaultClass = m_designSettings.m_NetClasses.GetDefault();
+    defaultClass->SetDescription( _( "This is the default net class." ) );
 
-    m_designSettings.SetViaSizeIndex( 0 );
-    m_designSettings.SetTrackWidthIndex( 0 );
-
-    /*  Dick 5-Feb-2012: this seems unnecessary.  I don't believe the comment
-        near line 70 of class_netclass.cpp.  I stepped through with debugger.
-        Perhaps something else is at work, it is not a constructor race.
     // Initialize default values in default netclass.
-    */
-    m_NetClasses.GetDefault()->SetParams();
-
-    SetCurrentNetClass( m_NetClasses.GetDefault()->GetName() );
+    defaultClass->SetParams( m_designSettings );
+    m_designSettings.SetCurrentNetClass( defaultClass->GetName() );
 
     // Set sensible initial values for custom track width & via size
     m_designSettings.UseCustomTrackViaSize( false );
@@ -319,100 +311,6 @@ void BOARD::PopHighLight()
 }
 
 
-bool BOARD::SetCurrentNetClass( const wxString& aNetClassName )
-{
-    NETCLASS* netClass = m_NetClasses.Find( aNetClassName );
-    bool      lists_sizes_modified = false;
-
-    // if not found (should not happen) use the default
-    if( netClass == NULL )
-        netClass = m_NetClasses.GetDefault();
-
-    m_currentNetClassName = netClass->GetName();
-
-    // Initialize others values:
-    if( m_designSettings.m_ViasDimensionsList.size() == 0 )
-    {
-        VIA_DIMENSION viadim;
-        lists_sizes_modified = true;
-        m_designSettings.m_ViasDimensionsList.push_back( viadim );
-    }
-
-    if( m_designSettings.m_TrackWidthList.size() == 0 )
-    {
-        lists_sizes_modified = true;
-        m_designSettings.m_TrackWidthList.push_back( 0 );
-    }
-
-    /* note the m_ViasDimensionsList[0] and m_TrackWidthList[0] values
-     * are always the Netclass values
-     */
-    if( m_designSettings.m_ViasDimensionsList[0].m_Diameter != netClass->GetViaDiameter() )
-        lists_sizes_modified = true;
-
-    m_designSettings.m_ViasDimensionsList[0].m_Diameter = netClass->GetViaDiameter();
-
-    if( m_designSettings.m_TrackWidthList[0] != netClass->GetTrackWidth() )
-        lists_sizes_modified = true;
-
-    m_designSettings.m_TrackWidthList[0] = netClass->GetTrackWidth();
-
-    if( m_designSettings.GetViaSizeIndex() >= m_designSettings.m_ViasDimensionsList.size() )
-        m_designSettings.SetViaSizeIndex( m_designSettings.m_ViasDimensionsList.size() );
-
-    if( m_designSettings.GetTrackWidthIndex() >= m_designSettings.m_TrackWidthList.size() )
-        m_designSettings.SetTrackWidthIndex( m_designSettings.m_TrackWidthList.size() );
-
-    return lists_sizes_modified;
-}
-
-
-int BOARD::GetBiggestClearanceValue()
-{
-    int clearance = m_NetClasses.GetDefault()->GetClearance();
-
-    //Read list of Net Classes
-    for( NETCLASSES::const_iterator nc = m_NetClasses.begin(); nc != m_NetClasses.end(); nc++ )
-    {
-        NETCLASS* netclass = nc->second;
-        clearance = std::max( clearance, netclass->GetClearance() );
-    }
-
-    return clearance;
-}
-
-
-int BOARD::GetSmallestClearanceValue()
-{
-    int clearance = m_NetClasses.GetDefault()->GetClearance();
-
-    //Read list of Net Classes
-    for( NETCLASSES::const_iterator nc = m_NetClasses.begin(); nc != m_NetClasses.end(); nc++ )
-    {
-        NETCLASS* netclass = nc->second;
-        clearance = std::min( clearance, netclass->GetClearance() );
-    }
-
-    return clearance;
-}
-
-
-int BOARD::GetCurrentMicroViaSize()
-{
-    NETCLASS* netclass = m_NetClasses.Find( m_currentNetClassName );
-
-    return netclass->GetuViaDiameter();
-}
-
-
-int BOARD::GetCurrentMicroViaDrill()
-{
-    NETCLASS* netclass = m_NetClasses.Find( m_currentNetClassName );
-
-    return netclass->GetuViaDrill();
-}
-
-
 bool BOARD::SetLayer( LAYER_NUM aIndex, const LAYER& aLayer )
 {
     if( aIndex < NB_COPPER_LAYERS )

pcbnew/class_board.h

@@ -208,10 +208,6 @@ private:
     /// Number of unconnected nets in the current rats nest.
     int                     m_unconnectedNetCount;
 
-    /// Current net class name used to display netclass info.
-    /// This is also the last used netclass after starting a track.
-    wxString                m_currentNetClassName;
-
     /**
      * Function chainMarkedSegments
      * is used by MarkTrace() to set the BUSY flag of connected segments of the trace
@@ -223,10 +219,6 @@ private:
      */
     void chainMarkedSegments( wxPoint aPosition, LAYER_MSK aLayerMask, TRACK_PTRS* aList );
 
-    void formatNetClass( NETCLASS* aNetClass, OUTPUTFORMATTER* aFormatter, int aNestLevel,
-                         int aControlBits ) const
-        throw( IO_ERROR );
-
 public:
 
     void SetFileName( const wxString& aFileName ) { m_fileName = aFileName; }
@@ -250,9 +242,6 @@ public:
     /// zone contour currently in progress
     ZONE_CONTAINER*             m_CurrentZoneContour;
 
-    /// List of current netclasses. There is always the default netclass.
-    NETCLASSES                  m_NetClasses;
-
     BOARD();
     ~BOARD();
 
@@ -742,20 +731,6 @@ public:
      */
     void SetUnconnectedNetCount( unsigned aCount ) { m_unconnectedNetCount = aCount; }
 
-    /**
-     * Function SetCurrentNetClassName
-     * sets the current net class name to \a aName.
-     *
-     * @param aName is a reference to a wxString object containing the current net class name.
-     */
-    void SetCurrentNetClassName( const wxString& aName ) { m_currentNetClassName = aName; }
-
-    /**
-     * Function GetCurrentNetClassName
-     * @return the current net class name.
-     */
-    const wxString& GetCurrentNetClassName() const { return m_currentNetClassName; }
-
     /**
      * Function GetPadCount
      * @return the number of pads in board
@@ -964,10 +939,6 @@ public:
      */
     int SortedNetnamesList( wxArrayString& aNames, bool aSortbyPadsCount );
 
-    /**************************************
-     * Functions related to NetClasses:
-     **************************************/
-
     /**
      * Function SynchronizeNetsAndNetClasses
      * copies NETCLASS info to each NET, based on NET membership in a NETCLASS.
@@ -977,42 +948,6 @@ public:
      */
     void SynchronizeNetsAndNetClasses();
 
-    /**
-     * Function SetCurrentNetClass
-     * Must be called after a netclass selection (or after a netclass parameter change
-     * Initialize vias and tracks values displayed in comb boxes of the auxiliary toolbar
-     * and some others parameters (netclass name ....)
-     * @param aNetClassName = the new netclass name
-     * @return true if lists of tracks and vias sizes are modified
-     */
-    bool SetCurrentNetClass( const wxString& aNetClassName );
-
-    /**
-     * Function GetBiggestClearanceValue
-     * @return the biggest clearance value found in NetClasses list
-     */
-    int GetBiggestClearanceValue();
-
-    /**
-     * Function GetSmallestClearanceValue
-     * @return the smallest clearance value found in NetClasses list
-     */
-    int GetSmallestClearanceValue();
-
-    /**
-     * Function GetCurrentMicroViaSize
-     * @return the current micro via size,
-     * that is the current netclass value
-     */
-    int  GetCurrentMicroViaSize();
-
-    /**
-     * Function GetCurrentMicroViaDrill
-     * @return the current micro via drill,
-     * that is the current netclass value
-     */
-    int  GetCurrentMicroViaDrill();
-
     /***************************************************************************/
 
     wxString GetClass() const

pcbnew/class_board_connected_item.cpp

@@ -144,7 +144,7 @@ NETCLASS* BOARD_CONNECTED_ITEM::GetNetClass() const
     if( netclass )
         return netclass;
     else
-        return board->m_NetClasses.GetDefault();
+        return board->GetDesignSettings().m_NetClasses.GetDefault();
 }
 
 
@@ -158,7 +158,7 @@ wxString BOARD_CONNECTED_ITEM::GetNetClassName() const
     else
     {
         BOARD*  board = GetBoard();
-        name = board->m_NetClasses.GetDefault()->GetName();
+        name = board->GetDesignSettings().m_NetClasses.GetDefault()->GetName();
     }
 
     return name;

pcbnew/class_board_design_settings.cpp

@@ -102,6 +102,9 @@ BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS() :
 
     // Layer thickness for 3D viewer
     m_boardThickness = Millimeter2iu( DEFAULT_BOARD_THICKNESS_MM );
+
+    m_viaSizeIndex = 0;
+    m_trackWidthIndex = 0;
 }
 
 // Add parameters to save in project config.
@@ -171,6 +174,100 @@ void BOARD_DESIGN_SETTINGS::AppendConfigs( PARAM_CFG_ARRAY* aResult )
 }
 
 
+bool BOARD_DESIGN_SETTINGS::SetCurrentNetClass( const wxString& aNetClassName )
+{
+    NETCLASS* netClass = m_NetClasses.Find( aNetClassName );
+    bool      lists_sizes_modified = false;
+
+    // if not found (should not happen) use the default
+    if( netClass == NULL )
+        netClass = m_NetClasses.GetDefault();
+
+    m_currentNetClassName = netClass->GetName();
+
+    // Initialize others values:
+    if( m_ViasDimensionsList.size() == 0 )
+    {
+        VIA_DIMENSION viadim;
+        lists_sizes_modified = true;
+        m_ViasDimensionsList.push_back( viadim );
+    }
+
+    if( m_TrackWidthList.size() == 0 )
+    {
+        lists_sizes_modified = true;
+        m_TrackWidthList.push_back( 0 );
+    }
+
+    /* note the m_ViasDimensionsList[0] and m_TrackWidthList[0] values
+     * are always the Netclass values
+     */
+    if( m_ViasDimensionsList[0].m_Diameter != netClass->GetViaDiameter() )
+        lists_sizes_modified = true;
+
+    m_ViasDimensionsList[0].m_Diameter = netClass->GetViaDiameter();
+
+    if( m_TrackWidthList[0] != netClass->GetTrackWidth() )
+        lists_sizes_modified = true;
+
+    m_TrackWidthList[0] = netClass->GetTrackWidth();
+
+    if( GetViaSizeIndex() >= m_ViasDimensionsList.size() )
+        SetViaSizeIndex( m_ViasDimensionsList.size() );
+
+    if( GetTrackWidthIndex() >= m_TrackWidthList.size() )
+        SetTrackWidthIndex( m_TrackWidthList.size() );
+
+    return lists_sizes_modified;
+}
+
+
+int BOARD_DESIGN_SETTINGS::GetBiggestClearanceValue()
+{
+    int clearance = m_NetClasses.GetDefault()->GetClearance();
+
+    //Read list of Net Classes
+    for( NETCLASSES::const_iterator nc = m_NetClasses.begin(); nc != m_NetClasses.end(); nc++ )
+    {
+        NETCLASS* netclass = nc->second;
+        clearance = std::max( clearance, netclass->GetClearance() );
+    }
+
+    return clearance;
+}
+
+
+int BOARD_DESIGN_SETTINGS::GetSmallestClearanceValue()
+{
+    int clearance = m_NetClasses.GetDefault()->GetClearance();
+
+    //Read list of Net Classes
+    for( NETCLASSES::const_iterator nc = m_NetClasses.begin(); nc != m_NetClasses.end(); nc++ )
+    {
+        NETCLASS* netclass = nc->second;
+        clearance = std::min( clearance, netclass->GetClearance() );
+    }
+
+    return clearance;
+}
+
+
+int BOARD_DESIGN_SETTINGS::GetCurrentMicroViaSize()
+{
+    NETCLASS* netclass = m_NetClasses.Find( m_currentNetClassName );
+
+    return netclass->GetuViaDiameter();
+}
+
+
+int BOARD_DESIGN_SETTINGS::GetCurrentMicroViaDrill()
+{
+    NETCLASS* netclass = m_NetClasses.Find( m_currentNetClassName );
+
+    return netclass->GetuViaDrill();
+}
+
+
 void BOARD_DESIGN_SETTINGS::SetViaSizeIndex( unsigned aIndex )
 {
     if( aIndex >= m_ViasDimensionsList.size() )

pcbnew/class_module.cpp

@@ -447,7 +447,7 @@ const EDA_RECT MODULE::GetBoundingBox() const
     // Add the Clearance shape size: (shape around the pads when the
     // clearance is shown.  Not optimized, but the draw cost is small
     // (perhaps smaller than optimization).
-    int biggest_clearance = GetBoard()->GetBiggestClearanceValue();
+    int biggest_clearance = GetBoard()->GetDesignSettings().GetBiggestClearanceValue();
     area.Inflate( biggest_clearance );
 
     return area;

pcbnew/class_netclass.cpp

@@ -39,59 +39,43 @@
 const wxChar NETCLASS::Default[] = wxT( "Default" );
 
 // Initial values for netclass initialization
-int NETCLASS::DEFAULT_CLEARANCE  = DMils2iu( 100 );  // track to track and track to pads clearance
-int NETCLASS::DEFAULT_VIA_DRILL  = DMils2iu( 250 );  // default via drill
-int NETCLASS::DEFAULT_UVIA_DRILL = DMils2iu( 50 );    // micro via drill
+const int NETCLASS::DEFAULT_CLEARANCE  = DMils2iu( 100 );   // track to track and track to pads clearance
+const int NETCLASS::DEFAULT_VIA_DRILL  = DMils2iu( 250 );   // default via drill
+const int NETCLASS::DEFAULT_UVIA_DRILL = DMils2iu( 50 );    // micro via drill
 
 
-NETCLASS::NETCLASS( BOARD* aParent, const wxString& aName, const NETCLASS* initialParameters ) :
-    m_Parent( aParent ),
+NETCLASS::NETCLASS( const wxString& aName ) :
     m_Name( aName )
 {
-    // use initialParameters if not NULL, else set the initial
-    // parameters from boardDesignSettings (try to change this)
-    SetParams( initialParameters );
+    // Default settings
+    SetClearance( DEFAULT_CLEARANCE );
+    SetViaDrill( DEFAULT_VIA_DRILL );
+    SetuViaDrill( DEFAULT_UVIA_DRILL );
 }
 
 
-void NETCLASS::SetParams( const NETCLASS* defaults )
+void NETCLASS::SetParams( const NETCLASS& aDefaults )
 {
-    if( defaults )
-    {
-        SetClearance( defaults->GetClearance() );
-        SetTrackWidth( defaults->GetTrackWidth() );
-        SetViaDiameter( defaults->GetViaDiameter() );
-        SetViaDrill( defaults->GetViaDrill() );
-        SetuViaDiameter( defaults->GetuViaDiameter() );
-        SetuViaDrill( defaults->GetuViaDrill() );
-    }
-    else
-    {
-
-/* Dick 5-Feb-2012:  I do not believe this comment to be true with current code.
-        It is certainly not a constructor race.  Normally items are initialized
-        within a class according to the order of their appearance.
-
-        // Note:
-        // We use m_Parent->GetDesignSettings() to get some default values
-        // But when this function is called when instantiating a BOARD class,
-        // by the NETCLASSES constructor that calls NETCLASS constructor,
-        // the BOARD constructor (see BOARD::BOARD) is not yet run,
-        // and BOARD::m_designSettings contains not yet initialized values.
-        // So inside the BOARD constructor itself, you SHOULD recall SetParams
-*/
+    SetClearance( aDefaults.GetClearance() );
+    SetTrackWidth( aDefaults.GetTrackWidth() );
+    SetViaDiameter( aDefaults.GetViaDiameter() );
+    SetViaDrill( aDefaults.GetViaDrill() );
+    SetuViaDiameter( aDefaults.GetuViaDiameter() );
+    SetuViaDrill( aDefaults.GetuViaDrill() );
+}
 
-        const BOARD_DESIGN_SETTINGS& g = m_Parent->GetDesignSettings();
 
-        SetTrackWidth(  g.m_TrackMinWidth );
-        SetViaDiameter( g.m_ViasMinSize );
-        SetuViaDiameter( g.m_MicroViasMinSize );
+void NETCLASS::SetParams( const BOARD_DESIGN_SETTINGS& aSettings )
+{
+    SetTrackWidth( aSettings.m_TrackMinWidth );
+    SetViaDiameter( aSettings.m_ViasMinSize );
+    SetuViaDiameter( aSettings.m_MicroViasMinSize );
 
+    // TODO: BOARD_DESIGN_SETTINGS may provide the following parameters - should it?
     // Use default values for next parameters:
     SetClearance( DEFAULT_CLEARANCE );
     SetViaDrill( DEFAULT_VIA_DRILL );
     SetuViaDrill( DEFAULT_UVIA_DRILL );
-    }
 }
 
 
@@ -100,9 +84,8 @@ NETCLASS::~NETCLASS()
 }
 
 
-NETCLASSES::NETCLASSES( BOARD* aParent ) :
-    m_Parent( aParent ),
-    m_Default( aParent, NETCLASS::Default )
+NETCLASSES::NETCLASSES() :
+    m_Default( NETCLASS::Default )
 {
 }
 
@@ -198,7 +181,7 @@ NETCLASS* NETCLASSES::Find( const wxString& aName ) const
 
 void BOARD::SynchronizeNetsAndNetClasses()
 {
-    // D(printf("start\n");)       // simple performance/timing indicator.
+    NETCLASSES& netClasses = m_designSettings.m_NetClasses;
 
     // set all NETs to the default NETCLASS, then later override some
     // as we go through the NETCLASSes.
@@ -206,17 +189,17 @@ void BOARD::SynchronizeNetsAndNetClasses()
     for( NETINFO_LIST::iterator net( m_NetInfo.begin() ), netEnd( m_NetInfo.end() );
                 net != netEnd; ++net )
     {
-        net->SetClass( m_NetClasses.GetDefault() );
+        net->SetClass( netClasses.GetDefault() );
     }
 
     // Add netclass name and pointer to nets.  If a net is in more than one netclass,
     // set the net's name and pointer to only the first netclass.  Subsequent
     // and therefore bogus netclass memberships will be deleted in logic below this loop.
-    for( NETCLASSES::iterator clazz=m_NetClasses.begin();  clazz!=m_NetClasses.end();  ++clazz )
+    for( NETCLASSES::iterator clazz = netClasses.begin(); clazz != netClasses.end(); ++clazz )
     {
         NETCLASS* netclass = clazz->second;
 
-        for( NETCLASS::iterator member = netclass->begin();  member!=netclass->end();  ++member )
+        for( NETCLASS::iterator member = netclass->begin(); member != netclass->end(); ++member )
         {
             const wxString& netname = *member;
 
@@ -237,14 +220,14 @@ void BOARD::SynchronizeNetsAndNetClasses()
     // contain netnames that do not exist, by deleting all netnames from
     // every netclass and re-adding them.
 
-    for( NETCLASSES::iterator clazz=m_NetClasses.begin();  clazz!=m_NetClasses.end();  ++clazz )
+    for( NETCLASSES::iterator clazz = netClasses.begin(); clazz != netClasses.end(); ++clazz )
     {
         NETCLASS* netclass = clazz->second;
 
         netclass->Clear();
     }
 
-    m_NetClasses.GetDefault()->Clear();
+    netClasses.GetDefault()->Clear();
 
     for( NETINFO_LIST::iterator net( m_NetInfo.begin() ), netEnd( m_NetInfo.end() );
             net != netEnd; ++net )
@@ -253,14 +236,12 @@ void BOARD::SynchronizeNetsAndNetClasses()
 
         // because of the std:map<> this should be fast, and because of
         // prior logic, netclass should not be NULL.
-        NETCLASS* netclass = m_NetClasses.Find( classname );
+        NETCLASS* netclass = netClasses.Find( classname );
 
         wxASSERT( netclass );
 
         netclass->Add( net->GetNetname() );
     }
-
-    // D(printf("stop\n");)
 }
 
 
@@ -286,36 +267,6 @@ void NETCLASS::Show( int nestLevel, std::ostream& os ) const
 #endif
 
 
-int NETCLASS::GetTrackMinWidth() const
-{
-    return m_Parent->GetDesignSettings().m_TrackMinWidth;
-}
-
-
-int NETCLASS::GetViaMinDiameter() const
-{
-    return m_Parent->GetDesignSettings().m_ViasMinSize;
-}
-
-
-int NETCLASS::GetViaMinDrill() const
-{
-    return m_Parent->GetDesignSettings().m_ViasMinDrill;
-}
-
-
-int NETCLASS::GetuViaMinDiameter() const
-{
-    return m_Parent->GetDesignSettings().m_MicroViasMinSize;
-}
-
-
-int NETCLASS::GetuViaMinDrill() const
-{
-    return m_Parent->GetDesignSettings().m_MicroViasMinDrill;
-}
-
-
 void NETCLASS::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
     throw( IO_ERROR )
 {
@@ -333,14 +284,7 @@ void NETCLASS::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl
     aFormatter->Print( aNestLevel+1, "(uvia_drill %s)\n", FMT_IU( GetuViaDrill() ).c_str() );
 
     for( NETCLASS::const_iterator it = begin(); it != end(); ++it )
-    {
-        NETINFO_ITEM* netinfo = m_Parent->FindNet( *it );
-
-        if( netinfo && netinfo->GetNodesCount() > 0 )
-        {
         aFormatter->Print( aNestLevel+1, "(add_net %s)\n", aFormatter->Quotew( *it ).c_str() );
-        }
-    }
 
     aFormatter->Print( aNestLevel, ")\n\n" );
 }

pcbnew/class_netclass.h

@@ -41,6 +41,7 @@
 
 class LINE_READER;
 class BOARD;
+class BOARD_DESIGN_SETTINGS;
 
 
 /**
@@ -53,13 +54,11 @@ class NETCLASS
 {
 private:
     // Default values used to init a NETCLASS
-    static int DEFAULT_CLEARANCE;
-    static int DEFAULT_VIA_DRILL;
-    static int DEFAULT_UVIA_DRILL;
+    const static int DEFAULT_CLEARANCE;
+    const static int DEFAULT_VIA_DRILL;
+    const static int DEFAULT_UVIA_DRILL;
 
 protected:
-
-    BOARD*      m_Parent;
     wxString    m_Name;                 ///< Name of the net class
     wxString    m_Description;          ///< what this NETCLASS is for.
 
@@ -85,12 +84,9 @@ public:
     /**
      * Constructor
      * stuffs a NETCLASS instance with aParent, aName, and optionally the initialParameters
-     * @param aParent = the parent board
      * @param aName = the name of this new netclass
-     * @param initialParameters is a NETCLASS to copy parameters from, or if
-     *  NULL tells me to copy default settings from BOARD::m_designSettings.
      */
-    NETCLASS( BOARD* aParent, const wxString& aName, const NETCLASS* initialParameters = NULL );
+    NETCLASS( const wxString& aName );
 
     ~NETCLASS();
 
@@ -115,7 +111,6 @@ public:
         return m_Members.size();
     }
 
-
     /**
      * Function Clear
      * empties the collection of members.
@@ -125,7 +120,6 @@ public:
         m_Members.clear();
     }
 
-
     /**
      * Function AddMember
      * adds \a aNetname to this NETCLASS if it is not already in this NETCLASS.
@@ -169,34 +163,35 @@ public:
     void    SetClearance( int aClearance )  { m_Clearance = aClearance; }
 
     int     GetTrackWidth() const           { return m_TrackWidth; }
-    int     GetTrackMinWidth() const;
     void    SetTrackWidth( int aWidth )     { m_TrackWidth = aWidth; }
 
     int     GetViaDiameter() const          { return m_ViaDia; }
-    int     GetViaMinDiameter() const;
     void    SetViaDiameter( int aDia )      { m_ViaDia = aDia; }
 
     int     GetViaDrill() const             { return m_ViaDrill; }
-    int     GetViaMinDrill() const;
     void    SetViaDrill( int aSize )        { m_ViaDrill = aSize; }
 
     int     GetuViaDiameter() const         { return m_uViaDia; }
-    int     GetuViaMinDiameter() const;
     void    SetuViaDiameter( int aSize )    { m_uViaDia = aSize; }
 
     int     GetuViaDrill() const            { return m_uViaDrill; }
-    int     GetuViaMinDrill() const;
     void    SetuViaDrill( int aSize )       { m_uViaDrill = aSize; }
 
-
     /**
      * Function SetParams
      * will set all the parameters by copying them from \a defaults.
      * Parameters are the values like m_ViaSize, etc, but do not include m_Description.
-     * @param defaults is another NETCLASS to copy from.  If NULL, then copy
-     *  from global preferences instead.
+     * @param aDefaults is another NETCLASS object to copy from.
+     */
+    void SetParams( const NETCLASS& aDefaults );
+
+    /**
+     * Function SetParams
+     * will set all the parameters by copying them from board design settings.
+     * @param aSettings is a BOARD_DESIGN_SETTINGS object to copy from. Clearance, via drill and
+     * microvia drill values are taken from the defaults.
      */
-    void    SetParams( const NETCLASS* defaults = NULL );
+    void SetParams( const BOARD_DESIGN_SETTINGS& aSettings );
 
     /**
      * Function Format
@@ -225,8 +220,6 @@ public:
 class NETCLASSES
 {
 private:
-    BOARD*                  m_Parent;
-
     typedef std::map<wxString, NETCLASS*> NETCLASSMAP;
 
     /// all the NETCLASSes except the default one.
@@ -236,7 +229,7 @@ private:
     NETCLASS                m_Default;
 
 public:
-    NETCLASSES( BOARD* aParent = NULL );
+    NETCLASSES();
     ~NETCLASSES();
 
     /**
@@ -253,7 +246,6 @@ public:
     const_iterator begin() const { return m_NetClasses.begin(); }
     const_iterator end()   const { return m_NetClasses.end(); }
 
-
     /**
      * Function GetCount
      * @return the number of netclasses, excluding the default one.
@@ -263,6 +255,10 @@ public:
         return m_NetClasses.size();
     }
 
+    /**
+     * Function GetDefault
+     * @return the default net class.
+     */
     NETCLASS* GetDefault() const
     {
         return (NETCLASS*) &m_Default;

pcbnew/dialogs/dialog_design_rules.cpp

@@ -190,15 +190,15 @@ void DIALOG_DESIGN_RULES::PrintCurrentSettings()
     m_MessagesList->AppendToPage( _( "<b>Current general settings:</b><br>" ) );
 
     // Display min values:
-    value = StringFromValue( g_UserUnit, m_BrdSettings.m_TrackMinWidth, true );
+    value = StringFromValue( g_UserUnit, m_BrdSettings->m_TrackMinWidth, true );
     msg.Printf( _( "Minimum value for tracks width: <b>%s</b><br>\n" ), GetChars( value ) );
     m_MessagesList->AppendToPage( msg );
 
-    value = StringFromValue( g_UserUnit, m_BrdSettings.m_ViasMinSize, true );
+    value = StringFromValue( g_UserUnit, m_BrdSettings->m_ViasMinSize, true );
     msg.Printf( _( "Minimum value for vias diameter: <b>%s</b><br>\n" ), GetChars( value ) );
     m_MessagesList->AppendToPage( msg );
 
-    value = StringFromValue( g_UserUnit, m_BrdSettings.m_MicroViasMinSize, true );
+    value = StringFromValue( g_UserUnit, m_BrdSettings->m_MicroViasMinSize, true );
     msg.Printf( _( "Minimum value for microvias diameter: <b>%s</b><br>\n" ), GetChars( value ) );
     m_MessagesList->AppendToPage( msg );
 }
@@ -212,7 +212,7 @@ void DIALOG_DESIGN_RULES::InitDialogRules()
     SetReturnCode( 0 );
 
     m_Pcb = m_Parent->GetBoard();
-    m_BrdSettings = m_Pcb->GetDesignSettings();
+    m_BrdSettings = &m_Pcb->GetDesignSettings();
 
     // Initialize the Rules List
     InitRulesList();
@@ -220,13 +220,8 @@ void DIALOG_DESIGN_RULES::InitDialogRules()
     // copy all NETs into m_AllNets by adding them as NETCUPs.
 
     // @todo go fix m_Pcb->SynchronizeNetsAndNetClasses() so that the netcode==0 is not present in the BOARD::m_NetClasses
-
-
-    NETCLASS*   netclass;
-
-    NETCLASSES& netclasses = m_Pcb->m_NetClasses;
-
-    netclass = netclasses.GetDefault();
+    NETCLASSES& netclasses = m_BrdSettings->m_NetClasses;
+    NETCLASS*   netclass = netclasses.GetDefault();
 
     // Initialize list of nets for Default Net Class
     for( NETCLASS::const_iterator name = netclass->begin();  name != netclass->end();  ++name )
@@ -262,23 +257,23 @@ void DIALOG_DESIGN_RULES::InitGlobalRules()
     AddUnitSymbol( *m_MicroViaMinDrillTitle );
     AddUnitSymbol( *m_TrackMinWidthTitle );
 
-    PutValueInLocalUnits( *m_SetViasMinSizeCtrl, m_BrdSettings.m_ViasMinSize );
-    PutValueInLocalUnits( *m_SetViasMinDrillCtrl, m_BrdSettings.m_ViasMinDrill );
+    PutValueInLocalUnits( *m_SetViasMinSizeCtrl, m_BrdSettings->m_ViasMinSize );
+    PutValueInLocalUnits( *m_SetViasMinDrillCtrl, m_BrdSettings->m_ViasMinDrill );
 
-    if(  m_BrdSettings.m_BlindBuriedViaAllowed )
+    if( m_BrdSettings->m_BlindBuriedViaAllowed )
         m_OptViaType->SetSelection( 1 );
 
-    m_AllowMicroViaCtrl->SetSelection(  m_BrdSettings.m_MicroViasAllowed ? 1 : 0 );
-    PutValueInLocalUnits( *m_SetMicroViasMinSizeCtrl, m_BrdSettings.m_MicroViasMinSize );
-    PutValueInLocalUnits( *m_SetMicroViasMinDrillCtrl, m_BrdSettings.m_MicroViasMinDrill );
-    PutValueInLocalUnits( *m_SetTrackMinWidthCtrl, m_BrdSettings.m_TrackMinWidth );
+    m_AllowMicroViaCtrl->SetSelection( m_BrdSettings->m_MicroViasAllowed ? 1 : 0 );
+    PutValueInLocalUnits( *m_SetMicroViasMinSizeCtrl, m_BrdSettings->m_MicroViasMinSize );
+    PutValueInLocalUnits( *m_SetMicroViasMinDrillCtrl, m_BrdSettings->m_MicroViasMinDrill );
+    PutValueInLocalUnits( *m_SetTrackMinWidthCtrl, m_BrdSettings->m_TrackMinWidth );
 
     // Initialize Vias and Tracks sizes lists.
     // note we display only extra values, never the current netclass value.
     // (the first value in history list)
-    m_TracksWidthList = m_BrdSettings.m_TrackWidthList;
+    m_TracksWidthList = m_BrdSettings->m_TrackWidthList;
     m_TracksWidthList.erase( m_TracksWidthList.begin() );       // remove the netclass value
-    m_ViasDimensionsList = m_BrdSettings.m_ViasDimensionsList;
+    m_ViasDimensionsList = m_BrdSettings->m_ViasDimensionsList;
     m_ViasDimensionsList.erase( m_ViasDimensionsList.begin() ); // remove the netclass value
     InitDimensionsLists();
 }
@@ -484,7 +479,7 @@ static void class2gridRow( wxGrid* grid, int row, NETCLASS* nc )
  */
 void DIALOG_DESIGN_RULES::InitRulesList()
 {
-    NETCLASSES& netclasses = m_Pcb->m_NetClasses;
+    NETCLASSES& netclasses = m_BrdSettings->m_NetClasses;
 
     // the +1 is for the Default NETCLASS.
     if( netclasses.GetCount() + 1 > (unsigned) m_grid->GetNumberRows() )
@@ -524,7 +519,7 @@ static void gridRow2class( wxGrid* grid, int row, NETCLASS* nc )
  */
 void DIALOG_DESIGN_RULES::CopyRulesListToBoard()
 {
-    NETCLASSES& netclasses = m_Pcb->m_NetClasses;
+    NETCLASSES& netclasses = m_BrdSettings->m_NetClasses;
 
     // Remove all netclasses from board. We'll copy new list after
     netclasses.Clear();
@@ -535,9 +530,9 @@ void DIALOG_DESIGN_RULES::CopyRulesListToBoard()
     // Copy other NetClasses :
     for( int row = 1; row < m_grid->GetNumberRows();  ++row )
     {
-        NETCLASS* nc = new NETCLASS( m_Pcb, m_grid->GetRowLabelValue( row ) );
+        NETCLASS* nc = new NETCLASS( m_grid->GetRowLabelValue( row ) );
 
-        if( !m_Pcb->m_NetClasses.Add( nc ) )
+        if( !m_BrdSettings->m_NetClasses.Add( nc ) )
         {
             // this netclass cannot be added because an other netclass with the same name exists
             // Should not occur because OnAddNetclassClick() tests for existing NetClass names
@@ -568,20 +563,20 @@ void DIALOG_DESIGN_RULES::CopyRulesListToBoard()
 void DIALOG_DESIGN_RULES::CopyGlobalRulesToBoard()
 /*************************************************/
 {
-    m_BrdSettings.m_BlindBuriedViaAllowed = m_OptViaType->GetSelection() > 0;
+    m_BrdSettings->m_BlindBuriedViaAllowed = m_OptViaType->GetSelection() > 0;
 
     // Update vias minimum values for DRC
-    m_BrdSettings.m_ViasMinSize = ValueFromTextCtrl( *m_SetViasMinSizeCtrl );
-    m_BrdSettings.m_ViasMinDrill = ValueFromTextCtrl( *m_SetViasMinDrillCtrl );
+    m_BrdSettings->m_ViasMinSize = ValueFromTextCtrl( *m_SetViasMinSizeCtrl );
+    m_BrdSettings->m_ViasMinDrill = ValueFromTextCtrl( *m_SetViasMinDrillCtrl );
 
-    m_BrdSettings.m_MicroViasAllowed = m_AllowMicroViaCtrl->GetSelection() == 1;
+    m_BrdSettings->m_MicroViasAllowed = m_AllowMicroViaCtrl->GetSelection() == 1;
 
     // Update microvias minimum values for DRC
-    m_BrdSettings.m_MicroViasMinSize = ValueFromTextCtrl( *m_SetMicroViasMinSizeCtrl );
-    m_BrdSettings.m_MicroViasMinDrill = ValueFromTextCtrl( *m_SetMicroViasMinDrillCtrl );
+    m_BrdSettings->m_MicroViasMinSize = ValueFromTextCtrl( *m_SetMicroViasMinSizeCtrl );
+    m_BrdSettings->m_MicroViasMinDrill = ValueFromTextCtrl( *m_SetMicroViasMinDrillCtrl );
 
     // Update tracks minimum values for DRC
-    m_BrdSettings.m_TrackMinWidth = ValueFromTextCtrl( *m_SetTrackMinWidthCtrl );
+    m_BrdSettings->m_TrackMinWidth = ValueFromTextCtrl( *m_SetTrackMinWidthCtrl );
 }
 
 
@@ -634,12 +629,12 @@ void DIALOG_DESIGN_RULES::CopyDimensionsListsToBoard()
     // Sort new list by by increasing value
     sort( m_ViasDimensionsList.begin(), m_ViasDimensionsList.end() );
 
-    std::vector<int>* tlist = &m_BrdSettings.m_TrackWidthList;
+    std::vector<int>* tlist = &m_BrdSettings->m_TrackWidthList;
     tlist->erase( tlist->begin() + 1, tlist->end() );                                   // Remove old "custom" sizes
     tlist->insert( tlist->end(), m_TracksWidthList.begin(), m_TracksWidthList.end() );  //Add new "custom" sizes
 
     // Reinitialize m_ViaSizeList
-    std::vector<VIA_DIMENSION>* vialist = &m_BrdSettings.m_ViasDimensionsList;
+    std::vector<VIA_DIMENSION>* vialist = &m_BrdSettings->m_ViasDimensionsList;
     vialist->erase( vialist->begin() + 1, vialist->end() );
     vialist->insert( vialist->end(), m_ViasDimensionsList.begin(), m_ViasDimensionsList.end() );
 }
@@ -671,11 +666,9 @@ void DIALOG_DESIGN_RULES::OnOkButtonClick( wxCommandEvent& event )
     CopyGlobalRulesToBoard();
     CopyDimensionsListsToBoard();
 
-    m_Pcb->SetDesignSettings( m_BrdSettings );
-
     EndModal( wxID_OK );
 
-    m_Pcb->SetCurrentNetClass( NETCLASS::Default );
+    m_BrdSettings->SetCurrentNetClass( NETCLASS::Default );
 }
 
 

pcbnew/dialogs/dialog_design_rules.h

@@ -40,7 +40,7 @@ private:
 
     PCB_EDIT_FRAME*         m_Parent;
     BOARD*                  m_Pcb;
-    BOARD_DESIGN_SETTINGS   m_BrdSettings;
+    BOARD_DESIGN_SETTINGS*  m_BrdSettings;
 
     static int              s_LastTabSelection;     ///< which tab user had open last
 

pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp

@@ -46,21 +46,22 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit()
 
     // Display current setup for tracks and vias
     BOARD*        board = m_Parent->GetBoard();
-    NETCLASSES&   netclasses = board->m_NetClasses;
-    NETINFO_ITEM* net = board->FindNet( m_Netcode );
+    BOARD_DESIGN_SETTINGS& dsnSettings = board->GetDesignSettings();
+    NETCLASSES&   netclasses = dsnSettings.m_NetClasses;
     NETCLASS*     netclass = netclasses.GetDefault();
+    NETINFO_ITEM* net = board->FindNet( m_Netcode );
 
     if( net )
     {
         m_CurrentNetName->SetLabel( net->GetNetname() );
-        m_CurrentNetclassName->SetLabel( board->GetCurrentNetClassName() );
-        netclass = netclasses.Find( board->GetCurrentNetClassName() );
+        m_CurrentNetclassName->SetLabel( dsnSettings.GetCurrentNetClassName() );
+        netclass = netclasses.Find( dsnSettings.GetCurrentNetClassName() );
     }
 
     /* Disable the option "copy current to net" if we have only default netclass values
      * i.e. when m_TrackWidthSelector and m_ViaSizeSelector are set to 0
      */
-    if( !board->GetDesignSettings().GetTrackWidthIndex() && !board->GetDesignSettings().GetViaSizeIndex() )
+    if( !dsnSettings.GetTrackWidthIndex() && !dsnSettings.GetViaSizeIndex() )
     {
         m_Net2CurrValueButton->Enable( false );
         m_OptionID = ID_NETCLASS_VALUES_TO_CURRENT_NET;
@@ -77,9 +78,9 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit()
     msg = StringFromValue( g_UserUnit, value, true );
     m_gridDisplayCurrentSettings->SetCellValue( 0, 0, msg  );
 
-    if( board->GetDesignSettings().GetTrackWidthIndex() )
+    if( dsnSettings.GetTrackWidthIndex() )
     {
-        value = board->GetDesignSettings().GetCurrentTrackWidth();
+        value = dsnSettings.GetCurrentTrackWidth();
         msg   = StringFromValue( g_UserUnit, value, true );
     }
     else
@@ -91,9 +92,9 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit()
     msg   = StringFromValue( g_UserUnit, value, true );
     m_gridDisplayCurrentSettings->SetCellValue( 0, 1, msg  );
 
-    if( board->GetDesignSettings().GetViaSizeIndex() )
+    if( dsnSettings.GetViaSizeIndex() )
     {
-        value = board->GetDesignSettings().GetCurrentViaSize();
+        value = dsnSettings.GetCurrentViaSize();
         msg   = StringFromValue( g_UserUnit, value, true );
     }
     else
@@ -103,7 +104,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit()
     value = netclass->GetViaDrill();      // Display via drill
     msg   = StringFromValue( g_UserUnit, value, true );
     m_gridDisplayCurrentSettings->SetCellValue( 0, 2, msg  );
-    value = board->GetDesignSettings().GetCurrentViaDrill();
+    value = dsnSettings.GetCurrentViaDrill();
     if( value >= 0 )
         msg = StringFromValue( g_UserUnit, value, true );
     else

pcbnew/dialogs/dialog_plot.cpp

@@ -70,8 +70,8 @@ void DIALOG_PLOT::Init_Dialog()
 
     // The reasonable width correction value must be in a range of
     // [-(MinTrackWidth-1), +(MinClearanceValue-1)] decimils.
-    m_widthAdjustMinValue   = -(m_board->GetDesignSettings().m_TrackMinWidth - 1);
-    m_widthAdjustMaxValue   = m_board->GetSmallestClearanceValue() - 1;
+    m_widthAdjustMinValue   = -( m_board->GetDesignSettings().m_TrackMinWidth - 1 );
+    m_widthAdjustMaxValue   = m_board->GetDesignSettings().GetSmallestClearanceValue() - 1;
 
     switch( m_plotOpts.GetFormat() )
     {

pcbnew/drc.cpp

@@ -403,7 +403,7 @@ bool DRC::testNetClasses()
 {
     bool        ret = true;
 
-    NETCLASSES& netclasses = m_pcb->m_NetClasses;
+    NETCLASSES& netclasses = m_pcb->GetDesignSettings().m_NetClasses;
 
     wxString    msg;   // construct this only once here, not in a loop, since somewhat expensive.
 

pcbnew/drc_clearance_test_functions.cpp

@@ -154,6 +154,7 @@ bool DRC::doTrackDrc( TRACK* aRefSeg, TRACK* aStart, bool testPads )
     wxPoint   shape_pos;
 
     NETCLASS* netclass = aRefSeg->GetNetClass();
+    BOARD_DESIGN_SETTINGS& dsnSettings = m_pcb->GetDesignSettings();
 
     /* In order to make some calculations more easier or faster,
      * pads and tracks coordinates will be made relative to the reference segment origin
@@ -173,7 +174,7 @@ bool DRC::doTrackDrc( TRACK* aRefSeg, TRACK* aStart, bool testPads )
         // test if the via size is smaller than minimum
         if( refvia->GetViaType() == VIA_MICROVIA )
         {
-            if( refvia->GetWidth() < netclass->GetuViaMinDiameter() )
+            if( refvia->GetWidth() < dsnSettings.m_MicroViasMinSize )
             {
                 m_currentMarker = fillMarker( refvia, NULL,
                                               DRCE_TOO_SMALL_MICROVIA, m_currentMarker );
@@ -182,7 +183,7 @@ bool DRC::doTrackDrc( TRACK* aRefSeg, TRACK* aStart, bool testPads )
         }
         else
         {
-            if( refvia->GetWidth() < netclass->GetViaMinDiameter() )
+            if( refvia->GetWidth() < dsnSettings.m_ViasMinSize )
             {
                 m_currentMarker = fillMarker( refvia, NULL,
                                               DRCE_TOO_SMALL_VIA, m_currentMarker );
@@ -231,7 +232,7 @@ bool DRC::doTrackDrc( TRACK* aRefSeg, TRACK* aStart, bool testPads )
     }
     else    // This is a track segment
     {
-        if( aRefSeg->GetWidth() < netclass->GetTrackMinWidth() )
+        if( aRefSeg->GetWidth() < dsnSettings.m_TrackMinWidth )
         {
             m_currentMarker = fillMarker( aRefSeg, NULL,
                                           DRCE_TOO_SMALL_TRACK_WIDTH, m_currentMarker );

pcbnew/eagle_plugin.cpp

@@ -1146,7 +1146,7 @@ BOARD* EAGLE_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe,  const
 
         if( m_rules->mdWireWire )
         {
-            NETCLASS*   defaultNetclass = m_board->m_NetClasses.GetDefault();
+            NETCLASS*   defaultNetclass = designSettings.m_NetClasses.GetDefault();
             int         clearance = KiROUND( m_rules->mdWireWire );
 
             if( clearance < defaultNetclass->GetClearance() )

pcbnew/edit_track_width.cpp

@@ -67,7 +67,7 @@ bool PCB_EDIT_FRAME::SetTrackSegmentWidth( TRACK*             aTrackItem,
             if( net )
                 new_width = net->GetMicroViaSize();
             else
-                new_width = GetBoard()->GetCurrentMicroViaSize();
+                new_width = GetDesignSettings().GetCurrentMicroViaSize();
         }
     }
 

pcbnew/editrack.cpp

@@ -167,7 +167,7 @@ TRACK* PCB_EDIT_FRAME::Begin_Route( TRACK* aTrack, wxDC* aDC )
 
         // Display info about track Net class, and init track and vias sizes:
         g_CurrentTrackSegment->SetNetCode( GetBoard()->GetHighLightNetCode() );
-        GetBoard()->SetCurrentNetClass( g_CurrentTrackSegment->GetNetClassName() );
+        GetDesignSettings().SetCurrentNetClass( g_CurrentTrackSegment->GetNetClassName() );
 
         g_CurrentTrackSegment->SetLayer( GetScreen()->m_Active_Layer );
         g_CurrentTrackSegment->SetWidth( GetDesignSettings().GetCurrentTrackWidth() );

pcbnew/files.cpp

@@ -356,7 +356,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
     }
     else
     {
-        GetBoard()->m_NetClasses.Clear();
+        GetDesignSettings().m_NetClasses.Clear();
     }
 
     BOARD* loadedBoard = 0;   // it will be set to non-NULL if loaded OK
@@ -485,7 +485,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
 #endif
 
     // Update info shown by the horizontal toolbars
-    GetBoard()->SetCurrentNetClass( NETCLASS::Default );
+    GetDesignSettings().SetCurrentNetClass( NETCLASS::Default );
     ReFillLayerWidget();
     ReCreateLayerBox();
 
@@ -678,7 +678,7 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF
 
     // Select default Netclass before writing file.
     // Useful to save default values in headers
-    GetBoard()->SetCurrentNetClass( GetBoard()->m_NetClasses.GetDefault()->GetName() );
+    GetDesignSettings().SetCurrentNetClass( GetDesignSettings().m_NetClasses.GetDefault()->GetName() );
 
     try
     {

pcbnew/legacy_plugin.cpp

@@ -632,7 +632,7 @@ void LEGACY_PLUGIN::loadSHEET()
 
 void LEGACY_PLUGIN::loadSETUP()
 {
-    NETCLASS*               netclass_default  = m_board->m_NetClasses.GetDefault();
+    NETCLASS*               netclass_default = m_board->GetDesignSettings().m_NetClasses.GetDefault();
     // TODO Orson: is it really necessary to first operate on a copy and then apply it?
     // would not it be better to use reference here and apply all the changes instantly?
     BOARD_DESIGN_SETTINGS   bds = m_board->GetDesignSettings();
@@ -897,7 +897,7 @@ void LEGACY_PLUGIN::loadSETUP()
             //        at all, the global defaults should go into a preferences
             //        file instead so they are there to start new board
             //        projects.
-            m_board->m_NetClasses.GetDefault()->SetParams();
+            m_board->GetDesignSettings().m_NetClasses.GetDefault()->SetParams( m_board->GetDesignSettings() );
 
             return;     // preferred exit
         }
@@ -2113,7 +2113,7 @@ void LEGACY_PLUGIN::loadNETCLASS()
     // yet since that would bypass duplicate netclass name checking within the BOARD.
     // store it temporarily in an auto_ptr until successfully inserted into the BOARD
     // just before returning.
-    auto_ptr<NETCLASS> nc( new NETCLASS( m_board, wxEmptyString ) );
+    auto_ptr<NETCLASS> nc( new NETCLASS( wxEmptyString ) );
 
     while( ( line = READLINE( m_reader ) ) != NULL )
     {
@@ -2175,7 +2175,7 @@ void LEGACY_PLUGIN::loadNETCLASS()
 
         else if( TESTLINE( "$EndNCLASS" ) )
         {
-            if( m_board->m_NetClasses.Add( nc.get() ) )
+            if( m_board->GetDesignSettings().m_NetClasses.Add( nc.get() ) )
             {
                 nc.release();
             }
@@ -2984,8 +2984,8 @@ void LEGACY_PLUGIN::saveSHEET( const BOARD* aBoard ) const
 
 void LEGACY_PLUGIN::saveSETUP( const BOARD* aBoard ) const
 {
-    NETCLASS* netclass_default       = aBoard->m_NetClasses.GetDefault();
     const BOARD_DESIGN_SETTINGS& bds = aBoard->GetDesignSettings();
+    NETCLASS* netclass_default       = bds.m_NetClasses.GetDefault();
 
     fprintf( m_fp, "$SETUP\n" );
 
@@ -3098,7 +3098,7 @@ void LEGACY_PLUGIN::saveBOARD_ITEMS( const BOARD* aBoard ) const
     }
 
     // Saved nets do not include netclass names, so save netclasses after nets.
-    saveNETCLASSES( &aBoard->m_NetClasses );
+    saveNETCLASSES( &aBoard->GetDesignSettings().m_NetClasses );
 
     // save the modules
     for( MODULE* m = aBoard->m_Modules;  m;  m = (MODULE*) m->Next() )
@@ -3119,7 +3119,7 @@ void LEGACY_PLUGIN::saveBOARD_ITEMS( const BOARD* aBoard ) const
             savePCB_TARGET( (PCB_TARGET*) gr );
             break;
         case PCB_DIMENSION_T:
-            saveDIMENTION( (DIMENSION*) gr );
+            saveDIMENSION( (DIMENSION*) gr );
             break;
         default:
             THROW_IO_ERROR( wxString::Format( UNKNOWN_GRAPHIC_FORMAT, gr->Type() ) );
@@ -3763,7 +3763,7 @@ void LEGACY_PLUGIN::saveZONE_CONTAINER( const ZONE_CONTAINER* me ) const
 }
 
 
-void LEGACY_PLUGIN::saveDIMENTION( const DIMENSION* me ) const
+void LEGACY_PLUGIN::saveDIMENSION( const DIMENSION* me ) const
 {
     // note: COTATION was the previous name of DIMENSION
     // this old keyword is used here for compatibility

pcbnew/legacy_plugin.h

@@ -261,7 +261,7 @@ protected:
     void savePCB_TEXT( const TEXTE_PCB* aText ) const;
     void savePCB_TARGET( const PCB_TARGET* aTarget ) const;
     void savePCB_LINE( const DRAWSEGMENT* aStroke ) const;
-    void saveDIMENTION( const DIMENSION* aDimension ) const;
+    void saveDIMENSION( const DIMENSION* aDimension ) const;
     void saveTRACK( const TRACK* aTrack ) const;
 
     /**

pcbnew/onleftclick.cpp

@@ -161,7 +161,7 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
         case PCB_TRACE_T:
         case PCB_VIA_T:
         case PCB_PAD_T:
-            GetBoard()->SetCurrentNetClass(
+            GetDesignSettings().SetCurrentNetClass(
                 ((BOARD_CONNECTED_ITEM*)DrawStruct)->GetNetClassName() );
             updateTraceWidthSelectBox();
             updateViaSizeSelectBox();

pcbnew/onrightclick.cpp

@@ -464,7 +464,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
     wxPoint  cursorPosition = GetCrossHairPosition();
     wxString msg;
 
-    GetBoard()->SetCurrentNetClass( Track->GetNetClassName() );
+    GetDesignSettings().SetCurrentNetClass( Track->GetNetClassName() );
     updateTraceWidthSelectBox();
     updateViaSizeSelectBox();
 
@@ -834,9 +834,9 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu )
     if( flags )     // Currently in edit, no others commands possible
         return;
 
-    if( GetBoard()->GetCurrentNetClassName() != Pad->GetNetClassName() )
+    if( GetDesignSettings().GetCurrentNetClassName() != Pad->GetNetClassName() )
     {
-        GetBoard()->SetCurrentNetClass( Pad->GetNetClassName() );
+        GetDesignSettings().SetCurrentNetClass( Pad->GetNetClassName() );
         updateTraceWidthSelectBox();
         updateViaSizeSelectBox();
     }

pcbnew/pcb_parser.cpp

@@ -808,7 +808,7 @@ void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
                  wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as setup." ) );
 
     T token;
-    NETCLASS* defaultNetclass = m_board->m_NetClasses.GetDefault();
+    NETCLASS* defaultNetClass = m_board->GetDesignSettings().m_NetClasses.GetDefault();
     // TODO Orson: is it really necessary to first operate on a copy and then apply it?
     // would not it be better to use reference here and apply all the changes instantly?
     BOARD_DESIGN_SETTINGS designSettings = m_board->GetDesignSettings();
@@ -834,7 +834,7 @@ void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
             break;
 
         case T_trace_clearance:
-            defaultNetclass->SetClearance( parseBoardUnits( T_trace_clearance ) );
+            defaultNetClass->SetClearance( parseBoardUnits( T_trace_clearance ) );
             NeedRIGHT();
             break;
 
@@ -864,12 +864,12 @@ void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
             break;
 
         case T_via_size:
-            defaultNetclass->SetViaDiameter( parseBoardUnits( T_via_size ) );
+            defaultNetClass->SetViaDiameter( parseBoardUnits( T_via_size ) );
             NeedRIGHT();
             break;
 
         case T_via_drill:
-            defaultNetclass->SetViaDrill( parseBoardUnits( T_via_drill ) );
+            defaultNetClass->SetViaDrill( parseBoardUnits( T_via_drill ) );
             NeedRIGHT();
             break;
 
@@ -893,12 +893,12 @@ void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
             break;
 
         case T_uvia_size:
-            defaultNetclass->SetuViaDiameter( parseBoardUnits( T_uvia_size ) );
+            defaultNetClass->SetuViaDiameter( parseBoardUnits( T_uvia_size ) );
             NeedRIGHT();
             break;
 
         case T_uvia_drill:
-            defaultNetclass->SetuViaDrill( parseBoardUnits( T_uvia_drill ) );
+            defaultNetClass->SetuViaDrill( parseBoardUnits( T_uvia_drill ) );
             NeedRIGHT();
             break;
 
@@ -1048,7 +1048,7 @@ void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
     //        at all, the global defaults should go into a preferences
     //        file instead so they are there to start new board
     //        projects.
-    m_board->m_NetClasses.GetDefault()->SetParams();
+    defaultNetClass->SetParams( m_board->GetDesignSettings() );
 }
 
 
@@ -1082,7 +1082,7 @@ void PCB_PARSER::parseNETCLASS() throw( IO_ERROR, PARSE_ERROR )
 
     T token;
 
-    std::auto_ptr<NETCLASS> nc( new NETCLASS( m_board, wxEmptyString ) );
+    std::auto_ptr<NETCLASS> nc( new NETCLASS( wxEmptyString ) );
 
     // Read netclass name (can be a name or just a number like track width)
     NeedSYMBOLorNUMBER();
@@ -1135,7 +1135,7 @@ void PCB_PARSER::parseNETCLASS() throw( IO_ERROR, PARSE_ERROR )
         NeedRIGHT();
     }
 
-    if( m_board->m_NetClasses.Add( nc.get() ) )
+    if( m_board->GetDesignSettings().m_NetClasses.Add( nc.get() ) )
     {
         nc.release();
     }

pcbnew/router/pns_router.cpp

@@ -70,7 +70,7 @@ public:
                 continue;
 
             wxString netClassName = ni->GetClassName();
-            NETCLASS* nc = aBoard->m_NetClasses.Find( netClassName );
+            NETCLASS* nc = aBoard->GetDesignSettings().m_NetClasses.Find( netClassName );
             int clearance = nc->GetClearance();
             m_clearanceCache[i] = clearance;
             TRACE( 1, "Add net %d netclass %s clearance %d", i % netClassName.mb_str() %

pcbnew/router/router_tool.cpp

@@ -115,11 +115,11 @@ void ROUTER_TOOL::getNetclassDimensions( int aNetCode, int& aWidth,
     if( ni )
     {
         wxString netClassName = ni->GetClassName();
-        netClass = board->m_NetClasses.Find( netClassName );
+        netClass = board->GetDesignSettings().m_NetClasses.Find( netClassName );
     }
 
     if( !netClass )
-        netClass = board->m_NetClasses.GetDefault();
+        netClass = board->GetDesignSettings().m_NetClasses.GetDefault();
 
     aWidth = netClass->GetTrackWidth();
     aViaDiameter = netClass->GetViaDiameter();

pcbnew/specctra_export.cpp

@@ -1476,9 +1476,10 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
     //-----<rules>--------------------------------------------------------
     {
         char        rule[80];
+        NETCLASS* defaultClass = aBoard->GetDesignSettings().m_NetClasses.GetDefault();
 
-        int         defaultTrackWidth   = aBoard->m_NetClasses.GetDefault()->GetTrackWidth();
-        int         defaultClearance    = aBoard->m_NetClasses.GetDefault()->GetClearance();
+        int         defaultTrackWidth   = defaultClass->GetTrackWidth();
+        int         defaultClearance    = defaultClass->GetClearance();
 
         double      clearance = scale( defaultClearance );
 
@@ -1829,7 +1830,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
 
     //-----< output vias used in netclasses >-----------------------------------
     {
-        NETCLASSES& nclasses = aBoard->m_NetClasses;
+        NETCLASSES& nclasses = aBoard->GetDesignSettings().m_NetClasses;
 
         // Assume the netclass vias are all the same kind of thru, blind, or buried vias.
         // This is in lieu of either having each netclass via have its own layer pair in
@@ -2039,7 +2040,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
 
 
     //-----<output NETCLASSs>----------------------------------------------------
-    NETCLASSES& nclasses = aBoard->m_NetClasses;
+    NETCLASSES& nclasses = aBoard->GetDesignSettings().m_NetClasses;
 
     exportNETCLASS( nclasses.GetDefault(), aBoard );
 

pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp

@@ -176,7 +176,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
      */
     EDA_RECT item_boundingbox;
     EDA_RECT zone_boundingbox  = GetBoundingBox();
-    int      biggest_clearance = aPcb->GetBiggestClearanceValue();
+    int      biggest_clearance = aPcb->GetDesignSettings().GetBiggestClearanceValue();
     biggest_clearance = std::max( biggest_clearance, zone_clearance );
     zone_boundingbox.Inflate( biggest_clearance );
 

pcbnew/zones_convert_to_polygons_aux_functions.cpp

@@ -138,7 +138,7 @@ void BuildUnconnectedThermalStubsPolygonList( CPOLYGONS_LIST& aCornerBuffer,
 
     EDA_RECT item_boundingbox;
     EDA_RECT zone_boundingbox  = aZone->GetBoundingBox();
-    int      biggest_clearance = aPcb->GetBiggestClearanceValue();
+    int      biggest_clearance = aPcb->GetDesignSettings().GetBiggestClearanceValue();
     biggest_clearance = std::max( biggest_clearance, zone_clearance );
     zone_boundingbox.Inflate( biggest_clearance );