Changeset 176

Timestamp:

03/22/09 03:38:17 (3 years ago)

Author:

lgs

Message:

Fix in the computation of the bar width when there is just one data point and a custom range. Fixes #20

Location:

trunk

Files:

• pycha/bar.py (modified) (1 diff)
• pycha/stackedbar.py (modified) (1 diff)
• tests/bar.py (modified) (13 diffs)

trunk/pycha/bar.py

@@ -40 +40 @@
         uniqx = uniqueIndices(stores)
 
-        barWidth = 0
         if len(uniqx) == 1:
-            xdelta = 1.0
-            barWidth = 1.0 * self.options.barWidthFillFraction
-            self.barWidthForSet = barWidth / len(stores)
-            self.barMargin = (1.0 - self.options.barWidthFillFraction) / 2
+            self.minxdelta = 1.0
         else:
-            xdelta = min([abs(uniqx[j] - uniqx[j-1])
-                          for j in range(1, len(uniqx))])
-            barWidth = xdelta * self.xscale * self.options.barWidthFillFraction
-            self.barWidthForSet = barWidth / len(stores)
-            self.barMargin = (xdelta * self.xscale
-                              * (1.0 - self.options.barWidthFillFraction) / 2)
-
-        self.minxdelta = xdelta
+            self.minxdelta = min([abs(uniqx[j] - uniqx[j-1])
+                                  for j in range(1, len(uniqx))])
+
+        k = self.minxdelta * self.xscale
+        barWidth = k * self.options.barWidthFillFraction
+        self.barWidthForSet = barWidth / len(stores)
+        self.barMargin = k * (1.0 - self.options.barWidthFillFraction) / 2
+
         self.bars = []
 

trunk/pycha/stackedbar.py

@@ -53 +53 @@
         uniqx = uniqueIndices(stores)
 
-        barWidth = 0
         if len(uniqx) == 1:
-            xdelta = 1.0
-            self.barWidth = 1.0 * self.options.barWidthFillFraction
-            self.barMargin = (1.0 - self.options.barWidthFillFraction) / 2
+            self.minxdelta = 1.0
         else:
-            xdelta = min([abs(uniqx[j] - uniqx[j-1])
-                          for j in range(1, len(uniqx))])
-            self.barWidth = (xdelta * self.xscale
-                             * self.options.barWidthFillFraction)
-            self.barMargin = (xdelta * self.xscale
-                              * (1.0 - self.options.barWidthFillFraction) / 2)
+            self.minxdelta = min([abs(uniqx[j] - uniqx[j-1])
+                                  for j in range(1, len(uniqx))])
 
-        self.minxdelta = xdelta
+        k = self.minxdelta * self.xscale
+        self.barWidth = k * self.options.barWidthFillFraction
+        self.barMargin = k * (1.0 - self.options.barWidthFillFraction) / 2
+
         self.bars = []
 

trunk/tests/bar.py

@@ -1 @@
-# Copyright (c) 2007-2008 by Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com>
+# Copyright(c) 2007-2009 by Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com>
 #
 # This file is part of PyCha.
@@ -22 +22 @@
 import pycha.bar
 
+
 class RectTests(unittest.TestCase):
 
@@ -34 +35 @@
         self.assertEqual(r.name, 'test')
 
+
 class BarTests(unittest.TestCase):
 
@@ -45 +47 @@
         # An evil dataset with just one point. See bug #9
         dataset = (
-            ('dataset1', ([0, 0],)),
+            ('dataset1', ([0, 0], )),
         )
         ch = pycha.bar.BarChart(surface)
@@ -54 +56 @@
         self.assertEqual(ch.xscale, 1.0)
         self.assertEqual(ch.minxval, 0)
+        self.assertEqual(ch.minxdelta, 1.0)
         self.assertAlmostEqual(ch.barWidthForSet, 0.75, 4)
         self.assertAlmostEqual(ch.barMargin, 0.125, 4)
+
+    def test_customRangeWithOnePoint(self):
+        """Weird results with a custom range and just one point. See bug #20"""
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 500, 500)
+
+        dataset = (
+            ('dataset1', ([0, 1], )),
+        )
+        options = {
+            'axis': {
+                'x': {
+                    'range': (0.0, 4.0),
+                    },
+                },
+            }
+        ch = pycha.bar.BarChart(surface, options)
+        ch.addDataset(dataset)
+        ch._updateXY()
+        ch._updateChart()
+
+        self.assertEqual(ch.xscale, 0.2)
+        self.assertEqual(ch.minxval, 0)
+        self.assertEqual(ch.minxdelta, 1.0)
+        self.assertAlmostEqual(ch.barWidthForSet, 0.15, 2)
+        self.assertAlmostEqual(ch.barMargin, 0.025, 3)
+
 
 class VerticalBarTests(unittest.TestCase):
@@ -132 +161 @@
             R(0.03125, 0.625, 0.1875, 0.375, 0, -3, 'dataset1'),
             R(0.28125, 0.625, 0.1875, 0.125, 1, -1, 'dataset1'),
-            R(0.53125, 0.250, 0.1875, 0.375, 2,  3, 'dataset1'),
-            R(0.78125, 0.000, 0.1875, 0.625, 3,  5, 'dataset1'),
+            R(0.53125, 0.250, 0.1875, 0.375, 2, 3, 'dataset1'),
+            R(0.78125, 0.000, 0.1875, 0.625, 3, 5, 'dataset1'),
             )
 
@@ -165 +194 @@
             (1.0, 0.0), (0.9, 0.4), (0.8, 0.8), (0.7, 1.2), (0.6, 1.6),
             (0.5, 2.0), (0.4, 2.4), (0.3, 2.8), (0.2, 3.2), (0.1, 3.6),
-            (0.0, 4.0)
+            (0.0, 4.0),
             ]
         for i in range(len(yticks)):
@@ -189 +218 @@
             (1.0, -2.0), (0.9, -1.5), (0.8, -1.0), (0.7, -0.5), (0.6, 0.0),
             (0.5, 0.5), (0.4, 1.0), (0.3, 1.5), (0.2, 2.0), (0.1, 2.5),
-            (0.0, 3.0)
+            (0.0, 3.0),
             ]
         for i in range(len(yticks)):
@@ -199 +228 @@
         shadow = ch._getShadowRectangle(10, 20, 400, 300)
         self.assertEqual(shadow, (8, 18, 404, 302))
+
 
 class HorizontalBarTests(unittest.TestCase):
@@ -295 +325 @@
             (0.0, 0.0), (0.1, 0.4), (0.2, 0.8), (0.3, 1.2), (0.4, 1.6),
             (0.5, 2.0), (0.6, 2.4), (0.7, 2.8), (0.8, 3.2), (0.9, 3.6),
-            (1.0, 4.0)
+            (1.0, 4.0),
             ]
         for i in range(len(xticks)):
@@ -319 +349 @@
             (0.0, -2.0), (0.1, -1.5), (0.2, -1.0), (0.3, -0.5), (0.4, 0.0),
             (0.5, 0.5), (0.6, 1.0), (0.7, 1.5), (0.8, 2.0), (0.9, 2.5),
-            (1.0, 3.0)
+            (1.0, 3.0),
             ]
         for i in range(len(xticks)):
@@ -334 +364 @@
         shadow = ch._getShadowRectangle(10, 20, 400, 300)
         self.assertEqual(shadow, (10, 18, 402, 304))
+
 
 def test_suite():
@@ -345 +376 @@
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-