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

Allow multiple colors for components

Browse Source
This commit is contained in:
Daniel Rojas 2021-10-31 13:08:56 +01:00 committed by KV
parent 2ede4f5a08
commit 2fc132bdb9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wireviz/wv_dataclasses.py
View File

@ -309,7 +309,7 @@ class GraphicalComponent(Component): # abstract class, for future use
class TopLevelGraphicalComponent(GraphicalComponent): # abstract class class TopLevelGraphicalComponent(GraphicalComponent): # abstract class
# component properties # component properties
designator: Designator = None designator: Designator = None
color: Optional[SingleColor] = None color: Optional[MultiColor] = None
image: Optional[Image] = None image: Optional[Image] = None
additional_components: List[AdditionalComponent] = field(default_factory=list) additional_components: List[AdditionalComponent] = field(default_factory=list)
notes: Optional[MultilineHypertext] = None notes: Optional[MultilineHypertext] = None
@ -367,7 +367,7 @@ class Connector(TopLevelGraphicalComponent):
self.bgcolor = SingleColor(self.bgcolor) self.bgcolor = SingleColor(self.bgcolor)
self.bgcolor_title = SingleColor(self.bgcolor_title) self.bgcolor_title = SingleColor(self.bgcolor_title)
self.color = SingleColor(self.color) self.color = MultiColor(self.color)
# connectors do not support custom qty or amount # connectors do not support custom qty or amount
self.qty = NumberAndUnit(1, None) self.qty = NumberAndUnit(1, None)
@ -637,7 +637,7 @@ class Cable(TopLevelGraphicalComponent):
self.bgcolor = SingleColor(self.bgcolor) self.bgcolor = SingleColor(self.bgcolor)
self.bgcolor_title = SingleColor(self.bgcolor_title) self.bgcolor_title = SingleColor(self.bgcolor_title)
self.color = SingleColor(self.color) self.color = MultiColor(self.color)
if isinstance(self.image, dict): if isinstance(self.image, dict):
self.image = Image(**self.image) self.image = Image(**self.image)

11
src/wireviz/wv_graphviz.py
View File

@ -450,7 +450,16 @@ def colored_cell(contents, bgcolor) -> Td:
def colorbar_cell(color) -> Td: def colorbar_cell(color) -> Td:
return Td("", bgcolor=color.html, width=4) # return Td("", bgcolor=color.html, width=4)
cells = [
Td(
"",
bgcolor=subcolor.html,
width=8,
)
for subcolor in color.colors
]
return Td(Table(Tr(cells), border=0, cellspacing=0), cellspacing=0, cellpadding=0)
def color_minitable(color: Optional[MultiColor]) -> Union[Table, str]: def color_minitable(color: Optional[MultiColor]) -> Union[Table, str]: