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

Moved bom entry description generation to be in order of aperance

Browse Source
This commit is contained in:
Tyler Ward 2020-10-06 01:16:12 +01:00
parent cb3e3f44e8
commit b7f184e79c
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/wireviz/Harness.py
View File

@ -374,14 +374,15 @@ class Harness:
# connectors # connectors
for connector in self.connectors.values(): for connector in self.connectors.values():
if not connector.ignore_in_bom: if not connector.ignore_in_bom:
conn_type = f', {connector.type}' if connector.type else '' description = ('Connector'
conn_subtype = f', {connector.subtype}' if connector.subtype else '' + (f', {connector.type}' if connector.type else '')
conn_pincount = f', {connector.pincount} pins' if connector.style != 'simple' else '' + (f', {connector.subtype}' if connector.subtype else '')
conn_color = f', {connector.color}' if connector.color else '' + (f', {connector.pincount} pins' if connector.show_pincount else '')
description = f'Connector{conn_type}{conn_subtype}{conn_pincount}{conn_color}' + (f', {connector.color}' if connector.color else ''))
entry = {'item': description, 'qty': 1, 'unit': '', 'designators': connector.name if connector.show_name else None, bom_entries.append({
'manufacturer': connector.manufacturer, 'mpn': connector.mpn, 'pn': connector.pn} 'item': description, 'qty': 1, 'unit': '', 'designators': connector.name if connector.show_name else None,
bom_entries.append(entry) 'manufacturer': connector.manufacturer, 'mpn': connector.mpn, 'pn': connector.pn
})
# add connectors aditional components to bom # add connectors aditional components to bom
bom_entries.extend(self.get_additional_component_bom(connector)) bom_entries.extend(self.get_additional_component_bom(connector))
@ -390,33 +391,38 @@ class Harness:
# TODO: If category can have other non-empty values than 'bundle', maybe it should be part of item name? # TODO: If category can have other non-empty values than 'bundle', maybe it should be part of item name?
for cable in self.cables.values(): for cable in self.cables.values():
if not cable.ignore_in_bom: if not cable.ignore_in_bom:
# create description fields used by both cables and bundles
cable_type = f', {cable.type}' if cable.type else ''
cable_gauge = f' x {cable.gauge} {cable.gauge_unit}' if cable.gauge else ' wires'
if cable.category != 'bundle': if cable.category != 'bundle':
# process cable as a single entity # process cable as a single entity
cable_shield = ' shielded' if cable.shield else '' description = ('Cable'
name = f'Cable{cable_type}, {cable.wirecount}{cable_gauge}{cable_shield}' + (f', {cable.type}' if cable.type else '')
entry = {'item': name, 'qty': cable.length, 'unit': 'm', 'designators': cable.name if cable.show_name else None, + (f', {cable.wirecount}')
'manufacturer': cable.manufacturer, 'mpn': cable.mpn, 'pn': cable.pn} + (f' x {cable.gauge} {cable.gauge_unit}' if cable.gauge else ' wires')
bom_entries.append(entry) + (' shielded' if cable.shield else ''))
bom_entries.append({
'item': description, 'qty': cable.length, 'unit': 'm', 'designators': cable.name if cable.show_name else None,
'manufacturer': cable.manufacturer, 'mpn': cable.mpn, 'pn': cable.pn
})
else: else:
# add each wire from the bundle to the bom # add each wire from the bundle to the bom
for index, color in enumerate(cable.colors): for index, color in enumerate(cable.colors):
wire_color = f', {color}' if color else '' description = ('Wire'
description = f'Wire{cable_type}{cable_gauge}{wire_color}' + (f', {cable.type}' if cable.type else '')
entry = {'item': description, 'qty': cable.length, 'unit': 'm', 'designators': cable.name if cable.show_name else None, + (f', {cable.gauge} {cable.gauge_unit}' if cable.gauge else '')
+ (f', {color}' if color else ''))
bom_entries.append({
'item': description, 'qty': cable.length, 'unit': 'm', 'designators': cable.name if cable.show_name else None,
'manufacturer': index_if_list(cable.manufacturer, index), 'manufacturer': index_if_list(cable.manufacturer, index),
'mpn': index_if_list(cable.mpn, index), 'pn': index_if_list(cable.pn, index)} 'mpn': index_if_list(cable.mpn, index), 'pn': index_if_list(cable.pn, index)
bom_entries.append(entry) })
# add cable/bundles aditional components to bom # add cable/bundles aditional components to bom
bom_entries.extend(self.get_additional_component_bom(cable)) bom_entries.extend(self.get_additional_component_bom(cable))
for item in self.additional_bom_items: for item in self.additional_bom_items:
entry = {'item': item.get('description', ''), 'qty': item.get('qty'), 'unit': item.get('unit'), 'designators': item.get('designators'), bom_entries.append({
'manufacturer': item.get('manufacturer'), 'mpn': item.get('mpn'), 'pn': item.get('pn')} 'item': item.get('description', ''), 'qty': item.get('qty'), 'unit': item.get('unit'), 'designators': item.get('designators'),
bom_entries.append(entry) 'manufacturer': item.get('manufacturer'), 'mpn': item.get('mpn'), 'pn': item.get('pn')
})
# deduplicate bom # deduplicate bom
bom_types_group = lambda bt: (bt['item'], bt['unit'], bt['manufacturer'], bt['mpn'], bt['pn']) bom_types_group = lambda bt: (bt['item'], bt['unit'], bt['manufacturer'], bt['mpn'], bt['pn'])
@ -433,9 +439,10 @@ class Harness:
designators = list(dict.fromkeys(designators)) # remove duplicates designators = list(dict.fromkeys(designators)) # remove duplicates
designators.sort() designators.sort()
total_qty = sum(i['qty'] for i in group_entries) total_qty = sum(i['qty'] for i in group_entries)
entry = {'item': shared['item'], 'qty': round(total_qty, 3), 'unit': shared['unit'], 'designators': designators, self._bom.append({
'manufacturer': shared['manufacturer'], 'mpn': shared['mpn'], 'pn': shared['pn']} 'item': shared['item'], 'qty': round(total_qty, 3), 'unit': shared['unit'], 'designators': designators,
self._bom.append(entry) 'manufacturer': shared['manufacturer'], 'mpn': shared['mpn'], 'pn': shared['pn']
})
self._bom = sorted(self._bom, key=lambda k: k['item']) # sort list of dicts by their values (https://stackoverflow.com/a/73050) self._bom = sorted(self._bom, key=lambda k: k['item']) # sort list of dicts by their values (https://stackoverflow.com/a/73050)
# add index # add index