Merge pull request #16775 from anntzer/sal

timhoffm · web-flow · commit 30282cfae99b · 2020-03-15T11:53:06.000+01:00
Cleanup axes_divider examples.
diff --git a/examples/axes_grid1/demo_fixed_size_axes.py b/examples/axes_grid1/demo_fixed_size_axes.py
@@ -2,12 +2,11 @@
 ====================
 Demo Fixed Size Axes
 ====================
-
 """
+
 import matplotlib.pyplot as plt
 
 from mpl_toolkits.axes_grid1 import Divider, Size
-from mpl_toolkits.axes_grid1.mpl_axes import Axes
 
 ###############################################################################
 
@@ -19,13 +18,11 @@
 h = [Size.Fixed(1.0), Size.Fixed(4.5)]
 v = [Size.Fixed(0.7), Size.Fixed(5.)]
 
-divider = Divider(fig, (0.0, 0.0, 1., 1.), h, v, aspect=False)
-# the width and height of the rectangle is ignored.
-
-ax = Axes(fig, divider.get_position())
-ax.set_axes_locator(divider.new_locator(nx=1, ny=1))
+divider = Divider(fig, (0, 0, 1, 1), h, v, aspect=False)
+# The width and height of the rectangle are ignored.
 
-fig.add_axes(ax)
+ax = fig.add_axes(divider.get_position(),
+                  axes_locator=divider.new_locator(nx=1, ny=1))
 
 ax.plot([1, 2, 3])
 
@@ -39,12 +36,12 @@
 h = [Size.Fixed(1.0), Size.Scaled(1.), Size.Fixed(.2)]
 v = [Size.Fixed(0.7), Size.Scaled(1.), Size.Fixed(.5)]
 
-divider = Divider(fig, (0.0, 0.0, 1., 1.), h, v, aspect=False)
-# the width and height of the rectangle is ignored.
+divider = Divider(fig, (0, 0, 1, 1), h, v, aspect=False)
+# The width and height of the rectangle are ignored.
 
-ax = Axes(fig, divider.get_position())
-ax.set_axes_locator(divider.new_locator(nx=1, ny=1))
-
-fig.add_axes(ax)
+ax = fig.add_axes(divider.get_position(),
+                  axes_locator=divider.new_locator(nx=1, ny=1))
 
 ax.plot([1, 2, 3])
+
+plt.show()
diff --git a/examples/axes_grid1/simple_axes_divider1.py b/examples/axes_grid1/simple_axes_divider1.py
@@ -4,30 +4,52 @@
 =====================
 
 """
+
 from mpl_toolkits.axes_grid1 import Size, Divider
 import matplotlib.pyplot as plt
 
 
-fig1 = plt.figure(1, (6, 6))
+##############################################################################
+# Fixed axes sizes; fixed paddings.
+
+fig = plt.figure(figsize=(6, 6))
 
-# fixed size in inch
-horiz = [Size.Fixed(1.), Size.Fixed(.5), Size.Fixed(1.5),
-         Size.Fixed(.5)]
+# Sizes are in inches.
+horiz = [Size.Fixed(1.), Size.Fixed(.5), Size.Fixed(1.5), Size.Fixed(.5)]
 vert = [Size.Fixed(1.5), Size.Fixed(.5), Size.Fixed(1.)]
 
 rect = (0.1, 0.1, 0.8, 0.8)
-# divide the axes rectangle into grid whose size is specified by horiz * vert
-divider = Divider(fig1, rect, horiz, vert, aspect=False)
-
-# the rect parameter will be ignore as we will set axes_locator
-ax1 = fig1.add_axes(rect, label="1")
-ax2 = fig1.add_axes(rect, label="2")
-ax3 = fig1.add_axes(rect, label="3")
-ax4 = fig1.add_axes(rect, label="4")
-
-ax1.set_axes_locator(divider.new_locator(nx=0, ny=0))
-ax2.set_axes_locator(divider.new_locator(nx=0, ny=2))
-ax3.set_axes_locator(divider.new_locator(nx=2, ny=2))
-ax4.set_axes_locator(divider.new_locator(nx=2, nx1=4, ny=0))
+# Divide the axes rectangle into a grid with sizes specified by horiz * vert.
+divider = Divider(fig, rect, horiz, vert, aspect=False)
+
+# The rect parameter will actually be ignored and overridden by axes_locator.
+ax1 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=0))
+ax2 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=2))
+ax3 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, ny=2))
+ax4 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, nx1=4, ny=0))
+
+for ax in fig.axes:
+    ax.tick_params(labelbottom=False, labelleft=False)
+
+##############################################################################
+# Axes sizes that scale with the figure size; fixed paddings.
+
+fig = plt.figure(figsize=(6, 6))
+
+horiz = [Size.Scaled(1.5), Size.Fixed(.5), Size.Scaled(1.), Size.Scaled(.5)]
+vert = [Size.Scaled(1.), Size.Fixed(.5), Size.Scaled(1.5)]
+
+rect = (0.1, 0.1, 0.8, 0.8)
+# Divide the axes rectangle into a grid with sizes specified by horiz * vert.
+divider = Divider(fig, rect, horiz, vert, aspect=False)
+
+# The rect parameter will actually be ignored and overridden by axes_locator.
+ax1 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=0))
+ax2 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=2))
+ax3 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, ny=2))
+ax4 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, nx1=4, ny=0))
+
+for ax in fig.axes:
+    ax.tick_params(labelbottom=False, labelleft=False)
 
 plt.show()
diff --git a/examples/axes_grid1/simple_axes_divider2.py b/examples/axes_grid1/simple_axes_divider2.py
diff --git a/tutorials/toolkits/axes_grid.py b/tutorials/toolkits/axes_grid.py
@@ -392,8 +392,8 @@
 
 See the example,
 
-.. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axes_divider2_001.png
-   :target: ../../gallery/axes_grid1/simple_axes_divider2.html
+.. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_axes_divider1_002.png
+   :target: ../../gallery/axes_grid1/simple_axes_divider1.html
    :align: center
    :scale: 50
 
