Change colors as per wireviz#17 review

aakatz3 · Jul 16, 2020 · 7ab4971 · 7ab4971
1 parent 9cc191c
commit 7ab4971
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py
@@ -66,7 +66,7 @@ def create_graph(self) -> Graph:
         font = 'arial'
         dot.attr('graph', rankdir='LR',
                  ranksep='2',
-                 bgcolor='white',
+                 bgcolor=wv_colors.default_bknd_color,
                  nodesep='0.33',
                  fontname=font)
         dot.attr('node', shape='record',

diff --git a/src/wireviz/wv_colors.py b/src/wireviz/wv_colors.py
@@ -29,7 +29,7 @@
 
 # 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 = {
     'BK': '#000000',
@@ -43,13 +43,17 @@
     'TQ': '#00ffff',
     'BU': '#0066ff',
     'VT': '#8000ff',
-    'BN': '#a52a2a',
+    'BN': '#895956',
     'SL': '#708090',
     # Faux-copper look, for bare CU wire
-    'CU': '#d6775e:#895956',
+    'CU': '#d6775e',
     # Silvery look for tinned bare wire
-    'SN': '#aaaaaa:#84878c',
-    # Yellow-green PE wire
+    'SN': '#aaaaaa',
+    # 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',
 }
 
@@ -69,6 +73,9 @@
     'SL': 'slate',
     'CU': 'bare copper',
     'SN': 'tinned copper',
+    'AG': 'silver wire',
+    'AU': 'gold wire',
+    'PE': 'earth'
 }
 
 # TODO Help wanted: can someone check the german translation?
@@ -90,9 +97,15 @@
     # Slate --> Schieferfarbe --> SI ??
     'SL': 'si',
     # Copper
-    'CU': 'ku',
+    'CU': 'cu',
     # Tinned
-    'SN': 'si'
+    'SN': 'sn',
+    # Silver
+    'AG': 'ag',
+    # Gold
+    'AU': 'au',
+    # Earth
+    'PE': 'pe'
 }