Changeset 702 for mds-and-trees

Timestamp:

09/21/17 15:05:17 (7 years ago)

Author:

konrad

Message:

Non-normalized step values for cmap can now extend outside the range of values from the data (yet min and max step values should still be the same for all color channels!)

File:

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

mds-and-trees/tree-genealogy.py

@@ -4 +4 @@
 import argparse
 import bisect
+import copy
 import time as timelib
 from PIL import Image, ImageDraw, ImageFont
@@ -92 +93 @@
 
     def compile_cmaps(self):
-
-        # normalization of color breaking points
-        for part in ['dots', 'lines']:
-            if self.settings[part]['color']['cmap'] \
-                    and self.settings[part]['color']['normalize_cmap']:
-                cmap = self.settings[part]['color']['cmap']
-                min = self.design.props[self.settings[part]['color']['meaning'] + "_min"]
-                max = self.design.props[self.settings[part]['color']['meaning'] + "_max"]
-                for key in cmap:
-                    for arr in cmap[key]:
-                        arr[0] = (arr[0] - min) / (max-min)
-                    if cmap[key][0][0] != 0:
-                        cmap[key].insert(0, cmap[key][0][:])
-                        cmap[key][0][0] = 0
-                    if cmap[key][-1][0] != 1:
-                        cmap[key].append(cmap[key][-1][:])
-                        cmap[key][-1][0] = 1
-
+        def normalize_and_compile_cmap(cmap):
+            for key in cmap:
+                for arr in cmap[key]:
+                    arr[0] = (arr[0] - cmap[key][0][0]) / (cmap[key][-1][0] - cmap[key][0][0])
+            return colors.LinearSegmentedColormap('Custom', cmap)
 
         for part in ['dots', 'lines']:
             if self.settings[part]['color']['cmap']:
-                cmap = self.settings[part]['color']['cmap']
-                for key in cmap:
-                    new_arr = []
-                    for arr in cmap[key]:
-                        new_arr.append(tuple(arr))
-                    cmap[key] = tuple(new_arr)
-                #print(cmap)
-                self.settings[part]['color']['cmap'] = colors.LinearSegmentedColormap('Custom', cmap)
+                if self.settings[part]['color']['normalize_cmap']:
+                    cmap = self.settings[part]['color']['cmap']
+                    min = self.design.props[self.settings[part]['color']['meaning'] + "_min"]
+                    max = self.design.props[self.settings[part]['color']['meaning'] + "_max"]
+
+                    for key in cmap:
+                        if cmap[key][0][0] > min:
+                            cmap[key].insert(0, cmap[key][0][:])
+                            cmap[key][0][0] = min
+                        if cmap[key][-1][0] < max:
+                            cmap[key].append(cmap[key][-1][:])
+                            cmap[key][-1][0] = max
+
+                    og_cmap = normalize_and_compile_cmap(copy.deepcopy(cmap))
+
+                    col2key = {'red':0, 'green':1, 'blue':2}
+                    for key in cmap:
+                        # for color from (r/g/b) #n's should be the same for all keys!
+                        n_min = (min - cmap[key][0][0]) / (cmap[key][-1][0] - cmap[key][0][0])
+                        n_max = (max - cmap[key][0][0]) / (cmap[key][-1][0] - cmap[key][0][0])
+
+                        min_col = og_cmap(n_min)
+                        max_col = og_cmap(n_max)
+
+                        cmap[key][0] = [min, min_col[col2key[key]], min_col[col2key[key]]]
+                        cmap[key][-1] = [max, max_col[col2key[key]], max_col[col2key[key]]]
+                print(self.settings[part]['color']['cmap'])
+                self.settings[part]['color']['cmap'] = normalize_and_compile_cmap(self.settings[part]['color']['cmap'])
 
     def draw_dots(self, file, min_width, max_width, max_height):