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

Remove bundle grouping as it is not needed for the wire grouping

Browse Source 
Grouping the bundles has no purpose, as the same
wires can be collected by just looping all bundles.
This commit is contained in:
KV 2020-07-05 00:07:25 +02:00
parent 6c4200e36c
commit e98ca81253
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wireviz/Harness.py
View File

@ -344,15 +344,12 @@ class Harness:
# bundles (ignores wirecount) # bundles (ignores wirecount)
wirelist = [] wirelist = []
# list all cables again, since bundles are represented as wires internally, with the category='bundle' set # list all cables again, since bundles are represented as wires internally, with the category='bundle' set
bundle_group = lambda b: (b.category, b.type, b.gauge, b.gauge_unit, b.length) # TODO: Maybe rename bundle to cable or maybe loop only [c for c in self.cables.values() if c.category == 'bundle']
groups = Counter([bundle_group(v) for v in self.cables.values() if v.category == 'bundle']) for bundle in self.cables.values():
for group in groups: if bundle.category == 'bundle':
items = {k: v for k, v in self.cables.items() if bundle_group(v) == group}
shared = next(iter(items.values()))
for bundle in items.values():
# add each wire from each bundle to the wirelist # add each wire from each bundle to the wirelist
for index, color in enumerate(bundle.colors, 0): for index, color in enumerate(bundle.colors, 0):
wirelist.append({'gauge': shared.gauge, 'gauge_unit': shared.gauge_unit, 'length': shared.length, 'color': color, 'designator': bundle.name, wirelist.append({'gauge': bundle.gauge, 'gauge_unit': bundle.gauge_unit, 'length': bundle.length, 'color': color, 'designator': bundle.name,
'manufacturer': bundle.manufacturer[index] if isinstance(bundle.manufacturer, list) else None, 'manufacturer': bundle.manufacturer[index] if isinstance(bundle.manufacturer, list) else None,
'manufacturer part number': bundle.manufacturer_part_number[index] if isinstance(bundle.manufacturer_part_number, list) else None, 'manufacturer part number': bundle.manufacturer_part_number[index] if isinstance(bundle.manufacturer_part_number, list) else None,
'internal part number': bundle.internal_part_number[index] if isinstance(bundle.internal_part_number, list) else None}) 'internal part number': bundle.internal_part_number[index] if isinstance(bundle.internal_part_number, list) else None})