Merge pull request matplotlib#30907 from anntzer/aas

Inline intermediate constructs in axisartist demos.

Author: timhoffm

galleries/examples/axisartist/demo_floating_axes.py

@@ -56,21 +56,18 @@ def setup_axes2(fig, rect):
     tr = PolarAxes.PolarTransform()
 
     pi = np.pi
-    angle_ticks = [(0, r"$0$"),
-                   (.25*pi, r"$\frac{1}{4}\pi$"),
-                   (.5*pi, r"$\frac{1}{2}\pi$")]
-    grid_locator1 = FixedLocator([v for v, s in angle_ticks])
-    tick_formatter1 = DictFormatter(dict(angle_ticks))
-
-    grid_locator2 = MaxNLocator(2)
-
+    angle_ticks = {
+        0: r"$0$",
+        pi/4: r"$\frac{1}{4}\pi$",
+        pi/2: r"$\frac{1}{2}\pi$",
+    }
     grid_helper = floating_axes.GridHelperCurveLinear(
         tr, extremes=(.5*pi, 0, 2, 1),
-        grid_locator1=grid_locator1,
-        grid_locator2=grid_locator2,
-        tick_formatter1=tick_formatter1,
-        tick_formatter2=None)
-
+        grid_locator1=FixedLocator([*angle_ticks]),
+        tick_formatter1=DictFormatter(angle_ticks),
+        grid_locator2=MaxNLocator(2),
+        tick_formatter2=None,
+    )
     ax1 = fig.add_subplot(
         rect, axes_class=floating_axes.FloatingAxes, grid_helper=grid_helper)
     ax1.grid()
@@ -92,30 +89,22 @@ def setup_axes3(fig, rect):
     Sometimes, things like axis_direction need to be adjusted.
     """
 
-    # rotate a bit for better orientation
-    tr_rotate = Affine2D().translate(-95, 0)
-
-    # scale degree to radians
-    tr_scale = Affine2D().scale(np.pi/180., 1.)
-
+    tr_rotate = Affine2D().translate(-95, 0)  # rotate a bit for better orientation
+    tr_scale = Affine2D().scale(np.pi/180., 1.)  # scale degree to radians
     tr = tr_rotate + tr_scale + PolarAxes.PolarTransform()
 
-    grid_locator1 = angle_helper.LocatorHMS(4)
-    tick_formatter1 = angle_helper.FormatterHMS()
-
-    grid_locator2 = MaxNLocator(3)
-
     # Specify theta limits in degrees
     ra0, ra1 = 8.*15, 14.*15
     # Specify radial limits
     cz0, cz1 = 0, 14000
+
     grid_helper = floating_axes.GridHelperCurveLinear(
         tr, extremes=(ra0, ra1, cz0, cz1),
-        grid_locator1=grid_locator1,
-        grid_locator2=grid_locator2,
-        tick_formatter1=tick_formatter1,
-        tick_formatter2=None)
-
+        grid_locator1=angle_helper.LocatorHMS(4),
+        tick_formatter1=angle_helper.FormatterHMS(),
+        grid_locator2=MaxNLocator(3),
+        tick_formatter2=None,
+    )
     ax1 = fig.add_subplot(
         rect, axes_class=floating_axes.FloatingAxes, grid_helper=grid_helper)
 

galleries/examples/axisartist/demo_floating_axis.py

@@ -22,29 +22,19 @@
 def curvelinear_test2(fig):
     """Polar projection, but in a rectangular box."""
     # see demo_curvelinear_grid.py for details
-    tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform()
-
-    extreme_finder = angle_helper.ExtremeFinderCycle(20,
-                                                     20,
-                                                     lon_cycle=360,
-                                                     lat_cycle=None,
-                                                     lon_minmax=None,
-                                                     lat_minmax=(0, np.inf),
-                                                     )
-
-    grid_locator1 = angle_helper.LocatorDMS(12)
-
-    tick_formatter1 = angle_helper.FormatterDMS()
-
-    grid_helper = GridHelperCurveLinear(tr,
-                                        extreme_finder=extreme_finder,
-                                        grid_locator1=grid_locator1,
-                                        tick_formatter1=tick_formatter1
-                                        )
-
+    grid_helper = GridHelperCurveLinear(
+        Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform(),
+        extreme_finder=angle_helper.ExtremeFinderCycle(
+            20, 20,
+            lon_cycle=360, lat_cycle=None,
+            lon_minmax=None, lat_minmax=(0, np.inf),
+        ),
+        grid_locator1=angle_helper.LocatorDMS(12),
+        tick_formatter1=angle_helper.FormatterDMS(),
+    )
     ax1 = fig.add_subplot(axes_class=HostAxes, grid_helper=grid_helper)
 
-    # Now creates floating axis
+    # Now create floating axis
 
     # floating axis whose first coordinate (theta) is fixed at 60
     ax1.axis["lat"] = axis = ax1.new_floating_axis(0, 60)