Patched gradient display bug

Author: clittle

layers/exporters/svg_objects.py

@@ -155,8 +155,7 @@ def __init__(self, height, width, fill):
 
 class SVG_HeaderBlock:
     @staticmethod
-    def build(height, width, label, variant='text', t1text=None, t1size=None, t2text=None, t2size=None, colors=[],
-              values=(0,100)):
+    def build(height, width, label, variant='text', t1text=None, t1size=None, t2text=None, t2size=None, colors=[]):
         """
             Build a single SVG Header Block object
 
@@ -168,8 +167,7 @@ def build(height, width, label, variant='text', t1text=None, t1size=None, t2text
             :param t1size: upper text size
             :param t2text: lower text
             :param t2size: lower text size
-            :param colors: colors for the graphic variant
-            :param values: values for the graphic variant's gradient
+            :param colors: array of tuple (color, score value) for the graphic variant
             :return:
         """
         g = G(ty=5)
@@ -215,19 +213,16 @@ def build(height, width, label, variant='text', t1text=None, t1size=None, t2text
                 cells = G(ctype="legendCells")
                 sub2.append(cells)
                 offset = 0
-                span = [values[0]]
-                for blah in colors[:-1]:
-                    span.append(int(values[1]/(len(colors)-1) * (colors.index(blah) + 1)))
                 for entry in colors:
                     cell = G(ctype="cell", tx=offset)
-                    conv = entry
+                    conv = entry[0]
                     if conv.startswith('#'):
                         conv = conv[1:]
                     block = Swatch(15, block_width, tuple(int(conv[i:i+2], 16) for i in (0, 2, 4)))
                     offset += block_width
                     cell.append(block)
                     cells.append(cell)
-                    tblob = str(span[colors.index(entry)])
+                    tblob = str(entry[1])
                     off = (block_width-(5 * (1+ len(tblob))))/2
                     label = Text(tblob, 12, ctype='label', ty=25, tx=off)
                     cell.append(label)

layers/exporters/svg_templates.py

@@ -90,12 +90,13 @@ def _build_headers(self, name, desc=None, filters=None, gradient=None):
             psych += 1
         if gradient is not None:
             b3 = G(tx=operation_x / header_count * psych)
-            colors = [gradient.compute_color(gradient.minValue)]
-            for i in range(1, len(gradient.colors) * 2):
-                colors.append(gradient.compute_color(int(gradient.maxValue/(len(gradient.colors)*2)) * i))
+            colors = []
+            div = round((gradient.maxValue - gradient.minValue)/(len(gradient.colors) * 2 - 1))
+            for i in range(0, len(gradient.colors) * 2 - 1):
+                colors.append((gradient.compute_color(int(gradient.minValue + div * i)), gradient.minValue + div * i))
+            colors.append((gradient.compute_color(gradient.maxValue), gradient.maxValue))
             g3 = SVG_HeaderBlock().build(height=self.header_height, width=header_width, label='legend',
-                                         variant='graphic', colors=colors,
-                                         values=(gradient.minValue, gradient.maxValue))
+                                         variant='graphic', colors=colors)
             header.append(b3)
             b3.append(g3)
         d.append(root)