Changeset 170 for trunk

Timestamp:

03/18/09 15:35:07 (3 years ago)

Author:

lgs

Message:

Implement different color schemes. Fixes #29

Location:

trunk

Files:

• examples/color (added)
• examples/color/colorschemes.py (added)
• pycha/chart.py (modified) (3 diffs)
• pycha/color.py (modified) (3 diffs)
• tests/color.py (modified) (3 diffs)

trunk/pycha/chart.py

@@ -17 +17 @@
 
 import copy
+import inspect
 import math
 
@@ -121 +122 @@
         colorSchemeClass = ColorScheme.getColorScheme(name, None)
         if colorSchemeClass is None:
-            raise ValueError('Color scheme is invalid!')
-
+            raise ValueError('Color scheme "%s" is invalid!' % name)
+
+        # Remove invalid args before calling the constructor
         kwargs = dict(self.options.colorScheme.args)
+        validArgs = inspect.getargspec(colorSchemeClass.__init__)[0]
+        kwargs = dict([(k, v) for k, v in kwargs.items() if k in validArgs])
         self.colorScheme = colorSchemeClass(keys, **kwargs)
 
@@ -672 +676 @@
     colorScheme=Option(
         name='gradient',
-        args=Option(initialColor=DEFAULT_COLOR),
+        args=Option(
+            initialColor=DEFAULT_COLOR,
+            colors=[],
+            ),
     ),
     title=None,

trunk/pycha/color.py

@@ -16 +16 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with PyCha.  If not, see <http://www.gnu.org/licenses/>.
+
+import math
 
 DEFAULT_COLOR = '#3c581a'
@@ -45 +47 @@
     b = int(hexstring[digits*2+1:digits*3+1], 16)
     return r / top, g / top, b / top
+
+
+def rgb2hsv(r, g, b):
+    """Converts a RGB color into a HSV one
+
+    See http://en.wikipedia.org/wiki/HSV_color_space
+    """
+    maximum = max(r, g, b)
+    minimum = min(r, g, b)
+    if maximum == minimum:
+        h = 0.0
+    elif maximum == r:
+        h = 60.0 * ((g - b) / (maximum - minimum)) + 360.0
+        if h >= 360.0:
+            h -= 360.0
+    elif maximum == g:
+        h = 60.0 * ((b - r) / (maximum - minimum)) + 120.0
+    elif maximum == b:
+        h = 60.0 * ((r - g) / (maximum - minimum)) + 240.0
+
+    if maximum == 0.0:
+        s = 0.0
+    else:
+        s = 1.0 - (minimum / maximum)
+
+    v = maximum
+
+    return h, s, v
+
+
+def hsv2rgb(h, s, v):
+    """Converts a HSV color into a RGB one
+
+    See http://en.wikipedia.org/wiki/HSV_color_space
+    """
+    hi = int(math.floor(h / 60.0)) % 6
+    f = (h / 60.0) - hi
+    p = v * (1 - s)
+    q = v * (1 - f * s)
+    t = v * (1 - (1 - f) * s)
+
+    if hi == 0:
+        r, g, b = v, t, p
+    elif hi == 1:
+        r, g, b = q, v, p
+    elif hi == 2:
+        r, g, b = p, v, t
+    elif hi == 3:
+        r, g, b = p, q, v
+    elif hi == 4:
+        r, g, b = t, p, v
+    elif hi == 5:
+        r, g, b = v, p, q
+
+    return r, g, b
 
 
@@ -112 +169 @@
         for i, key in enumerate(keys):
             self[key] = lighten(r, g, b, light * i)
