From 0252476248d28035b121c00a0da8ce29dd9f9dfd Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Sun, 5 Jul 2020 20:07:46 +0200 Subject: [PATCH] Fix bug in bundle wire BOM generation --- src/wireviz/Harness.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 37a8043..bbd1034 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -343,7 +343,7 @@ class Harness: if bundle.category == 'bundle': # add each wire from each bundle to the wirelist for index, color in enumerate(bundle.colors, 0): - wirelist.append({'gauge': bundle.gauge, 'gauge_unit': bundle.gauge_unit, 'length': bundle.length, 'color': color, 'designator': bundle.name, + wirelist.append({'type': bundle.type, 'gauge': bundle.gauge, 'gauge_unit': bundle.gauge_unit, 'length': bundle.length, 'color': color, 'designator': bundle.name, 'manufacturer': index_if_list(bundle.manufacturer, index), 'manufacturer part number': index_if_list(bundle.manufacturer_part_number, index), 'internal part number': index_if_list(bundle.internal_part_number, index)}) @@ -356,8 +356,8 @@ class Harness: designators = list(dict.fromkeys(designators)) # remove duplicates designators.sort() total_length = sum(i['length'] for i in items) - wire_type = f', {remove_line_breaks(shared["type"])}' if 'type' in shared else '' - gauge_name = f', {shared["gauge"]} {shared["gauge_unit"]}' if 'gauge' in shared else '' + wire_type = f', {remove_line_breaks(shared["type"])}' if shared.get('type', None) else '' + gauge_name = f', {shared["gauge"]} {shared["gauge_unit"]}' if shared.get('gauge', None) else '' gauge_color = f', {shared["color"]}' if 'color' in shared != '' else '' name = f'Wire{wire_type}{gauge_name}{gauge_color}' item = {'item': name, 'qty': round(total_length, 3), 'unit': 'm', 'designators': designators,