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

add length_unit

Browse Source 
- partial fix for #7
- based on and closes #161 and #162
This commit is contained in:
Steve Traugott 2020-10-05 00:26:38 -07:00
parent 14c6103d31
commit 32cb73b483
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wireviz/DataClasses.py
View File

@ -88,7 +88,7 @@ class Cable:
gauge_unit: Optional[str] = None gauge_unit: Optional[str] = None
show_equiv: bool = False show_equiv: bool = False
length: float = 0 length: float = 0
lengthunit: Optional[str] = None length_unit: Optional[str] = None
color: Optional[str] = None color: Optional[str] = None
wirecount: Optional[int] = None wirecount: Optional[int] = None
shield: bool = False shield: bool = False
@ -120,8 +120,8 @@ class Cable:
self.connections = [] self.connections = []
if self.lengthunit is None: #Default wire length units to meters if left undeclared if self.length_unit is None: #Default wire length units to meters if left undeclared
self.lengthunit = 'm' self.length_unit = 'm'
if self.wirecount: # number of wires explicitly defined if self.wirecount: # number of wires explicitly defined
if self.colors: # use custom color palette (partly or looped if needed) if self.colors: # use custom color palette (partly or looped if needed)

4
src/wireviz/Harness.py
View File

@ -170,7 +170,7 @@ class Harness:
f'{cable.wirecount}x' if cable.show_wirecount else None, f'{cable.wirecount}x' if cable.show_wirecount else None,
f'{cable.gauge} {cable.gauge_unit}{awg_fmt}' if cable.gauge else None, f'{cable.gauge} {cable.gauge_unit}{awg_fmt}' if cable.gauge else None,
'+ S' if cable.shield else None, '+ S' if cable.shield else None,
f'{cable.length} {cable.lengthunit}' if cable.length > 0 else None, f'{cable.length} {cable.length_unit}' if cable.length > 0 else None,
cable.color, '<!-- colorbar -->' if cable.color else None], cable.color, '<!-- colorbar -->' if cable.color else None],
'<!-- wire table -->', '<!-- wire table -->',
[html_line_breaks(cable.notes)]] [html_line_breaks(cable.notes)]]
@ -365,7 +365,7 @@ class Harness:
gauge_name = f' x {shared.gauge} {shared.gauge_unit}' if shared.gauge else ' wires' gauge_name = f' x {shared.gauge} {shared.gauge_unit}' if shared.gauge else ' wires'
shield_name = ' shielded' if shared.shield else '' shield_name = ' shielded' if shared.shield else ''
name = f'Cable{cable_type}, {shared.wirecount}{gauge_name}{shield_name}' name = f'Cable{cable_type}, {shared.wirecount}{gauge_name}{shield_name}'
item = {'item': name, 'qty': round(total_length, 3), 'unit': shared.lengthunit, 'designators': designators, item = {'item': name, 'qty': round(total_length, 3), 'unit': shared.length_unit, 'designators': designators,
'manufacturer': remove_line_breaks(shared.manufacturer), 'mpn': remove_line_breaks(shared.mpn), 'pn': shared.pn} 'manufacturer': remove_line_breaks(shared.manufacturer), 'mpn': remove_line_breaks(shared.mpn), 'pn': shared.pn}
bom_cables.append(item) bom_cables.append(item)
# bundles (ignores wirecount) # bundles (ignores wirecount)