Merge pull request #3574 from mdboom/regular-polygon-rotation

tacaswell · tacaswell · commit 638adf4a2508 · 2014-09-30T11:26:01.000-04:00
BUG : `rotation` parameter had no effect on `RegularPolyCollection`
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -927,6 +927,15 @@ def get_numsides(self):
     def get_rotation(self):
         return self._rotation
 
+    @allow_rasterization
+    def draw(self, renderer):
+        self.set_sizes(self._sizes, self.figure.dpi)
+        self._transforms = [
+            transforms.Affine2D(x).rotate(-self._rotation).get_matrix()
+            for x in self._transforms
+        ]
+        Collection.draw(self, renderer)
+
 
 class StarPolygonCollection(RegularPolyCollection):
     """
diff --git a/lib/matplotlib/tests/baseline_images/test_collections/regularpolycollection_rotate.png b/lib/matplotlib/tests/baseline_images/test_collections/regularpolycollection_rotate.png
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -513,6 +513,22 @@ def test_polycollection_close():
     ax.set_ylim3d(0, 4)
 
 
+@image_comparison(baseline_images=['regularpolycollection_rotate'],
+                  extensions=['png'], remove_text=True)
+def test_regularpolycollection_rotate():
+    xx, yy = np.mgrid[:10, :10]
+    xy_points = np.transpose([xx.flatten(), yy.flatten()])
+    rotations = np.linspace(0, 2*np.pi, len(xy_points))
+
+    fig, ax = plt.subplots()
+    for xy, alpha in zip(xy_points, rotations):
+        col = mcollections.RegularPolyCollection(
+            4, sizes=(100,), rotation=alpha,
+            offsets=xy, transOffset=ax.transData)
+        ax.add_collection(col, autolim=True)
+    ax.autoscale_view()
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
