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

Merge 5e4271df1c22e5f73b81ef2b34f915657d4bbb25 into e4fe099f8c7b86736aee7b4227cc794b6e8b36f0

Browse Source
This commit is contained in:
Martin Rieder 2025-02-15 23:33:24 +01:00 committed by GitHub
commit 6e0db88962
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wireviz/DataClasses.py
View File

@ -253,6 +253,7 @@ class Cable:
spn: Union[MultilineHypertext, List[MultilineHypertext], None] = None spn: Union[MultilineHypertext, List[MultilineHypertext], None] = None
pn: Union[Hypertext, List[Hypertext], None] = None pn: Union[Hypertext, List[Hypertext], None] = None
category: Optional[str] = None category: Optional[str] = None
style: Optional[str] = None
type: Optional[MultilineHypertext] = None type: Optional[MultilineHypertext] = None
gauge: Optional[float] = None gauge: Optional[float] = None
gauge_unit: Optional[str] = None gauge_unit: Optional[str] = None
@ -270,6 +271,7 @@ class Cable:
show_name: Optional[bool] = None show_name: Optional[bool] = None
show_wirecount: bool = True show_wirecount: bool = True
show_wirenumbers: Optional[bool] = None show_wirenumbers: Optional[bool] = None
show_colorname: bool = True
ignore_in_bom: bool = False ignore_in_bom: bool = False
additional_components: List[AdditionalComponent] = field(default_factory=list) additional_components: List[AdditionalComponent] = field(default_factory=list)
@ -362,9 +364,14 @@ 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")
if self.show_name is None: if self.show_name is None:
# hide designators for auto-generated cables by default # hide designators for simple and for auto-generated cables by default
self.show_name = self.name[0:2] != "__" self.show_name = self.style != "simple" and self.name[0:2] != "__"
if self.show_wirecount is None:
# hide wirecount for simple (1 pin) connectors by default
self.show_wirecount = self.style != "simple"
if self.show_wirenumbers is None: if self.show_wirenumbers is None:
# by default, show wire numbers for cables, hide for bundles # by default, show wire numbers for cables, hide for bundles

2
src/wireviz/Harness.py
View File

@ -352,7 +352,7 @@ class Harness:
colorstr = wv_colors.translate_color( colorstr = wv_colors.translate_color(
connection_color, self.options.color_mode connection_color, self.options.color_mode
) )
if colorstr: if colorstr and cable.show_colorname:
wireinfo.append(colorstr) wireinfo.append(colorstr)
if cable.wirelabels: if cable.wirelabels:
wireinfo.append(wirelabel if wirelabel is not None else "") wireinfo.append(wirelabel if wirelabel is not None else "")