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

Add units to graph output

Browse Source
This commit is contained in:
Tyler Ward 2020-09-18 00:02:20 +01:00
parent 1a8942abaa
commit 94d6fc9015
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wireviz/Harness.py
View File

@ -112,10 +112,10 @@ class Harness:
elif extra['qty'] == 'connectioncount': elif extra['qty'] == 'connectioncount':
qty = sum(1 for value in connector.visible_pins.values() if value is True) qty = sum(1 for value in connector.visible_pins.values() if value is True)
else: else:
raise ValueError('invalid aty parameter') raise ValueError('invalid qty parameter {}'.format(extra["qty"]))
else: else:
qty = 1 qty = 1
rows.append([extra["type"], qty]) rows.append([extra["type"], f'{qty} {extra.get("unit", "")}'.strip()])
rows.append([f'P/N: {extra["pn"]}' if extra["pn"] else None, rows.append([f'P/N: {extra["pn"]}' if extra["pn"] else None,
html_line_breaks(manufacturer_info_field(extra.get("manufacturer", None), extra.get("mpn", None)))]) html_line_breaks(manufacturer_info_field(extra.get("manufacturer", None), extra.get("mpn", None)))])
rows.append([html_line_breaks(connector.notes)]) rows.append([html_line_breaks(connector.notes)])
@ -208,10 +208,10 @@ class Harness:
elif extra['qty'] == 'total_length': elif extra['qty'] == 'total_length':
qty = cable.length * cable.wirecount qty = cable.length * cable.wirecount
else: else:
raise ValueError('invalid aty parameter {}'.format(extra["qty"])) raise ValueError('invalid qty parameter {}'.format(extra["qty"]))
else: else:
qty = 1 qty = 1
rows.append([extra["type"], qty]) rows.append([extra["type"], f'{qty} {extra.get("unit", "")}'.strip()])
rows.append([f'P/N: {extra["pn"]}' if extra["pn"] else None, rows.append([f'P/N: {extra["pn"]}' if extra["pn"] else None,
html_line_breaks(manufacturer_info_field(extra.get("manufacturer", None), extra.get("mpn", None)))]) html_line_breaks(manufacturer_info_field(extra.get("manufacturer", None), extra.get("mpn", None)))])
rows.append([html_line_breaks(cable.notes)]) rows.append([html_line_breaks(cable.notes)])