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

Alphabetize HTML tags, improve bgcolor rendering

Browse Source
This commit is contained in:
Daniel Rojas 2021-10-19 19:40:36 +02:00 committed by KV
parent d9513865e2
commit 9e6d327c15
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wireviz/Harness.py
View File

@ -39,6 +39,7 @@ from wireviz.wv_gv_html import (
gv_node_component,
html_line_breaks,
remove_links,
calculate_node_bgcolor,
set_dot_basics,
)
from wireviz.wv_helper import (
@ -164,8 +165,9 @@ class Harness:
for connector in self.connectors.values():
# generate connector node
gv_html = gv_node_component(connector, self.options)
bgcolor = calculate_node_bgcolor(connector, self.options)
dot.node(
connector.name, label=f"<\n{gv_html}\n>", shape="box", style="filled"
connector.name, label=f"<\n{gv_html}\n>", bgcolor=bgcolor, shape="box", style="filled"
)
# generate edges for connector loops
if len(connector.loops) > 0:
@ -188,10 +190,9 @@ class Harness:
# generate cable node
# TODO: PN info for bundles (per wire)
gv_html = gv_node_component(cable, self.options)
dot.node(cable.name, label=f"<\n{gv_html}\n>", shape="box")
# style=style,
# fillcolor=translate_color(bgcolor, "HEX"),
# generate edges for wires in cable
bgcolor = calculate_node_bgcolor(cable, self.options)
style = "filled,dashed" if cable.category == "bundle" else "filled"
dot.node(cable.name, label=f"<\n{gv_html}\n>", bgcolor=bgcolor, shape="box", style=style)
for connection in cable.connections:
color, l1, l2, r1, r2 = gv_edge_wire(self, cable, connection)
dot.attr("edge", color=color)
@ -200,11 +201,6 @@ class Harness:
if not (r1, r2) == (None, None):
dot.edge(r1, r2)
style, bgcolor = (
("filled,dashed", self.options.bgcolor_bundle)
if cable.category == "bundle"
else ("filled", self.options.bgcolor_cable)
)
apply_dot_tweaks(dot, self.tweak)

45
src/wireviz/wv_gv_html.py
View File

@ -86,18 +86,24 @@ def gv_node_component(
line_notes,
]
if component.bgcolor:
tbl_bgcolor = translate_color(component.bgcolor, "HEX")
elif isinstance(component, Connector) and harness_options.bgcolor_connector:
tbl_bgcolor = translate_color(harness_options.bgcolor_connector, "HEX")
elif isinstance(component, Cable) and harness_options.bgcolor_cable:
tbl_bgcolor = translate_color(harness_options.bgcolor_cable, "HEX")
tbl = nested_table(lines)
tbl.update_attribs(bgcolor=tbl_bgcolor)
return tbl
def calculate_node_bgcolor(component, harness_options):
# assign component node bgcolor at the GraphViz node level
# instead of at the HTML table level for better rendering of node outline
if component.bgcolor:
return translate_color(component.bgcolor, "HEX")
elif isinstance(component, Connector) and harness_options.bgcolor_connector:
return translate_color(harness_options.bgcolor_connector, "HEX")
elif isinstance(component, Cable) and component.category == "bundle" and harness_options.bgcolor_bundle:
return translate_color(harness_options.bgcolor_bundle, "HEX")
elif isinstance(component, Cable) and harness_options.bgcolor_cable:
return translate_color(harness_options.bgcolor_cable, "HEX")
def make_list_of_cells(inp) -> List[Td]:
# inp may be List,
if isinstance(inp, List):
@ -135,7 +141,7 @@ def nested_table(lines: List[Td]) -> Table:
else:
# nest cell content inside a table
inner_table = Table(
Tr(cells), border=0, cellspacing=0, cellpadding=3, cellborder=1
Tr(cells), border=0, cellborder=1, cellpadding=3, cellspacing=0
)
rows.append(Tr(Td(inner_table)))
@ -158,7 +164,7 @@ def gv_pin_table(component) -> Table:
pin_rows.append(
gv_pin_row(pinindex, pinname, pinlabel, pincolor, component)
)
tbl = Table(pin_rows, border=0, cellspacing=0, cellpadding=3, cellborder=1)
tbl = Table(pin_rows, border=0, cellborder=1, cellpadding=3, cellspacing=0)
return tbl
@ -237,7 +243,7 @@ def gv_conductor_table(cable, harness_options) -> Table:
# wire_pn_stuff() see below
rows.append(Tr(Td("&nbsp;"))) # spacer row on bottom
tbl = Table(rows, border=0, cellspacing=0, cellborder=0)
tbl = Table(rows, border=0, cellborder=0, cellspacing=0)
return tbl
@ -250,20 +256,21 @@ def gv_wire_cell(wire: Union[WireClass, ShieldClass], padding) -> Td:
wire_inner_rows = []
for j, bgcolor in enumerate(color_list[::-1]):
wire_inner_cell_attribs = {
"colspan": 3,
"cellpadding": 0,
"height": 2,
"border": 0,
"bgcolor": bgcolor if bgcolor != "" else "BK",
"border": 0,
"cellpadding": 0,
"colspan": 3,
"height": 2,
}
wire_inner_rows.append(Tr(Td("", **wire_inner_cell_attribs)))
wire_inner_table = Table(wire_inner_rows, cellspacing=0, cellborder=0, border=0)
wire_inner_table = Table(wire_inner_rows, border=0, cellborder=0, cellspacing=0)
wire_outer_cell_attribs = {
"colspan": 3,
"border": 0,
"cellspacing": 0,
"port": f"w{wire.index+1}",
"cellpadding": 0,
"colspan": 3,
"height": 2 * len(color_list),
"port": f"w{wire.index+1}",
}
# ports in GraphViz are 1-indexed for more natural maping to pin/wire numbers
wire_outer_cell = Td(wire_inner_table, **wire_outer_cell_attribs)
@ -386,7 +393,7 @@ def image_and_caption_cells(component: Component) -> (Td, Td):
# further nest the image in a table with width/height/fixedsize parameters, and place that table in a cell
image_cell_inner.update_attribs(**html_size_attr_dict(component.image))
image_cell = Td(
Table(Tr(image_cell_inner), border=0, cellspacing=0, cellborder=0, id="!")
Table(Tr(image_cell_inner), border=0, cellborder=0, cellspacing=0, id="!")
)
else:
image_cell = image_cell_inner