From 7b3297e536235b8b40c07224398978905c23e5e2 Mon Sep 17 00:00:00 2001 From: Tyler Ward Date: Mon, 13 Jul 2020 00:29:37 +0100 Subject: [PATCH] clarify intent of bom addition varibles --- src/wireviz/Harness.py | 6 +++--- src/wireviz/wireviz.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 33b61ff..28f8b74 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -17,7 +17,7 @@ class Harness: self.color_mode = 'SHORT' self.connectors = {} self.cables = {} - self.bom_items = [] + self.additional_bom_items = [] def add_connector(self, name, *args, **kwargs): self.connectors[name] = Connector(name, *args, **kwargs) @@ -26,7 +26,7 @@ class Harness: self.cables[name] = Cable(name, *args, **kwargs) 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): 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.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 '' if isinstance(item.get('designators', None), List): item['designators'].sort() # sort designators if a list is provided diff --git a/src/wireviz/wireviz.py b/src/wireviz/wireviz.py index b48a3fc..518dcca 100755 --- a/src/wireviz/wireviz.py +++ b/src/wireviz/wireviz.py @@ -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] harness.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin) - if "bom" in yaml_data: - for line in yaml_data["bom"]: + if "additional_bom_items" in yaml_data: + for line in yaml_data["additional_bom_items"]: harness.add_bom_item(line)