Changeset 695

Timestamp:

09/05/17 16:08:58 (7 years ago)

Author:

konrad

Message:

Using matplotlib's color package to interpret colors. Color can be now specified in one of the following ways: 1. a letter from the set ‘rgbcmykw’; 2.a hex color string, like ‘#00FFFF’; 3.a standard name, like ‘aqua’; 4. a float, like ‘0.4’, indicating gray on a 0-1 scale

File:

• mds-and-trees/tree-genealogy.py (modified) (3 diffs)

mds-and-trees/tree-genealogy.py

@@ -7 +7 @@
 from PIL import Image, ImageDraw, ImageFont
 from scipy import stats
+from matplotlib import colors
 import numpy as np
 
@@ -23 +24 @@
         self.h_no_margs = h - 2* h_margin
 
-        self.colors = {
-            'white' :   {'r':100,   'g':100,    'b':100},
-            'black' :   {'r':0,     'g':0,      'b':0},
-            'red' :     {'r':100,   'g':0,      'b':0},
-            'green' :   {'r':0,     'g':100,    'b':0},
-            'blue' :    {'r':0,     'g':0,      'b':100},
-            'yellow' :  {'r':100,   'g':100,    'b':0},
-            'magenta' : {'r':100,   'g':0,      'b':100},
-            'cyan' :    {'r':0,     'g':100,    'b':100},
-            'orange':   {'r':100,   'g':50,     'b':0},
-            'purple':   {'r':50,    'g':0,      'b':100}
-        }
+        self.color_converter = colors.ColorConverter()
 
         self.settings = {
@@ -154 +144 @@
         if isinstance(value, str):
             value = int(value)
-            r = self.colors[self.settings['colors_of_kinds'][value]]['r']
-            g = self.colors[self.settings['colors_of_kinds'][value]]['g']
-            b = self.colors[self.settings['colors_of_kinds'][value]]['b']
+            r, g, b = self.color_converter.to_rgb(self.settings['colors_of_kinds'][value])
         else:
-            start_color = self.colors[start]
-            end_color = self.colors[end]
+            start_color = self.color_converter.to_rgb(start)
+            end_color = self.color_converter.to_rgb(end)
             value = 1 - (1-value)**bias
-            r = start_color['r']*(1-value)+end_color['r']*value
-            g = start_color['g']*(1-value)+end_color['g']*value
-            b = start_color['b']*(1-value)+end_color['b']*value
-        return (r, g, b)
+            r = start_color[0]*(1-value)+end_color[0]*value
+            g = start_color[1]*(1-value)+end_color[1]*value
+            b = start_color[2]*(1-value)+end_color[2]*value
+        return (100*r, 100*g, 100*b)
 
     def compute_value(self, start, end, value, bias=1):