create and use a LinearGradient object in DataArrayModel.data() when self.bg_gradient is None

Author: alixdamman

larray_editor/arraymodel.py

@@ -3,7 +3,7 @@
 import numpy as np
 
 from larray_editor.utils import (get_font, from_qvariant, to_qvariant, to_text_string,
-                                 is_float, is_number, SUPPORTED_FORMATS)
+                                 is_float, is_number, LinearGradient, SUPPORTED_FORMATS)
 
 from qtpy.QtCore import Qt, QModelIndex, QAbstractTableModel
 from qtpy.QtGui import QColor
@@ -217,19 +217,10 @@ def __init__(self, parent=None, data=None, readonly=False, format="%.3f", font=N
         AbstractArrayModel.__init__(self, parent, data, readonly, font)
         self._format = format
 
-        # Backgroundcolor settings
-        # TODO: use LinearGradient
-        # self.bgfunc = bgfunc
-        huerange = [.66, .99]  # Hue
-        self.sat = .7  # Saturation
-        self.val = 1.  # Value
-        self.alp = .6  # Alpha-channel
-        self.hue0 = huerange[0]
-        self.dhue = huerange[1] - huerange[0]
+        # Backgroundcolor settings (HSV --> Hue, Saturation, Value, Alpha-channel)
+        self.hsv_min = [0.66, 0.7, 1.0, 0.6]
+        self.hsv_max = [0.99, 0.7, 1.0, 0.6]
         self.bgcolor_enabled = True
-        # hue = self.hue0
-        # color = QColor.fromHsvF(hue, self.sat, self.val, self.alp)
-        # self.color = to_qvariant(color)
 
         self.minvalue = minvalue
         self.maxvalue = maxvalue
@@ -353,11 +344,9 @@ def data(self, index, role=Qt.DisplayRole):
         elif role == Qt.BackgroundColorRole:
             if self.bgcolor_enabled and value is not np.ma.masked:
                 if self.bg_gradient is None:
-                    maxdiff = self.vmax - self.vmin
                     color_val = float(self.color_func(value))
-                    hue = self.hue0 + self.dhue * (self.vmax - color_val) / maxdiff
-                    color = QColor.fromHsvF(hue, self.sat, self.val, self.alp)
-                    return to_qvariant(color)
+                    bg_gradient = LinearGradient([(self.vmin, self.hsv_min), (self.vmax, self.hsv_max)])
+                    return bg_gradient[color_val]
                 else:
                     bg_value = self.bg_value
                     x, y = index.row(), index.column()

larray_editor/utils.py

@@ -170,6 +170,12 @@ class LinearGradient(object):
     I cannot believe I had to roll my own class for this when PyQt already
     contains QLinearGradient... but you cannot get intermediate values out of
     QLinearGradient!
+    
+    Parameters
+    ----------
+    stop_points: list/tuple, optional
+        List containing pairs (stop_position, colors_HsvF). 
+        `colors` is a 4 elements list containing `hue`, `saturation`, `value` and `alpha-channel`
     """
     def __init__(self, stop_points=None):
         if stop_points is None: