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

rename occurances of type to maintype

Browse Source 
Avoids accidently overriding a python standard function
This commit is contained in:
Gabe R 2020-06-28 23:04:14 -05:00
parent 10978c85e2
commit d7a4d713e6
No known key found for this signature in database
GPG Key ID: F96D83D8D7ED67D0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wireviz/wireviz.py
View File

@ -70,7 +70,7 @@ class Harness:
if n.category == 'ferrule': if n.category == 'ferrule':
subtype = f', {n.subtype}' if n.subtype else '' subtype = f', {n.subtype}' if n.subtype else ''
color = wv_colors.translate_color(n.color, self.color_mode) if n.color else '' color = wv_colors.translate_color(n.color, self.color_mode) if n.color else ''
infostring = f'{n.type}{subtype} {color}' infostring = f'{n.maintype}{subtype} {color}'
infostring_l = infostring if n.ports_right else '' infostring_l = infostring if n.ports_right else ''
infostring_r = infostring if n.ports_left else '' infostring_r = infostring if n.ports_left else ''
@ -92,7 +92,7 @@ class Harness:
>'''.format(infostring_l=infostring_l, infostring_r=infostring_r, colorbar=colorbar)) >'''.format(infostring_l=infostring_l, infostring_r=infostring_r, colorbar=colorbar))
else: # not a ferrule else: # not a ferrule
attributes = [n.type, attributes = [n.maintype,
n.subtype, n.subtype,
f'{n.pincount}-pin' if n.show_pincount else''] f'{n.pincount}-pin' if n.show_pincount else'']
pinouts = [[], [], []] pinouts = [[], [], []]
@ -263,13 +263,13 @@ class Harness:
bom_connectors = [] bom_connectors = []
bom_cables = [] bom_cables = []
# connectors # connectors
types = Counter([(v.type, v.subtype, v.pincount) for v in self.connectors.values()]) types = Counter([(v.maintype, v.subtype, v.pincount) for v in self.connectors.values()])
for type in types: for maintype in types:
items = {k: v for k, v in self.connectors.items() if (v.type, v.subtype, v.pincount) == type} items = {k: v for k, v in self.connectors.items() if (v.maintype, v.subtype, v.pincount) == maintype}
shared = next(iter(items.values())) shared = next(iter(items.values()))
designators = list(items.keys()) designators = list(items.keys())
designators.sort() designators.sort()
conn_type = f', {shared.type}' if shared.type else '' conn_type = f', {shared.maintype}' if shared.maintype else ''
conn_subtype = f', {shared.subtype}' if shared.subtype else '' conn_subtype = f', {shared.subtype}' if shared.subtype else ''
conn_pincount = f', {shared.pincount} pins' if shared.category != 'ferrule' else '' conn_pincount = f', {shared.pincount} pins' if shared.category != 'ferrule' else ''
conn_color = f', {shared.color}' if shared.color else '' conn_color = f', {shared.color}' if shared.color else ''
@ -281,9 +281,9 @@ class Harness:
bom.extend(bom_connectors) bom.extend(bom_connectors)
# cables # cables
types = Counter([(v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) for v in self.cables.values()]) types = Counter([(v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) for v in self.cables.values()])
for type in types: for maintype in types:
items = {k: v for k, v in self.cables.items() if ( items = {k: v for k, v in self.cables.items() if (
v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) == type} v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) == maintype}
shared = next(iter(items.values())) shared = next(iter(items.values()))
if shared.category != 'bundle': if shared.category != 'bundle':
designators = list(items.keys()) designators = list(items.keys())
@ -298,8 +298,8 @@ class Harness:
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
types = Counter([(v.category, v.gauge, v.gauge_unit, v.length) for v in self.cables.values()]) types = Counter([(v.category, v.gauge, v.gauge_unit, v.length) for v in self.cables.values()])
for type in types: for maintype in types:
items = {k: v for k, v in self.cables.items() if (v.category, v.gauge, v.gauge_unit, v.length) == type} items = {k: v for k, v in self.cables.items() if (v.category, v.gauge, v.gauge_unit, v.length) == maintype}
shared = next(iter(items.values())) shared = next(iter(items.values()))
# filter out cables that are not bundles # filter out cables that are not bundles
if shared.category == 'bundle': if shared.category == 'bundle':
@ -310,8 +310,8 @@ class Harness:
'length': shared.length, 'color': color, 'designator': bundle.name}) 'length': shared.length, 'color': color, 'designator': bundle.name})
# join similar wires from all the bundles to a single BOM item # join similar wires from all the bundles to a single BOM item
types = Counter([(v['gauge'], v['gauge_unit'], v['color']) for v in wirelist]) types = Counter([(v['gauge'], v['gauge_unit'], v['color']) for v in wirelist])
for type in types: for maintype in types:
items = [v for v in wirelist if (v['gauge'], v['gauge_unit'], v['color']) == type] items = [v for v in wirelist if (v['gauge'], v['gauge_unit'], v['color']) == maintype]
shared = items[0] shared = items[0]
designators = [i['designator'] for i in items] designators = [i['designator'] for i in items]
# remove duplicates # remove duplicates
@ -345,7 +345,7 @@ class Harness:
class Connector: class Connector:
name: str name: str
category: Optional[str] = None category: Optional[str] = None
type: Optional[str] = None maintype: Optional[str] = None
subtype: Optional[str] = None subtype: Optional[str] = None
pincount: Optional[int] = None pincount: Optional[int] = None
notes: Optional[str] = None notes: Optional[str] = None
@ -396,7 +396,7 @@ class Connector:
class Cable: class Cable:
name: str name: str
category: Optional[str] = None category: Optional[str] = None
type: Optional[str] = None maintype: Optional[str] = None
gauge: Optional[float] = None gauge: Optional[float] = None
gauge_unit: Optional[str] = None gauge_unit: Optional[str] = None
show_equiv: bool = False show_equiv: bool = False