Merge pull request matplotlib#10328 from anntzer/deg2rad

Use deg2rad/rad2deg where appropriate.

Author: jklymak

lib/matplotlib/projections/geo.py

@@ -203,7 +203,7 @@ def set_longitude_grid_ends(self, degrees):
         """
         Set the latitude(s) at which to stop drawing the longitude grids.
         """
-        self._longitude_cap = degrees * (np.pi / 180.0)
+        self._longitude_cap = np.deg2rad(degrees)
         self._xaxis_pretransform \
             .clear() \
             .scale(1.0, self._longitude_cap * 2.0) \

lib/matplotlib/projections/polar.py

@@ -1016,9 +1016,7 @@ def get_yaxis_text2_transform(self, pad):
         return self._yaxis_text_transform + pad_shift, 'center', halign
 
     def draw(self, *args, **kwargs):
-        thetamin, thetamax = self._realViewLim.intervalx
-        thetamin *= 180 / np.pi
-        thetamax *= 180 / np.pi
+        thetamin, thetamax = np.rad2deg(self._realViewLim.intervalx)
         if thetamin > thetamax:
             thetamin, thetamax = thetamax, thetamin
         rmin, rmax = self._realViewLim.intervaly - self.get_rorigin()
@@ -1260,8 +1258,8 @@ def set_thetagrids(self, angles, labels=None, frac=None, fmt=None,
 
         # Make sure we take into account unitized data
         angles = self.convert_yunits(angles)
-        angles = np.asarray(angles, float)
-        self.set_xticks(angles * (np.pi / 180.0))
+        angles = np.deg2rad(angles)
+        self.set_xticks(angles)
         if labels is not None:
             self.set_xticklabels(labels)
         elif fmt is not None:

lib/matplotlib/tests/test_axes.py

@@ -604,22 +604,18 @@ def test_const_xy():
 @image_comparison(baseline_images=['polar_wrap_180', 'polar_wrap_360'],
                   style='default')
 def test_polar_wrap():
-    D2R = np.pi / 180.0
-
     fig = plt.figure()
-
     plt.subplot(111, polar=True)
-
-    plt.polar([179*D2R, -179*D2R], [0.2, 0.1], "b.-")
-    plt.polar([179*D2R,  181*D2R], [0.2, 0.1], "g.-")
+    plt.polar(np.deg2rad([179, -179]), [0.2, 0.1], "b.-")
+    plt.polar(np.deg2rad([179,  181]), [0.2, 0.1], "g.-")
     plt.rgrids([0.05, 0.1, 0.15, 0.2, 0.25, 0.3])
     assert len(fig.axes) == 1, 'More than one polar axes created.'
-    fig = plt.figure()
 
+    fig = plt.figure()
     plt.subplot(111, polar=True)
-    plt.polar([2*D2R, -2*D2R], [0.2, 0.1], "b.-")
-    plt.polar([2*D2R,  358*D2R], [0.2, 0.1], "g.-")
-    plt.polar([358*D2R,  2*D2R], [0.2, 0.1], "r.-")
+    plt.polar(np.deg2rad([2, -2]), [0.2, 0.1], "b.-")
+    plt.polar(np.deg2rad([2, 358]), [0.2, 0.1], "g.-")
+    plt.polar(np.deg2rad([358, 2]), [0.2, 0.1], "r.-")
     plt.rgrids([0.05, 0.1, 0.15, 0.2, 0.25, 0.3])
 
 
@@ -1253,11 +1249,11 @@ def test_arc_ellipse():
     width, height = 1e-1, 3e-1
     angle = -30
 
-    theta = np.arange(0.0, 360.0, 1.0) * np.pi / 180.0
+    theta = np.deg2rad(np.arange(360))
     x = width / 2. * np.cos(theta)
     y = height / 2. * np.sin(theta)
 
-    rtheta = angle * np.pi / 180.
+    rtheta = np.deg2rad(angle)
     R = np.array([
         [np.cos(rtheta), -np.sin(rtheta)],
         [np.sin(rtheta), np.cos(rtheta)]])

lib/matplotlib/transforms.py

@@ -1623,7 +1623,7 @@ def transform_angles(self, angles, pts, radians=False, pushoff=1e-5):
 
         # Convert back to degrees if desired
         if not radians:
-            a = a * 180.0 / np.pi
+            a = np.rad2deg(a)
 
         return a
 
@@ -2033,7 +2033,7 @@ def rotate_deg(self, degrees):
         calls to :meth:`rotate`, :meth:`rotate_deg`, :meth:`translate`
         and :meth:`scale`.
         """
-        return self.rotate(degrees * np.pi / 180.)
+        return self.rotate(np.deg2rad(degrees))
 
     def rotate_around(self, x, y, theta):
         """

lib/matplotlib/widgets.py

@@ -2431,7 +2431,7 @@ def draw_shape(self, extents):
             self.to_draw.width = 2 * a
             self.to_draw.height = 2 * b
         else:
-            rad = np.arange(31) * 12 * np.pi / 180
+            rad = np.deg2rad(np.arange(31) * 12)
             x = a * np.cos(rad) + center[0]
             y = b * np.sin(rad) + center[1]
             self.to_draw.set_data(x, y)