TST: Update test_as_mpl_selector to accept rotated regions

Author: dhomeier

CHANGES.rst

@@ -59,6 +59,9 @@ New Features
 
 - Added the DS9 'boxcircle' point symbol. [#387]
 
+- Enable rotation of the ``as_mpl_selector`` widgets for rectangular
+  and ellipse regions with matplotlib versions supporting this. [#390]
+
 - Added the ability to add and subtract ``PixCoord`` objects. [#396]
 
 - Added an ``origin`` keyword to ``PolygonPixelRegion`` to allow

regions/shapes/ellipse.py

@@ -280,7 +280,7 @@ def as_mpl_selector(self, ax, active=True, sync=True, callback=None,
         if hasattr(self, '_mpl_selector'):
             raise AttributeError('Cannot attach more than one selector to a region.')
 
-        if self.angle.value != 0 and not hasattr(EllipseSelector, '_rotation'):
+        if self.angle.value != 0 and not hasattr(EllipseSelector, 'rotation'):
             raise NotImplementedError('Cannot create matplotlib selector for rotated ellipse.')
 
         if sync:
@@ -307,8 +307,7 @@ def sync_callback(*args, **kwargs):
                                       xy0[1], self.center.y + self.height / 2)
 
         if self.angle.value != 0:
-            self._mpl_selector._set_corner_width_rotation(xy0, self.width, self.height,
-                                                          self.angle.to_value('radian'))
+            self._mpl_selector.rotation = self.angle.to_value('radian')
 
         self._mpl_selector.set_active(active)
         self._mpl_selector_callback = callback

regions/shapes/rectangle.py

@@ -276,7 +276,7 @@ def as_mpl_selector(self, ax, active=True, sync=True, callback=None,
         if hasattr(self, '_mpl_selector'):
             raise AttributeError('Cannot attach more than one selector to a region.')
 
-        if self.angle.value != 0 and not hasattr(RectangleSelector, '_rotation'):
+        if self.angle.value != 0 and not hasattr(RectangleSelector, 'rotation'):
             raise NotImplementedError('Cannot create matplotlib selector for rotated rectangle.')
 
         if sync:
@@ -303,8 +303,7 @@ def sync_callback(*args, **kwargs):
                                       xy0[1], self.center.y + self.height / 2)
 
         if self.angle.value != 0:
-            self._mpl_selector._set_corner_width_rotation(xy0, self.width, self.height,
-                                                          self.angle.to_value('radian'))
+            self._mpl_selector.rotation = self.angle.to_value('radian')
 
         self._mpl_selector.set_active(active)
         self._mpl_selector_callback = callback

regions/shapes/tests/test_ellipse.py

@@ -129,12 +129,16 @@ def update_mask(reg):
         # For now this will only work with unrotated ellipses. Once this
         # works with rotated ellipses, the following exception check can
         # be removed as well as the ``angle=0 * u.deg`` in the call to
-        # copy() below.
-        with pytest.raises(NotImplementedError,
-                           match=('Cannot create matplotlib selector for rotated ellipse.')):
-            self.reg.as_mpl_selector(ax)
+        # copy() below - should (hopefully) be implemented with mpl 3.6.
+        if MPL_VERSION < 36:
+            with pytest.raises(NotImplementedError,
+                               match=('Cannot create matplotlib selector for rotated ellipse.')):
+                self.reg.as_mpl_selector(ax)
+            angle = 0 * u.deg
+        else:
+            angle = self.reg.angle
 
-        region = self.reg.copy(angle=0 * u.deg)
+        region = self.reg.copy(angle=angle)
 
         selector = region.as_mpl_selector(ax, callback=update_mask, sync=sync)
 
@@ -160,7 +164,7 @@ def update_mask(reg):
             assert_allclose(region.center.y, 4)
             assert_allclose(region.width, 4)
             assert_allclose(region.height, 3)
-            assert_quantity_allclose(region.angle, 0 * u.deg)
+            assert_quantity_allclose(region.angle, angle)
 
             assert_equal(mask, 0)
 

regions/shapes/tests/test_rectangle.py

@@ -135,12 +135,17 @@ def update_mask(reg):
         # For now this will only work with unrotated rectangles. Once
         # this works with rotated rectangles, the following exception
         # check can be removed as well as the ``angle=0 * u.deg`` in the
-        # call to copy() below.
-        with pytest.raises(NotImplementedError,
-                           match=('Cannot create matplotlib selector for rotated rectangle.')):
-            self.reg.as_mpl_selector(ax)
+        # copy() below - should (hopefully) be implemented with mpl 3.6.
+        if MPL_VERSION < 36:
+            with pytest.raises(NotImplementedError,
+                               match=('Cannot create matplotlib selector for rotated rectangle.')):
+                self.reg.as_mpl_selector(ax)
 
-        region = self.reg.copy(angle=0 * u.deg)
+            angle = 0 * u.deg
+        else:
+            angle = self.reg.angle
+
+        region = self.reg.copy(angle=angle)
 
         selector = region.as_mpl_selector(ax, callback=update_mask, sync=sync)
 
@@ -164,7 +169,7 @@ def update_mask(reg):
             assert_allclose(region.center.y, 4)
             assert_allclose(region.width, 4)
             assert_allclose(region.height, 3)
-            assert_quantity_allclose(region.angle, 0 * u.deg)
+            assert_quantity_allclose(region.angle, angle)
 
             assert_equal(mask, 0)