v1.4.1 - resolve #25

Author: PaulZC

SparkFunKiCadPanelizer/dialog/dialog.py

@@ -158,10 +158,10 @@ def LoadSettings(self, params):
             if value is None:
                 continue
 
-            if self.vscore_layer in key:
+            if self.vscore_layer == key:
                 defaultLayerFound = False
                 for row in range(self.vscore.LayersGrid.GetNumberRows()):
-                    if value in self.vscore.LayersGrid.GetCellValue(row, 1):
+                    if (value == self.vscore.LayersGrid.GetCellValue(row, 1)) or ((value + " (") in self.vscore.LayersGrid.GetCellValue(row, 1)):
                         b = "1"
                         defaultLayerFound = True
                     else:
@@ -187,13 +187,14 @@ def CurrentSettings(self):
         params = {}
 
         for item in self.config_defaults.keys():
-            if self.vscore_layer in item:
+            if self.vscore_layer == item:
                 for row in range(self.vscore.LayersGrid.GetNumberRows()):
                     if self.vscore.LayersGrid.GetCellValue(row, 0) == "1":
                         layername = self.vscore.LayersGrid.GetCellValue(row, 1)
                         if " (" in layername:
                             layername = layername[:layername.find(" (")] # Trim the actual name - if present
                         params.update({self.vscore_layer: layername})
+                        break # Exit on the first "1" - just in case there are multiple (see #25)
             else:
                 obj = getattr(self.general, "m_{}".format(item))
                 if hasattr(obj, "GetValue"):

SparkFunKiCadPanelizer/panelizer/panelizer.py

@@ -363,11 +363,11 @@ def startPanelizer(self, args, board=None, ordering=None, logger=None):
         vScoreTextLayerNumber = None
         for i in range(numlayers):
             layertable[i] = {'standardName': board.GetStandardLayerName(i), 'actualName': board.GetLayerName(i)}
-            if "Edge.Cuts" in board.GetStandardLayerName(i):
+            if "Edge.Cuts" == board.GetStandardLayerName(i):
                 edgeLayerNumber = i
-            if V_SCORE_LAYER in board.GetStandardLayerName(i):
+            if V_SCORE_LAYER == board.GetStandardLayerName(i):
                 vScoreLayerNumber = i
-            if V_SCORE_TEXT_LAYER in board.GetStandardLayerName(i):
+            if V_SCORE_TEXT_LAYER == board.GetStandardLayerName(i):
                 vScoreTextLayerNumber = i
 
         if edgeLayerNumber is None:

SparkFunKiCadPanelizer/resource/_version.py

@@ -1 +1 @@
-__version__ = "1.4.0"
+__version__ = "1.4.1"