Changeset 45

Timestamp:

23/08/08 06:46:04 (3 months ago)

Author:

gak

Message:

• Bug fixed when automatic scaling is on and None values are in a data set (#5) (Alec Thomas)

Location:

trunk

Files:

• pygooglechart.py (modified) (4 diffs)
• test/test.py (modified) (2 diffs)

trunk/pygooglechart.py

@@ -499 +499 @@
             return ExtendedData
 
+    def _filter_none(self, data):
+        return [r for r in data if r is not None]
+
     def data_x_range(self):
         """Return a 2-tuple giving the minimum and maximum x-axis
@@ -504 +507 @@
         """
         try:
-            lower = min([min(s) for type, s in self.annotated_data()
+            lower = min([min(self._filter_none(s))
+                         for type, s in self.annotated_data()
                          if type == 'x'])
-            upper = max([max(s) for type, s in self.annotated_data()
+            upper = max([max(self._filter_none(s))
+                         for type, s in self.annotated_data()
                          if type == 'x'])
             return (lower, upper)
@@ -517 +522 @@
         """
         try:
-            lower = min([min(s) for type, s in self.annotated_data()
+            lower = min([min(self._filter_none(s))
+                         for type, s in self.annotated_data()
                          if type == 'y'])
-            upper = max([max(s) + 1 for type, s in self.annotated_data()
+            upper = max([max(self._filter_none(s)) + 1
+                         for type, s in self.annotated_data()
                          if type == 'y'])
             return (lower, upper)
@@ -563 +570 @@
             elif type == 'marker-size':
                 scale_range = (0, max(dataset))
-            scaled_data.append([data_class.scale_value(v, scale_range)
-                                for v in dataset])
+            scaled_dataset = []
+            for v in dataset:
+                if v is None:
+                    scaled_dataset.append(None)
+                else:
+                    scaled_dataset.append(
+                        data_class.scale_value(v, scale_range))
+            scaled_data.append(scaled_dataset)
         return scaled_data
 

trunk/test/test.py

@@ -33 +33 @@
 
     def assertChartURL(self, url, query):
-        return url.endswith(query)
+        self.assertTrue(url.endswith(query))
 
 
@@ -99 +99 @@
 
 
-class TestChartQR(TestBase):
+class TestLineChart(TestBase):
+
+    def test_none_data(self):
+        chart = gc.SimpleLineChart(300, 100)
+        chart.add_data([1, 2, 3, None, 5])
+        self.assertChartURL(chart.get_url(), \
+            '?cht=lc&chs=300x100&chd=e:KrVVgA__1V')
+
+class TestQRChart(TestBase):
 
     def assertQRImage(self, chart, text):