Merge pull request matplotlib#5547 from mdboom/collections-data-space

Fix matplotlib#5545: Fix collection scale in data space

Author: tacaswell

lib/matplotlib/tests/baseline_images/test_collections/size_in_xy.png

@@ -597,6 +597,26 @@ def test_linestyle_single_dashes():
     plt.draw()
 
 
+@image_comparison(baseline_images=['size_in_xy'], remove_text=True,
+                  extensions=['png'])
+def test_size_in_xy():
+    fig, ax = plt.subplots()
+
+    widths, heights, angles = (10, 10), 10, 0
+    widths = 10, 10
+    coords = [(10, 10), (15, 15)]
+    e = mcollections.EllipseCollection(
+        widths, heights, angles,
+        units='xy',
+        offsets=coords,
+        transOffset=ax.transData)
+
+    ax.add_collection(e)
+
+    ax.set_xlim(0, 30)
+    ax.set_ylim(0, 30)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_collections.py

@@ -986,6 +986,7 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
                                       subtrans(1, 1),
                                       subtrans(0, 2),
                                       subtrans(1, 2));
+            trans *= master_transform;
         } else {
             trans = master_transform;
         }