Changeset 76 for trunk

Timestamp:

03/20/08 05:52:06 (4 years ago)

Author:

lgs

Message:

Make bar charts more robust by allowing datasets with just one point. Patch by jae_AT_zhar.net that fixes #9

Location:

trunk

Files:

• src/bar.py (modified) (2 diffs)
• tests/bar.py (modified) (1 diff)

trunk/src/bar.py

@@ -32 +32 @@
         stores = self._getDatasetsValues()
         uniqx = uniqueIndices(stores)
-        xdelta = min([abs(uniqx[j] - uniqx[j-1]) for j in range(1, len(uniqx))])
 
         barWidth = 0
@@ -43 +42 @@
             self.barMargin = (1.0 - self.options.barWidthFillFraction) / 2
         else:
+            xdelta = min([abs(uniqx[j] - uniqx[j-1])
+                          for j in range(1, len(uniqx))])
             self.xscale = 1.0 / (self.xrange + 1)
             barWidth = xdelta * self.xscale * self.options.barWidthFillFraction

trunk/tests/bar.py

@@ -40 +40 @@
         self.assertEqual(ch.bars, [])
         self.assertEqual(ch.minxdelta, 0)
+
+    def test_updateChart(self):
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 500, 500)
+        # An evil dataset with just one point. See bug #9
+        dataset = (
+            ('dataset1', ([0, 0],)),
+        )
+        ch = pycha.bar.BarChart(surface)
+        ch.addDataset(dataset)
+        ch._updateXY()
+        ch._updateChart()
+
+        self.assertEqual(ch.xscale, 1.0)
+        self.assertEqual(ch.minxval, 0)
+        self.assertAlmostEqual(ch.barWidthForSet, 0.75, 4)
+        self.assertAlmostEqual(ch.barMargin, 0.125, 4)
 
 class VerticalBarTests(unittest.TestCase):