Changeset 149 for trunk

Timestamp:

02/07/09 03:38:31 (3 years ago)

Author:

lgs

Message:

Add an option to draw the y vals on the bars. See #22. Patch contributed by Adam and polished by Lorenzo

Location:

trunk

Files:

• chavier/app.py (modified) (1 diff)
• pycha/bar.py (modified) (3 diffs)
• pycha/chart.py (modified) (1 diff)

trunk/chavier/app.py

@@ -101 +101 @@
             width=int,
             ),
+        yvals=dict(
+            show=bool,
+            inside=bool,
+            fontSize=int,
+            fontColor=str
+            ),
         fillOpacity=float,
         shouldFill=bool,

trunk/pycha/bar.py

@@ -93 +93 @@
                     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
 
 
@@ -129 +147 @@
         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)
+
 
 class HorizontalBarChart(BarChart):
@@ -187 +219 @@
         cx.stroke()
 
+    def _renderYVal(self, cx, label, labelW, labelH, barX, barY, barW, barH):
+        y = barY + (barH / 2.0) + (labelH / 2.0)
+        if self.options.yvals.inside:
+            x = barX + barW - (1.2 * labelW)
+        else:
+            x = barX + barW + 0.2 * labelW
+
+        # if the label doesn't fit to the left of the bar, put it to the right
+        if x < barX:
+            x = barX + barW + 0.2 * labelW
+
+        cx.move_to(x, y)
+        cx.show_text(label)
+
 
 class Rect(object):

trunk/pycha/chart.py

@@ -660 +660 @@
         width=2
     ),
+    yvals=Option(
+        show=False,
+        inside=False,
+        fontSize=11,
+        fontColor='#000000',
+    ),
     fillOpacity=1.0,
     shouldFill=True,