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

Reactivate cable edge generation

Browse Source
This commit is contained in:
Daniel Rojas 2021-10-19 16:17:38 +02:00 committed by KV
parent 84dd10a2dc
commit 266eb659bb
2 changed files with 81 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
src/wireviz/Harness.py
View File

@ -188,117 +188,49 @@ class Harness:
# style=style, # style=style,
# fillcolor=translate_color(bgcolor, "HEX"), # fillcolor=translate_color(bgcolor, "HEX"),
) )
continue
# TODO: connection edges # TODO: connection edges
html = []
wirehtml = [] # # for bundles, individual wires can have part information
# conductor table # if cable.category == "bundle":
wirehtml.append('<table border="0" cellspacing="0" cellborder="0">') # # create a list of wire parameters
wirehtml.append(" <tr><td>&nbsp;</td></tr>") # wireidentification = []
# if isinstance(cable.pn, list):
# wireidentification.append(
# pn_info_string(
# HEADER_PN, None, remove_links(cable.pn[i - 1])
# )
# )
# manufacturer_info = pn_info_string(
# HEADER_MPN,
# cable.manufacturer[i - 1]
# if isinstance(cable.manufacturer, list)
# else None,
# cable.mpn[i - 1] if isinstance(cable.mpn, list) else None,
# )
# supplier_info = pn_info_string(
# HEADER_SPN,
# cable.supplier[i - 1]
# if isinstance(cable.supplier, list)
# else None,
# cable.spn[i - 1] if isinstance(cable.spn, list) else None,
# )
# if manufacturer_info:
# wireidentification.append(html_line_breaks(manufacturer_info))
# if supplier_info:
# wireidentification.append(html_line_breaks(supplier_info))
# # print parameters into a table row under the wire
# if len(wireidentification) > 0:
# # fmt: off
# wirehtml.append(' <tr><td colspan="3">')
# wirehtml.append(' <table border="0" cellspacing="0" cellborder="0"><tr>')
# for attrib in wireidentification:
# wirehtml.append(f" <td>{attrib}</td>")
# wirehtml.append(" </tr></table>")
# wirehtml.append(" </td></tr>")
# # fmt: on
for i, (connection_color, wirelabel) in enumerate(
zip_longest(cable.colors, cable.wirelabels), 1
):
wirehtml.append(" <tr>")
wirehtml.append(f" <td><!-- {i}_in --></td>")
wirehtml.append(f" <td>")
wireinfo = []
if cable.show_wirenumbers:
wireinfo.append(str(i))
colorstr = wv_colors.translate_color(
connection_color, self.options.color_mode
)
if colorstr:
wireinfo.append(colorstr)
if cable.wirelabels:
wireinfo.append(wirelabel if wirelabel is not None else "")
wirehtml.append(f' {":".join(wireinfo)}')
wirehtml.append(f" </td>")
wirehtml.append(f" <td><!-- {i}_out --></td>")
wirehtml.append(" </tr>")
# fmt: off
bgcolors = ['#000000'] + get_color_hex(connection_color, pad=pad) + ['#000000']
wirehtml.append(f" <tr>")
wirehtml.append(f' <td colspan="3" border="0" cellspacing="0" cellpadding="0" port="w{i}" height="{(2 * len(bgcolors))}">')
wirehtml.append(' <table cellspacing="0" cellborder="0" border="0">')
for j, bgcolor in enumerate(bgcolors[::-1]): # Reverse to match the curved wires when more than 2 colors
wirehtml.append(f' <tr><td colspan="3" cellpadding="0" height="2" bgcolor="{bgcolor if bgcolor != "" else wv_colors.default_color}" border="0"></td></tr>')
wirehtml.append(" </table>")
wirehtml.append(" </td>")
wirehtml.append(" </tr>")
# fmt: on
# for bundles, individual wires can have part information
if cable.category == "bundle":
# create a list of wire parameters
wireidentification = []
if isinstance(cable.pn, list):
wireidentification.append(
pn_info_string(
HEADER_PN, None, remove_links(cable.pn[i - 1])
)
)
manufacturer_info = pn_info_string(
HEADER_MPN,
cable.manufacturer[i - 1]
if isinstance(cable.manufacturer, list)
else None,
cable.mpn[i - 1] if isinstance(cable.mpn, list) else None,
)
supplier_info = pn_info_string(
HEADER_SPN,
cable.supplier[i - 1]
if isinstance(cable.supplier, list)
else None,
cable.spn[i - 1] if isinstance(cable.spn, list) else None,
)
if manufacturer_info:
wireidentification.append(html_line_breaks(manufacturer_info))
if supplier_info:
wireidentification.append(html_line_breaks(supplier_info))
# print parameters into a table row under the wire
if len(wireidentification) > 0:
# fmt: off
wirehtml.append(' <tr><td colspan="3">')
wirehtml.append(' <table border="0" cellspacing="0" cellborder="0"><tr>')
for attrib in wireidentification:
wirehtml.append(f" <td>{attrib}</td>")
wirehtml.append(" </tr></table>")
wirehtml.append(" </td></tr>")
# fmt: on
if cable.shield:
wirehtml.append(" <tr><td>&nbsp;</td></tr>") # spacer
wirehtml.append(" <tr>")
wirehtml.append(" <td><!-- s_in --></td>")
wirehtml.append(" <td>Shield</td>")
wirehtml.append(" <td><!-- s_out --></td>")
wirehtml.append(" </tr>")
if isinstance(cable.shield, str):
# shield is shown with specified color and black borders
shield_color_hex = wv_colors.get_color_hex(cable.shield)[0]
attributes = (
f'height="6" bgcolor="{shield_color_hex}" border="2" sides="tb"'
)
else:
# shield is shown as a thin black wire
attributes = f'height="2" bgcolor="#000000" border="0"'
# fmt: off
wirehtml.append(f' <tr><td colspan="3" cellpadding="0" {attributes} port="ws"></td></tr>')
# fmt: on
wirehtml.append(" <tr><td>&nbsp;</td></tr>")
wirehtml.append(" </table>")
html = [
row.replace("<!-- wire table -->", "\n".join(wirehtml)) for row in html
]
# connections # connections
for connection in cable.connections: for connection in cable.connections:
@ -316,11 +248,14 @@ class Harness:
) )
else: # it's a shield connection else: # it's a shield connection
# shield is shown with specified color and black borders, or as a thin black wire otherwise # shield is shown with specified color and black borders, or as a thin black wire otherwise
if isinstance(cable.shield, str):
shield_color_hex = wv_colors.get_color_hex(cable.shield)[0]
shield_color_str = ":".join(["#000000", shield_color_hex, "#000000"])
else:
shield_color_str = "#000000"
dot.attr( dot.attr(
"edge", "edge",
color=":".join(["#000000", shield_color_hex, "#000000"]) color=shield_color_str,
if isinstance(cable.shield, str)
else "#000000",
) )
if connection.from_pin is not None: # connect to left if connection.from_pin is not None: # connect to left
from_connector = self.connectors[connection.from_name] from_connector = self.connectors[connection.from_name]
@ -345,10 +280,10 @@ class Harness:
from_string = ":".join(from_info) from_string = ":".join(from_info)
else: else:
from_string = "" from_string = ""
html = [ # html = [
row.replace(f"<!-- {connection.via_port}_in -->", from_string) # row.replace(f"<!-- {connection.via_port}_in -->", from_string)
for row in html # for row in html
] # ]
if connection.to_pin is not None: # connect to right if connection.to_pin is not None: # connect to right
to_connector = self.connectors[connection.to_name] to_connector = self.connectors[connection.to_name]
to_pin_index = to_connector.pins.index(connection.to_pin) to_pin_index = to_connector.pins.index(connection.to_pin)
@ -367,24 +302,24 @@ class Harness:
to_string = ":".join(to_info) to_string = ":".join(to_info)
else: else:
to_string = "" to_string = ""
html = [ # html = [
row.replace(f"<!-- {connection.via_port}_out -->", to_string) # row.replace(f"<!-- {connection.via_port}_out -->", to_string)
for row in html # for row in html
] # ]
style, bgcolor = ( style, bgcolor = (
("filled,dashed", self.options.bgcolor_bundle) ("filled,dashed", self.options.bgcolor_bundle)
if cable.category == "bundle" if cable.category == "bundle"
else ("filled", self.options.bgcolor_cable) else ("filled", self.options.bgcolor_cable)
) )
html = "\n".join(html) # html = "\n".join(html)
dot.node( # dot.node(
cable.name, # cable.name,
label=f"<\n{html}\n>", # label=f"<\n{html}\n>",
shape="box", # shape="box",
style=style, # style=style,
fillcolor=translate_color(bgcolor, "HEX"), # fillcolor=translate_color(bgcolor, "HEX"),
) # )
apply_dot_tweaks(dot, self.tweak) apply_dot_tweaks(dot, self.tweak)