+
+
+class FixedColorScheme(ColorScheme):
+    """In this color scheme fixed colors are used.
+
+    These colors are provided as a list argument in the constructor.
+    """
+
+    def __init__(self, keys, colors=[]):
+        super(FixedColorScheme, self).__init__(keys)
+
+        if len(keys) != len(colors):
+            raise ValueError("You must provide as many colors as datasets "
+                             "for the fixed color scheme")
+
+        for i, key in enumerate(keys):
+            self[key] = hex2rgb(colors[i])
+
+
+class RainbowColorScheme(ColorScheme):
+
+    def __init__(self, keys, initialColor=DEFAULT_COLOR):
+        super(RainbowColorScheme, self).__init__(keys)
+        if initialColor in basicColors:
+            initialColor = basicColors[initialColor]
+
+        r, g, b = hex2rgb(initialColor)
+        h, s, v = rgb2hsv(r, g, b)
+
+        angleDelta = 360.0 / (len(keys) + 1)
+        for key in keys:
+            self[key] = hsv2rgb(h, s, v)
+            h += angleDelta
+            if h >= 360.0:
+                h -= 360.0

trunk/tests/color.py

@@ -57 +57 @@
         self.assertEqual(1, color[2])
 
+    def test_rgb2hsv_and_hsv2rgb(self):
+        for rgb, hsv in (((1.0, 0.0, 0.0), (0.0, 1.0, 1.0)),
+                         ((1.0, 0.5, 0.0), (30.0, 1.0, 1.0)),
+                         ((1.0, 1.0, 0.0), (60.0, 1.0, 1.0)),
+                         ((0.5, 1.0, 0.0), (90.0, 1.0, 1.0)),
+                         ((0.0, 1.0, 0.0), (120.0, 1.0, 1.0)),
+                         ((0.0, 1.0, 0.5), (150.0, 1.0, 1.0)),
+                         ((0.0, 1.0, 1.0), (180.0, 1.0, 1.0)),
+                         ((0.0, 0.5, 1.0), (210.0, 1.0, 1.0)),
+                         ((0.0, 0.0, 1.0), (240.0, 1.0, 1.0)),
+                         ((0.5, 0.0, 1.0), (270.0, 1.0, 1.0)),
+                         ((1.0, 0.0, 1.0), (300.0, 1.0, 1.0)),
+                         ((1.0, 0.0, 0.5), (330.0, 1.0, 1.0)),
+                         ((0.375, 0.5, 0.25), (90.0, 0.5, 0.5)),
+                         ((0.21875, 0.25, 0.1875), (90.0, 0.25, 0.25))):
+            self._assertColors(pycha.color.rgb2hsv(*rgb), hsv, 5)
+            self._assertColors(pycha.color.hsv2rgb(*hsv), rgb, 5)
+
     def test_lighten(self):
         r, g, b = (1.0, 1.0, 0.0)
@@ -80 +98 @@
                           pycha.color.ColorScheme.getColorScheme('foo'))
 
+    def test_FixedColorScheme(self):
+        keys = range(3)
+        colors = ((1.0, 0.0, 0.0), (0.0, 1.0, 0.0), (0.0, 0.0, 1.0))
+        scheme = pycha.color.FixedColorScheme(keys, colors)
+        self._assertColors(scheme[0], (1.0, 0.0, 0.0), 1)
+        self._assertColors(scheme[1], (0.0, 1.0, 0.0), 3)
+        self._assertColors(scheme[2], (0.0, 0.0, 1.0), 3)
+
     def test_GradientColorScheme(self):
         keys = range(5)
-        scheme = pycha.color.GradientColorScheme(keys, "000000")
+        scheme = pycha.color.GradientColorScheme(keys, "#000000")
         self._assertColors(scheme[0], (0.0, 0.0, 0.0), 3)
         self._assertColors(scheme[1], (0.1, 0.1, 0.1), 3)
@@ -108 +134 @@
         self.assertNotAlmostEqual(color[2], 1.0, 4)
 
+    def test_RainbowColorScheme(self):
+        keys = range(5)
+        scheme = pycha.color.GradientColorScheme(keys, "#ff0000")
+        self._assertColors(scheme[0], (1.0, 0.0, 0.0), 3)
+        self._assertColors(scheme[1], (1.0, 0.1, 0.1), 3)
+        self._assertColors(scheme[2], (1.0, 0.2, 0.2), 3)
+        self._assertColors(scheme[3], (1.0, 0.3, 0.3), 3)
+        self._assertColors(scheme[4], (1.0, 0.4, 0.4), 3)
+
 
 def test_suite():