Fix ordering calc. wireservice#26

nbedi · Jun 16, 2016 · fdef462 · fdef462
1 parent 5f1ce06
commit fdef462
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/examples/charts/grouped_bars.svg b/examples/charts/grouped_bars.svg
diff --git a/examples/charts/grouped_columns.svg b/examples/charts/grouped_columns.svg
diff --git a/leather/shapes/grouped_bars.py b/leather/shapes/grouped_bars.py
@@ -56,9 +56,9 @@ def to_svg(self, width, height, x_scale, y_scale, series, palette):
 
             y1, y2 = y_scale.project_interval(d.z, height, 0)
 
-            group_height = (y1 - y2) / category_counts[d.z]
-            y1 = y2 + (group_height * (seen_counts[d.z] + 1)) - 1
-            y2 = y2 + (group_height * seen_counts[d.z])
+            group_width = (y2 - y1) / category_counts[d.z]
+            y2 = y1 + (group_width * (seen_counts[d.z] + 1)) + 1
+            y1 = y1 + (group_width * seen_counts[d.z])
 
             proj_x = x_scale.project(d.x, 0, width)
 

diff --git a/leather/shapes/grouped_columns.py b/leather/shapes/grouped_columns.py
@@ -56,9 +56,9 @@ def to_svg(self, width, height, x_scale, y_scale, series, palette):
 
             x1, x2 = x_scale.project_interval(d.z, 0, width)
 
-            group_width = (x1 - x2) / category_counts[d.z]
-            x1 = x2 + (group_width * (seen_counts[d.z] + 1)) + 1
-            x2 = x2 + (group_width * seen_counts[d.z])
+            group_width = (x2 - x1) / category_counts[d.z]
+            x2 = x1 + (group_width * (seen_counts[d.z] + 1)) + 1
+            x1 = x1 + (group_width * seen_counts[d.z])
 
             proj_y = y_scale.project(d.y, height, 0)
 

diff --git a/tests/test_shapes.py b/tests/test_shapes.py
@@ -209,6 +209,8 @@ def test_to_svg(self):
         self.assertEqual(len(rects), 7)
         self.assertEqual(float(rects[1].get('x')), 0)
         self.assertEqual(float(rects[1].get('width')), 100)
+        self.assertEqual(float(rects[3].get('y')), 36)
+        self.assertEqual(float(rects[3].get('height')), 14)
         self.assertEqual(rects[1].get('fill'), 'white')
 
     def test_invalid_fill_color(self):
@@ -279,8 +281,8 @@ def test_to_svg(self):
         self.assertEqual(len(rects), 7)
         self.assertEqual(float(rects[1].get('y')), 100)
         self.assertEqual(float(rects[1].get('height')), 100)
-        self.assertEqual(float(rects[3].get('y')), 120)
-        self.assertEqual(float(rects[3].get('height')), 80)
+        self.assertEqual(float(rects[3].get('x')), 50)
+        self.assertEqual(float(rects[3].get('width')), 16)
         self.assertEqual(rects[1].get('fill'), 'white')
 
     def test_invalid_fill_color(self):