Honour pre-defined-size selections for diff pairs.

Fixes https://gitlab.com/kicad/code/kicad/issues/7759

pcbnew/router/pns_kicad_iface.cpp

@@ -486,11 +486,11 @@ bool PNS_KICAD_IFACE_BASE::ImportSizes( PNS::SIZES_SETTINGS& aSizes, PNS::ITEM*
             diffPairViaGap = constraint.m_Value.Opt();
         }
     }
-    else if( bds.UseCustomDiffPairDimensions() )
+    else
     {
-        diffPairWidth  = bds.GetCustomDiffPairWidth();
-        diffPairGap    = bds.GetCustomDiffPairGap();
-        diffPairViaGap = bds.GetCustomDiffPairViaGap();
+        diffPairWidth  = bds.GetCurrentDiffPairWidth();
+        diffPairGap    = bds.GetCurrentDiffPairGap();
+        diffPairViaGap = bds.GetCurrentDiffPairViaGap();
     }
 
     //printf( "DPWidth: %d gap %d\n", diffPairWidth, diffPairGap );

pcbnew/router/pns_sizes_settings.cpp

@@ -22,9 +22,6 @@
 #include <board.h>
 
 #include "pns_item.h"
-#include "pns_via.h"
-#include "pns_solid.h"
-#include "pns_node.h"
 #include "pns_sizes_settings.h"
 
 namespace PNS {
@@ -46,20 +43,6 @@ void SIZES_SETTINGS::AddLayerPair( int aL1, int aL2 )
 }
 
 
-#if 0
-void SIZES_SETTINGS::ImportCurrent( BOARD_DESIGN_SETTINGS& aSettings )
-{
-    m_trackWidth = aSettings.GetCurrentTrackWidth();
-    m_viaDiameter = aSettings.GetCurrentViaSize();
-    m_viaDrill = aSettings.GetCurrentViaDrill();
-
-    m_diffPairWidth = aSettings.GetCurrentDiffPairWidth();
-    m_diffPairGap = aSettings.GetCurrentDiffPairGap();
-    m_diffPairViaGap = aSettings.GetCurrentDiffPairViaGap();
-}
-#endif
-
-
 int SIZES_SETTINGS::GetLayerTop() const
 {
     if( m_layerPairs.empty() )