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

Hide names for auto-generated items

Browse Source 
Both connectors and cables.
Auto-generated designators now start with `__` instead of `_`.
This commit is contained in:
Daniel Rojas 2020-11-15 20:38:47 +01:00
parent 347f7dbd56
commit 45a45dc69e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wireviz/DataClasses.py
View File

@ -133,7 +133,8 @@ class Connector:
raise Exception('Pins are not unique') raise Exception('Pins are not unique')
if self.show_name is None: if self.show_name is None:
self.show_name = self.style != 'simple' # hide designators for simple connectors by default # hide designators for simple and for auto-generated connectors by default
self.show_name = (self.style != 'simple' and self.name[0:2] != '__')
if self.show_pincount is None: if self.show_pincount is None:
self.show_pincount = self.style != 'simple' # hide pincount for simple (1 pin) connectors by default self.show_pincount = self.style != 'simple' # hide pincount for simple (1 pin) connectors by default
@ -183,7 +184,7 @@ class Cable:
colors: List[Colors] = field(default_factory=list) colors: List[Colors] = field(default_factory=list)
wirelabels: List[Wire] = field(default_factory=list) wirelabels: List[Wire] = field(default_factory=list)
color_code: Optional[ColorScheme] = None color_code: Optional[ColorScheme] = None
show_name: bool = True show_name: Optional[bool] = None
show_wirecount: bool = True show_wirecount: bool = True
show_wirenumbers: Optional[bool] = None show_wirenumbers: Optional[bool] = None
ignore_in_bom: bool = False ignore_in_bom: bool = False
@ -249,9 +250,11 @@ class Cable:
else: else:
raise Exception('lists of part data are only supported for bundles') raise Exception('lists of part data are only supported for bundles')
# by default, show wire numbers for cables, hide for bundles if self.show_name is None:
self.show_name = self.name[0:2] != '__' # hide designators for auto-generated cables by default
if not self.show_wirenumbers: if not self.show_wirenumbers:
self.show_wirenumbers = self.category != 'bundle' self.show_wirenumbers = self.category != 'bundle' # by default, show wire numbers for cables, hide for bundles
for i, item in enumerate(self.additional_components): for i, item in enumerate(self.additional_components):
if isinstance(item, dict): if isinstance(item, dict):

2
src/wireviz/wireviz.py
View File

@ -80,7 +80,7 @@ def parse(yaml_input: str, file_out: (str, Path) = None, return_types: (None, st
template, designator = inp.split('.') # TODO: handle more than one `.` template, designator = inp.split('.') # TODO: handle more than one `.`
if designator == '': if designator == '':
autogenerated_designators[template] = autogenerated_designators.get(template, 0) + 1 autogenerated_designators[template] = autogenerated_designators.get(template, 0) + 1
designator = f'_{template}_{autogenerated_designators[template]}' designator = f'__{template}_{autogenerated_designators[template]}'
# check if redefining existing component to different template # check if redefining existing component to different template
if designator in designators_and_templates: if designator in designators_and_templates:
if designators_and_templates[designator] != template: if designators_and_templates[designator] != template: