Changeset 81

Timestamp:

03/21/08 13:32:34 (4 years ago)

Author:

lgs

Message:

Support for drawing the whole background in a solid color. Patch by jae. See #6

Location:

trunk

Files:

• examples/barchart.py (modified) (2 diffs)
• examples/hbarchart.png (modified) (previous)
• examples/vbarchart.png (modified) (previous)
• src/chart.py (modified) (2 diffs)
• src/pie.py (modified) (1 diff)

trunk/examples/barchart.py

@@ -41 +41 @@
         },
         'background': {
-            'color': '#eeeeff',
+            'chartColor': '#ffeeff',
+            'baseColor': '#ffffff',
             'lineColor': '#444444'
         },
@@ -50 +51 @@
         'padding': {
             'left': 55
-        }
+        },
+        'title': 'Sample Chart'
     }
     chart = chartFactory(surface, options)

trunk/src/chart.py

@@ -258 +258 @@
 
         cx.save()
-        cx.set_source_rgb(*hex2rgb(self.options.background.color))
-        cx.rectangle(self.area.x, self.area.y, self.area.w, self.area.h)
-        cx.fill()
-        cx.set_source_rgb(*hex2rgb(self.options.background.lineColor))
-        cx.set_line_width(self.options.axis.lineWidth)
-
-        self._renderLines(cx)
+
+        if self.options.background.baseColor:
+            cx.set_source_rgb(*hex2rgb(self.options.background.baseColor))
+            x, y, w, h = 0, 0, self.area.w, self.area.h
+            w += self.options.padding.left + self.options.padding.right
+            h += self.options.padding.top + self.options.padding.bottom
+            cx.rectangle(x, y, w, h)
+            cx.fill() 
+
+        if self.options.background.chartColor:
+            cx.set_source_rgb(*hex2rgb(self.options.background.chartColor))
+            cx.rectangle(self.area.x, self.area.y, self.area.w, self.area.h)
+            cx.fill() 
+
+        if self.options.background.lineColor:
+            cx.set_source_rgb(*hex2rgb(self.options.background.lineColor))
+            cx.set_line_width(self.options.axis.lineWidth)
+            self._renderLines(cx) 
 
         cx.restore()
@@ -493 +504 @@
     ),
     background=Option(
-        color='#f5f5f5',
         hide=False,
+        baseColor=None,
+        chartColor='#f5f5f5',
         lineColor='#ffffff',
         lineWidth=1.5,

trunk/src/pie.py

@@ -80 +80 @@
         
         cx.save()
-        cx.set_source_rgb(*hex2rgb(self.options.background.color))
-        cx.rectangle(self.area.x, self.area.y, self.area.w, self.area.h)
-        cx.fill()
+
+        if self.options.background.baseColor:
+            cx.set_source_rgb(*hex2rgb(self.options.background.baseColor))
+            x, y, w, h = 0, 0, self.area.w, self.area.h
+            w += self.options.padding.left + self.options.padding.right
+            h += self.options.padding.top + self.options.padding.bottom
+            cx.rectangle(x, y, w, h)
+            cx.fill()
+        
         cx.restore()