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

Change colors as per #17 review

Browse Source
This commit is contained in:
Andrew Katz 2020-07-16 19:11:55 -04:00 committed by Daniel Rojas
parent 318b6c68cc
commit ea948a247f
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wireviz/Harness.py
View File

@ -67,7 +67,7 @@ class Harness:
font = 'arial' font = 'arial'
dot.attr('graph', rankdir='LR', dot.attr('graph', rankdir='LR',
ranksep='2', ranksep='2',
bgcolor='white', bgcolor=wv_colors.default_bknd_color,
nodesep='0.33', nodesep='0.33',
fontname=font) fontname=font)
dot.attr('node', shape='record', dot.attr('node', shape='record',

27
src/wireviz/wv_colors.py
View File

@ -29,7 +29,7 @@ default_bknd_color = '#fffbf8' # off-white beige-ish
# Convention: Color names should be 2 letters long, to allow for multicolored wires # Convention: Color names should be 2 letters long, to allow for multicolored wires
shield_color = '#aaaaaa:#84878c' # SN shield_color = '#aaaaaa' # Tinned wire
_color_hex = { _color_hex = {
'BK': '#000000', 'BK': '#000000',
@ -43,13 +43,17 @@ _color_hex = {
'TQ': '#00ffff', 'TQ': '#00ffff',
'BU': '#0066ff', 'BU': '#0066ff',
'VT': '#8000ff', 'VT': '#8000ff',
'BN': '#a52a2a', 'BN': '#895956',
'SL': '#708090', 'SL': '#708090',
# Faux-copper look, for bare CU wire # Faux-copper look, for bare CU wire
'CU': '#d6775e:#895956', 'CU': '#d6775e',
# Silvery look for tinned bare wire # Silvery look for tinned bare wire
'SN': '#aaaaaa:#84878c', 'SN': '#aaaaaa',
# Yellow-green PE wire # Darker silver for silvered wire
'AG': '#84878c',
# Golden color for gold
'AU': '#ffcf80',
# Yellow-green PE wire (matching actual wire colors, should prevent confusion with a yellow-green dual color wire
'PE': '#54aa85:#f7f854:#54aa85', 'PE': '#54aa85:#f7f854:#54aa85',
} }
@ -69,6 +73,9 @@ _color_full = {
'SL': 'slate', 'SL': 'slate',
'CU': 'bare copper', 'CU': 'bare copper',
'SN': 'tinned copper', 'SN': 'tinned copper',
'AG': 'silver wire',
'AU': 'gold wire',
'PE': 'earth'
} }
# TODO Help wanted: can someone check the german translation? # TODO Help wanted: can someone check the german translation?
@ -90,9 +97,15 @@ _color_ger = {
# Slate --> Schieferfarbe --> SI ?? # Slate --> Schieferfarbe --> SI ??
'SL': 'si', 'SL': 'si',
# Copper # Copper
'CU': 'ku', 'CU': 'cu',
# Tinned # Tinned
'SN': 'si' 'SN': 'sn',
# Silver
'AG': 'ag',
# Gold
'AU': 'au',
# Earth
'PE': 'pe'
} }