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

Merge #1

Browse Source 
# Conflicts:
#	src/wireviz.py
This commit is contained in:
Andrew Katz 2020-06-25 12:54:41 -04:00
commit 3562c0e18b
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wireviz.py
View File

@ -129,7 +129,7 @@ class Harness:
html = html + '</tr>' # attribute row
html = html + '</table></td></tr>' # name+attributes table
html = html + '<tr><td>&nbsp;</td></tr>' # spacer between attributes and wires
html = html + '<tr><td></td></tr>' # spacer between attributes and wires
html = html + '<tr><td><table border="0" cellspacing="0" cellborder="0">' # conductor table
@ -142,19 +142,12 @@ class Harness:
for bla in p:
html = html + '<td>{}</td>'.format(bla)
html = html + '</tr>'
colors = wv_colors.translate_color(x,'hex').split(':')
rowheight = 6 #/ len(colors)
collen = len(p) / len(colors)
html = html + '<tr cellpadding="0" cellspacing="0" border="0"><td border="2" sides="tb" colspan="{colspan}" cellspacing="0" cellpadding="0" port="{port}"><table cellspacing="0" cellpadding="0" border="0"><tr>'.format(colspan=len(p), port='w{}'.format(i))
for j, bgcolor in enumerate(colors,1):
# todo border 2
# port="{port}"
# html = html + '<td colspan="{colspan}" cellpadding="0" height="{rowheight}" bgcolor="{bgcolor}" border="1" sides="tb" {port}></td>'.format(
# colspan=collen, bgcolor=bgcolor if bgcolor != '' else wv_colors.default_color,
# port='port="w{}"'.format(i) if j == len(colors) else '', rowheight=rowheight)
html = html + '<td colspan="{colspan}" cellspacing="0" cellpadding="0" height="{rowheight}" bgcolor="{bgcolor}" ></td>'.format(
colspan=collen, bgcolor=bgcolor if bgcolor != '' else wv_colors.default_color, rowheight=rowheight)
html = html + '</tr></table></td></tr>'
bgcolors = ('#000000:' + wv_colors.translate_color(x, 'hex') +':#000000').split(':')
html = html + '<tr><td colspan="{colspan}" border="0" cellspacing="0" cellpadding="0" port="{port}" height="{height}"><table cellspacing="0" cellborder="0" border = "0">'.format(colspan=len(p), port ='w{}'.format(i), height = '{}'.format(2*len(bgcolors)))
for j, bgcolor in enumerate(bgcolors):
html = html + '<tr><td colspan="{colspan}" cellpadding="0" height="2" bgcolor="{bgcolor}" border="0"></td></tr>'.format(colspan=len(p), bgcolor=bgcolor if bgcolor != '' else '#ffffff')
html = html + '</table></td></tr>'
if c.shield:
p = ['<!-- s_in -->', 'Shield', '<!-- s_out -->']
html = html + '<tr><td></td></tr>' # spacer

61
src/wv_colors.py
View File

@ -49,8 +49,8 @@ _color_hex = {
'PE': '#54aa85:#f7f854:#54aa85',
}
# TODO: Add a helper method for this, that can deal with banded wires
color_full = {
_color_full = {
'BK': 'black',
'WH': 'white',
'GY': 'grey',
@ -65,11 +65,11 @@ color_full = {
'BN': 'brown',
'SL': 'slate',
'CU': 'bare copper',
'TI': 'tinned copper',
'TI': 'tinned copper', # Could be changed to SN, as that's the elemental symbol
}
# TODO Help wanted! Need help translating colors/banded colors to german shortcodes
color_ger = {
# TODO Help wanted: can someone check the german translation?
_color_ger = {
'BK': 'sw',
'WH': 'ws',
'GY': 'gr',
@ -82,43 +82,50 @@ color_ger = {
'BU': 'bl',
'VT': 'vi',
'BN': 'br',
# To the best of my ability, likely incorrect:
# Slate --> Schieferfarbe --> SI ??
'SL': 'si',
# Copper
'CU': 'ku',
# Tinned
'TI': 'si'
}
def get_color_hex(input):
if len(input) == 4: # give wires with EXACTLY 2 colors that striped/banded look
input = input + input[:2]
output = ''
for i in range(0, len(input), 2): # Split into 2 letter chunks
if input[i:i + 2] in color_hex:
output += color_hex[input[i:i + 2]]
if i + 2 != len(input):
output += ':'
try:
output = ":".join([_color_hex[input[i:i + 2]] for i in range(0, len(input), 2)])
except KeyError:
raise Exception('Unknown Color Name')
if output == '':
output = _default_color
output = default_color
return output
def translate_color(input, color_mode):
if input == '':
output = ''
else:
return ''
upper = color_mode.isupper()
if not (color_mode.isupper() or color_mode.islower()):
raise Exception('Unknown color mode capitalization')
color_mode = color_mode.lower()
if color_mode == 'full':
output = color_full[input].lower()
elif color_mode == 'FULL':
output = color_full[input].upper()
output = "/".join([_color_full[input[i:i+2]] for i in range(0,len(input),2)])
elif color_mode == 'hex':
output = get_color_hex(input).lower()
elif color_mode == 'HEX':
output = get_color_hex(input).upper()
output = get_color_hex(input)
elif color_mode == 'ger':
output = color_ger[input].lower()
elif color_mode == 'GER':
output = color_ger[input].upper()
output = "".join([_color_ger[input[i:i+2]] for i in range(o,len(input),2)])
elif color_mode == 'short':
output = input.lower()
elif color_mode == 'SHORT':
output = input.upper()
output = input
else:
raise Exception('Unknown color mode')
return output
if upper:
return output.upper()
else:
return output.lower()