Changeset 169 for trunk/pycha/chart.py

Timestamp:

03/17/09 05:27:31 (3 years ago)

Author:

lgs

Message:

Big refactor about how the colors scheme are created and used. See #29

Files:

• trunk/pycha/chart.py (modified) (5 diffs)

trunk/pycha/chart.py

@@ -21 +21 @@
 import cairo
 
-from pycha.color import (defaultColorscheme, getColorscheme, hex2rgb,
-                         DEFAULT_COLOR)
+from pycha.color import ColorScheme, hex2rgb, DEFAULT_COLOR
 
 
@@ -57 +56 @@
         self._initSurface(surface)
 
+        self.colorScheme = None
+
     def addDataset(self, dataset):
         """Adds an object containing chart data to the storage hash"""
@@ -113 +114 @@
 
     def _setColorscheme(self):
-        """Sets the colorScheme used for the chart using the color in the
+        """Sets the colorScheme used for the chart using the
         options.colorScheme option
         """
-        scheme = self.options.colorScheme
+        name = self.options.colorScheme.name
         keys = self._getDatasetsKeys()
-        if isinstance(scheme, dict):
-            if not scheme:
-                self.options.colorScheme = defaultColorscheme(keys)
-        elif isinstance(scheme, basestring):
-            self.options.colorScheme = getColorscheme(scheme, keys)
-        else:
-            raise TypeError("Color scheme is invalid!")
+        colorSchemeClass = ColorScheme.getColorScheme(name, None)
+        if colorSchemeClass is None:
+            raise ValueError('Color scheme is invalid!')
+
+        kwargs = dict(self.options.colorScheme.args)
+        self.colorScheme = colorSchemeClass(keys, **kwargs)
 
     def _initSurface(self, surface):
@@ -552 +552 @@
         def drawKey(key, x, y, text_height):
             cx.rectangle(x, y, bullet, bullet)
-            cx.set_source_rgb(*self.options.colorScheme[key])
+            cx.set_source_rgb(*self.colorScheme[key])
             cx.fill_preserve()
             cx.set_source_rgb(0, 0, 0)
@@ -670 +670 @@
     barWidthFillFraction=0.75,
     pieRadius=0.4,
-    colorScheme=DEFAULT_COLOR,
+    colorScheme=Option(
+        name='gradient',
+        args=Option(initialColor=DEFAULT_COLOR),
+    ),
     title=None,
     titleFont='Tahoma',