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

Simplify colorbar using the same technique as html_image()

Browse Source 
Moving common code into html_colorbar() helper function.
This commit is contained in:
KV 2020-08-12 18:15:04 +02:00 committed by Daniel Rojas
parent 4782da47c9
commit 1809f73d58
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wireviz/Harness.py
View File

@ -8,7 +8,7 @@ from wireviz.wv_colors import get_color_hex
from wireviz.wv_helper import awg_equiv, mm2_equiv, tuplelist2tsv, \ from wireviz.wv_helper import awg_equiv, mm2_equiv, tuplelist2tsv, \
nested_html_table, flatten2d, index_if_list, html_line_breaks, \ nested_html_table, flatten2d, index_if_list, html_line_breaks, \
graphviz_line_breaks, remove_line_breaks, open_file_read, open_file_write, \ graphviz_line_breaks, remove_line_breaks, open_file_read, open_file_write, \
html_image, html_caption, manufacturer_info_field html_colorbar, html_image, html_caption, manufacturer_info_field
from collections import Counter from collections import Counter
from typing import List from typing import List
from pathlib import Path from pathlib import Path
@ -96,17 +96,13 @@ class Harness:
[html_line_breaks(connector.type), [html_line_breaks(connector.type),
html_line_breaks(connector.subtype), html_line_breaks(connector.subtype),
f'{connector.pincount}-pin' if connector.show_pincount else None, f'{connector.pincount}-pin' if connector.show_pincount else None,
connector.color, '<!-- colorbar -->' if connector.color else None], connector.color, html_colorbar(connector.color)],
'<!-- connector table -->' if connector.style != 'simple' else None, '<!-- connector table -->' if connector.style != 'simple' else None,
[html_image(connector.image)], [html_image(connector.image)],
[html_caption(connector.image)], [html_caption(connector.image)],
[html_line_breaks(connector.notes)]] [html_line_breaks(connector.notes)]]
html.extend(nested_html_table(rows)) html.extend(nested_html_table(rows))
if connector.color: # add color bar next to color info, if present
colorbar = f' bgcolor="{wv_colors.translate_color(connector.color, "HEX")}" width="4"></td>' # leave out '<td' from string to preserve any existing attributes of the <td> tag
html = [row.replace('><!-- colorbar --></td>', colorbar) for row in html]
if connector.style != 'simple': if connector.style != 'simple':
pinhtml = [] pinhtml = []
pinhtml.append('<table border="0" cellspacing="0" cellpadding="3" cellborder="1">') pinhtml.append('<table border="0" cellspacing="0" cellpadding="3" cellborder="1">')
@ -173,17 +169,13 @@ class Harness:
f'{cable.gauge} {cable.gauge_unit}{awg_fmt}' if cable.gauge else None, f'{cable.gauge} {cable.gauge_unit}{awg_fmt}' if cable.gauge else None,
'+ S' if cable.shield else None, '+ S' if cable.shield else None,
f'{cable.length} m' if cable.length > 0 else None, f'{cable.length} m' if cable.length > 0 else None,
cable.color, '<!-- colorbar -->' if cable.color else None], cable.color, html_colorbar(cable.color)],
'<!-- wire table -->', '<!-- wire table -->',
[html_image(cable.image)], [html_image(cable.image)],
[html_caption(cable.image)], [html_caption(cable.image)],
[html_line_breaks(cable.notes)]] [html_line_breaks(cable.notes)]]
html.extend(nested_html_table(rows)) html.extend(nested_html_table(rows))
if cable.color: # add color bar next to color info, if present
colorbar = f' bgcolor="{wv_colors.translate_color(cable.color, "HEX")}" width="4"></td>' # leave out '<td' from string to preserve any existing attributes of the <td> tag
html = [row.replace('><!-- colorbar --></td>', colorbar) for row in html]
wirehtml = [] wirehtml = []
wirehtml.append('<table border="0" cellspacing="0" cellborder="0">') # conductor table wirehtml.append('<table border="0" cellspacing="0" cellborder="0">') # conductor table
wirehtml.append(' <tr><td>&nbsp;</td></tr>') wirehtml.append(' <tr><td>&nbsp;</td></tr>')

4
src/wireviz/wv_helper.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from wireviz import wv_colors
from typing import List from typing import List
awg_equiv_table = { awg_equiv_table = {
@ -55,6 +56,9 @@ def nested_html_table(rows):
html.append('</table>') html.append('</table>')
return html return html
def html_colorbar(color):
return f'<tdX bgcolor="{wv_colors.translate_color(color, "HEX")}" width="4">' if color else None
def html_image(image): def html_image(image):
if not image: if not image:
return None return None