Исключать компоненты с атрибутом 'Exclude from bill of materials'.

baranovskiykonstantin · Jun 11, 2022 · b7be793 · b7be793
1 parent e839ef0
commit b7be793
Show file tree

Hide file tree

Showing 14 changed files with 442 additions and 399 deletions.
diff --git a/bom/Scripts/python/doc/help.html b/bom/Scripts/python/doc/help.html
diff --git a/bom/Scripts/python/pythonpath/schematic.py b/bom/Scripts/python/pythonpath/schematic.py
@@ -702,6 +702,7 @@ def __init__(self, netlistName):
         for comp in netlist.items("comp"):
             component = Component(self)
             component.reference = comp.attributes["ref"]
+            skip = False
             for item in comp.items:
                 if item.name == "value":
                     component.value = item.text if item.text is not None and item.text != "~" else ""
@@ -716,7 +717,12 @@ def __init__(self, netlistName):
                     for field in item.items:
                         fieldName = field.attributes["name"]
                         component.fields[fieldName] = field.text if field.text is not None and field.text != "~" else ""
-            self.components.append(component)
+                elif item.name == "property":
+                    if item.attributes["name"] == "exclude_from_bom":
+                        skip = True
+                        break
+            if not skip:
+                self.components.append(component)
 
     def getGroupedComponents(self):
         """Вернуть компоненты, сгруппированные по типу."""

diff --git a/gbom/Scripts/python/doc/help.html b/gbom/Scripts/python/doc/help.html
diff --git a/gbom/Scripts/python/pythonpath/schematic.py b/gbom/Scripts/python/pythonpath/schematic.py
@@ -702,6 +702,7 @@ def __init__(self, netlistName):
         for comp in netlist.items("comp"):
             component = Component(self)
             component.reference = comp.attributes["ref"]
+            skip = False
             for item in comp.items:
                 if item.name == "value":
                     component.value = item.text if item.text is not None and item.text != "~" else ""
@@ -716,7 +717,12 @@ def __init__(self, netlistName):
                     for field in item.items:
                         fieldName = field.attributes["name"]
                         component.fields[fieldName] = field.text if field.text is not None and field.text != "~" else ""
-            self.components.append(component)
+                elif item.name == "property":
+                    if item.attributes["name"] == "exclude_from_bom":
+                        skip = True
+                        break
+            if not skip:
+                self.components.append(component)
 
     def getGroupedComponents(self):
         """Вернуть компоненты, сгруппированные по типу."""

diff --git a/gspec/Scripts/python/doc/help.html b/gspec/Scripts/python/doc/help.html
diff --git a/gspec/Scripts/python/pythonpath/schematic.py b/gspec/Scripts/python/pythonpath/schematic.py
@@ -808,6 +808,7 @@ def __init__(self, netlistName):
         for comp in netlist.items("comp"):
             component = Component(self)
             component.reference = comp.attributes["ref"]
+            skip = False
             for item in comp.items:
                 if item.name == "value":
                     component.value = item.text if item.text is not None and item.text != "~" else ""
@@ -822,7 +823,12 @@ def __init__(self, netlistName):
                     for field in item.items:
                         fieldName = field.attributes["name"]
                         component.fields[fieldName] = field.text if field.text is not None and field.text != "~" else ""
-            self.components.append(component)
+                elif item.name == "property":
+                    if item.attributes["name"] == "exclude_from_bom":
+                        skip = True
+                        break
+            if not skip:
+                self.components.append(component)
 
     def getGroupedComponents(self):
         """Вернуть компоненты, сгруппированные по типу."""

diff --git a/index/Scripts/python/doc/help.html b/index/Scripts/python/doc/help.html
diff --git a/index/Scripts/python/pythonpath/schematic.py b/index/Scripts/python/pythonpath/schematic.py
@@ -698,6 +698,7 @@ def __init__(self, netlistName):
         for comp in netlist.items("comp"):
             component = Component(self)
             component.reference = comp.attributes["ref"]
+            skip = False
             for item in comp.items:
                 if item.name == "value":
                     component.value = item.text if item.text is not None and item.text != "~" else ""
@@ -712,7 +713,12 @@ def __init__(self, netlistName):
                     for field in item.items:
                         fieldName = field.attributes["name"]
                         component.fields[fieldName] = field.text if field.text is not None and field.text != "~" else ""
-            self.components.append(component)
+                elif item.name == "property":
+                    if item.attributes["name"] == "exclude_from_bom":
+                        skip = True
+                        break
+            if not skip:
+                self.components.append(component)
 
     def getGroupedComponents(self):
         """Вернуть компоненты, сгруппированные по обозначению и типу."""