warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clarify intent of bom addition varibles

Browse Source
This commit is contained in:
Tyler Ward 2020-07-13 00:29:37 +01:00
parent 6309c86307
commit 7b3297e536
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wireviz/Harness.py
View File

@ -17,7 +17,7 @@ class Harness:
self.color_mode = 'SHORT' self.color_mode = 'SHORT'
self.connectors = {} self.connectors = {}
self.cables = {} self.cables = {}
self.bom_items = [] self.additional_bom_items = []
def add_connector(self, name, *args, **kwargs): def add_connector(self, name, *args, **kwargs):
self.connectors[name] = Connector(name, *args, **kwargs) self.connectors[name] = Connector(name, *args, **kwargs)
@ -26,7 +26,7 @@ class Harness:
self.cables[name] = Cable(name, *args, **kwargs) self.cables[name] = Cable(name, *args, **kwargs)
def add_bom_item(self, item): def add_bom_item(self, item):
self.bom_items.append(item) self.additional_bom_items.append(item)
def connect(self, from_name, from_pin, via_name, via_pin, to_name, to_pin): def connect(self, from_name, from_pin, via_name, via_pin, to_name, to_pin):
for (name, pin) in zip([from_name, to_name], [from_pin, to_pin]): # check from and to connectors for (name, pin) in zip([from_name, to_name], [from_pin, to_pin]): # check from and to connectors
@ -385,7 +385,7 @@ class Harness:
bom_cables = sorted(bom_cables, key=lambda k: k['item']) # sort list of dicts by their values (https://stackoverflow.com/a/73050) bom_cables = sorted(bom_cables, key=lambda k: k['item']) # sort list of dicts by their values (https://stackoverflow.com/a/73050)
bom.extend(bom_cables) bom.extend(bom_cables)
for item in self.bom_items: for item in self.additional_bom_items:
name = item['description'] if item.get('description', None) else '' name = item['description'] if item.get('description', None) else ''
if isinstance(item.get('designators', None), List): if isinstance(item.get('designators', None), List):
item['designators'].sort() # sort designators if a list is provided item['designators'].sort() # sort designators if a list is provided

4
src/wireviz/wireviz.py
View File

@ -169,8 +169,8 @@ def parse(yaml_input, file_out=None, return_types: (None, str, Tuple[str]) = Non
to_pin = connection_list[i+1][j][1] to_pin = connection_list[i+1][j][1]
harness.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin) harness.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin)
if "bom" in yaml_data: if "additional_bom_items" in yaml_data:
for line in yaml_data["bom"]: for line in yaml_data["additional_bom_items"]:
harness.add_bom_item(line) harness.add_bom_item(line)