Changeset 161 for trunk/pycha

Timestamp:

03/12/09 03:56:05 (3 years ago)

Author:

lgs

Message:

Remove some code by using the right inheritance. See #27

Files:

• trunk/pycha/stackedbar.py (modified) (3 diffs)

trunk/pycha/stackedbar.py

@@ -16 +16 @@
 # along with PyCha.  If not, see <http://www.gnu.org/licenses/>.
 
-from pycha.chart import Chart, uniqueIndices
+from pycha.bar import BarChart, VerticalBarChart
+from pycha.chart import uniqueIndices
 from pycha.color import hex2rgb
 
 
-class StackedBarChart(Chart):
+class StackedBarChart(BarChart):
 
     def __init__(self, surface=None, options={}):
         super(StackedBarChart, self).__init__(surface, options)
-        self.bars = []
-        self.minxdelta = 0.0
         self.barWidth = 0.0
-        self.barMargin = 0.0
 
     def _updateXY(self):
@@ -72 +70 @@
         self.bars = []
 
-    def _renderChart(self, cx):
-        """Renders a horizontal/vertical bar chart"""
 
-        def drawBar(bar):
-            stroke_width = self.options.stroke.width
-            ux, uy = cx.device_to_user_distance(stroke_width, stroke_width)
-            if ux < uy:
-                ux = uy
-            cx.set_line_width(ux)
-
-            # gather bar proportions
-            x = self.area.x + self.area.w * bar.x
-            y = self.area.y + self.area.h * bar.y
-            w = self.area.w * bar.w
-            h = self.area.h * bar.h
-
-            if w < 1 or h < 1:
-                return # don't draw when the bar is too small
-
-            if self.options.stroke.shadow:
-                cx.set_source_rgba(0, 0, 0, 0.15)
-                rectangle = self._getShadowRectangle(x, y, w, h)
-                cx.rectangle(*rectangle)
-                cx.fill()
-
-            if self.options.shouldFill or (not self.options.stroke.hide):
-                cx.rectangle(x, y, w, h)
-
-                if self.options.shouldFill:
-                    cx.set_source_rgb(*self.options.colorScheme[bar.name])
-                    cx.fill_preserve()
-
-                if not self.options.stroke.hide:
-                    cx.set_source_rgb(*hex2rgb(self.options.stroke.color))
-                    cx.stroke()
-
-            # render yvals above/beside bars
-            if self.options.yvals.show:
-                cx.save()
-                cx.set_font_size(self.options.yvals.fontSize)
-                cx.set_source_rgb(*hex2rgb(self.options.yvals.fontColor))
-
-                label = unicode(bar.yval)
-                extents = cx.text_extents(label)
-                labelW = extents[2]
-                labelH = extents[3]
-
-                self._renderYVal(cx, label, labelW, labelH, x, y, w, h)
-
-                cx.restore()
-
-        cx.save()
-        for bar in self.bars:
-            drawBar(bar)
-        cx.restore()
-
-    def _renderYVal(self, cx, label, width, height, x, y, w, h):
-        raise NotImplementedError
-
-
-class StackedVerticalBarChart(StackedBarChart):
+class StackedVerticalBarChart(StackedBarChart, VerticalBarChart):
 
     def _updateChart(self):
@@ -158 +97 @@
                 if (0.0 <= rect.x <= 1.0) and (0.0 <= rect.y <= 1.0):
                     self.bars.append(rect)
-
-    def _updateTicks(self):
-        """Evaluates bar ticks"""
-        super(StackedBarChart, self)._updateTicks()
-        offset = (self.minxdelta * self.xscale) / 2
-        self.xticks = [(tick[0] + offset, tick[1]) for tick in self.xticks]
-
-    def _getShadowRectangle(self, x, y, w, h):
-        return (x-2, y-2, w+4, h+2)
-
-    def _renderYVal(self, cx, label, labelW, labelH, barX, barY, barW, barH):
-        x = barX + (barW / 2.0) - (labelW / 2.0)
-        if self.options.yvals.inside:
-            y = barY + (1.5 * labelH)
-        else:
-            y = barY - 0.5 * labelH
-
-        # if the label doesn't fit below the bar, put it above the bar
-        if y > (barY + barH):
-            y = barY - 0.5 * labelH
-
-        cx.move_to(x, y)
-        cx.show_text(label)