Changeset 176 for trunk/pycha

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/pycha

Files:

• bar.py (modified) (1 diff)
• stackedbar.py (modified) (1 diff)

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 = []