From 94d6fc9015bc0ba7bcb4c8d67088c55ad9854840 Mon Sep 17 00:00:00 2001 From: Tyler Ward Date: Fri, 18 Sep 2020 00:02:20 +0100 Subject: [PATCH] Add units to graph output --- src/wireviz/Harness.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 1a02538..39efd06 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -112,10 +112,10 @@ class Harness: elif extra['qty'] == 'connectioncount': qty = sum(1 for value in connector.visible_pins.values() if value is True) else: - raise ValueError('invalid aty parameter') + raise ValueError('invalid qty parameter {}'.format(extra["qty"])) else: 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, html_line_breaks(manufacturer_info_field(extra.get("manufacturer", None), extra.get("mpn", None)))]) rows.append([html_line_breaks(connector.notes)]) @@ -208,10 +208,10 @@ class Harness: elif extra['qty'] == 'total_length': qty = cable.length * cable.wirecount else: - raise ValueError('invalid aty parameter {}'.format(extra["qty"])) + raise ValueError('invalid qty parameter {}'.format(extra["qty"])) else: 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, html_line_breaks(manufacturer_info_field(extra.get("manufacturer", None), extra.get("mpn", None)))]) rows.append([html_line_breaks(cable.notes)])