From fc159a2238b67ec1ed2d75edd84a96bdeb38855a Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Wed, 15 Jul 2020 19:46:48 -0300
Subject: [PATCH] Fix DNC (isFixed)
Now that prefs.pcbConfig is a list we can't do:
opt[1:].lower() == self.prefs.pcbConfig.lower()
I also figured out that there is no need to check for pcbConfig
Additionally this patch inverts the return value so the name of the
function makes sense (was inverted).
---
kibom/component.py | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/kibom/component.py b/kibom/component.py
index 2eef873..dc9abc7 100644
--- a/kibom/component.py
+++ b/kibom/component.py
@@ -322,40 +322,30 @@ def isFitted(self):
return include and not exclude
- # Determine if a component is FIXED or not
def isFixed(self):
-
- check = self.getField(self.prefs.configField).lower()
+ """ Determine if a component is FIXED or not.
+ Fixed components shouldn't be replaced without express authorization """
# Check the value field first
if self.getValue().lower() in DNC:
- return False
+ return True
+ check = self.getField(self.prefs.configField).lower()
# Empty is not fixed
if check == "":
- return True
+ return False
opts = check.split(" ")
for opt in opts:
if opt.lower() in DNC:
- return False
+ return True
opts = check.split(",")
-
- result = False
-
for opt in opts:
- # Options that start with '-' are explicitly removed from certain configurations
- if opt.startswith('-') and opt[1:].lower() == self.prefs.pcbConfig.lower():
- result = False
- break
- if opt.startswith("+"):
- result = False
- if opt[1:].lower() == self.prefs.pcbConfig.lower():
- result = True
+ if opt.lower() in DNC:
+ return True
- # by default, part is not fixed
- return result
+ return False
# Test if this part should be included, based on any regex expressions provided in the preferences
def testRegExclude(self):
@@ -593,7 +583,7 @@ def updateFields(self, usealt=False, wrapN=None):
self.fields[ColumnList.COL_GRP_QUANTITY] = "{n}{dnf}{dnc}".format(
n=q,
dnf=" (DNF)" if not self.isFitted() else "",
- dnc=" (DNC)" if not self.isFixed() else "")
+ dnc=" (DNC)" if self.isFixed() else "")
self.fields[ColumnList.COL_GRP_BUILD_QUANTITY] = str(q * self.prefs.boards) if self.isFitted() else "0"
self.fields[ColumnList.COL_VALUE] = self.components[0].getValue()