26
src/wireviz/wv_gv_html.py
View File

@ -209,20 +209,36 @@ def gv_conductor_table(cable, harness_options) -> Table:
rows.append(Tr(cells_above)) rows.append(Tr(cells_above))
# the wire itself # the wire itself
rows.append(Tr(gv_wire_cell(i, connection_color, harness_options._pad))) color_list = ["#000000"] + get_color_hex(connection_color, pad=harness_options._pad) + ["#000000"]
rows.append(Tr(gv_wire_cell(i, color_list)))
# row below the wire # row below the wire
# TODO: PN stuff for bundles # TODO: PN stuff for bundles
if cable.shield:
rows.append(Tr(Td("&nbsp;"))) # spacer between wires and shield
# row above the shield
cells_above = [
Td("<!-- s_in -->"),
Td("Shield"),
Td("<!-- s_out -->"),
]
rows.append(Tr(cells_above))
# thw shield itself
if isinstance(cable.shield, str):
color_list = ["#000000"] + get_color_hex(cable.shield) + ["#000000"]
else:
color_list = ["#000000"]
rows.append(Tr(gv_wire_cell("s", color_list)))
rows.append(Tr(Td("&nbsp;"))) # spacer row on bottom rows.append(Tr(Td("&nbsp;"))) # spacer row on bottom
tbl = Table(rows, border=0, cellspacing=0, cellborder=0) tbl = Table(rows, border=0, cellspacing=0, cellborder=0)
return tbl return tbl
def gv_wire_cell(index, color, pad) -> Td: def gv_wire_cell(index, color_list) -> Td:
bgcolors = ["#000000"] + get_color_hex(color, pad=pad) + ["#000000"]
wire_inner_rows = [] wire_inner_rows = []
for j, bgcolor in enumerate(bgcolors[::-1]): for j, bgcolor in enumerate(color_list[::-1]):
wire_inner_cell_attribs = { wire_inner_cell_attribs = {
"colspan": 3, "colspan": 3,
"cellpadding": 0, "cellpadding": 0,
@ -237,7 +253,7 @@ def gv_wire_cell(index, color, pad) -> Td:
"border": 0, "border": 0,
"cellspacing": 0, "cellspacing": 0,
"port": f"w{index}", "port": f"w{index}",
"height": 2 * len(bgcolors), "height": 2 * len(color_list),
} }
wire_outer_cell = Td(wire_inner_table, **wire_outer_cell_attribs) wire_outer_cell = Td(wire_inner_table, **wire_outer_cell_attribs)