convert some sample plots to use plt.subplots() instead of other methods

asafmaman101 · asafmaman101 · commit a2765d5610ad · 2020-05-06T13:55:40.000+03:00
diff --git a/examples/images_contours_and_fields/plot_streamplot.py b/examples/images_contours_and_fields/plot_streamplot.py
@@ -22,30 +22,30 @@
 V = 1 + X - Y**2
 speed = np.sqrt(U**2 + V**2)
 
-fig = plt.figure(figsize=(7, 9))
-gs = gridspec.GridSpec(nrows=3, ncols=2, height_ratios=[1, 1, 2])
+
+gs = {'height_ratios': [1, 1, 2]}
+fig, ((ax0, ax1), (ax2, ax3), (ax4, ax5)) = plt.subplots(nrows=3, ncols=2, gridspec_kw=gs, figsize=(7, 9))
+
 
 #  Varying density along a streamline
-ax0 = fig.add_subplot(gs[0, 0])
 ax0.streamplot(X, Y, U, V, density=[0.5, 1])
 ax0.set_title('Varying Density')
 
 # Varying color along a streamline
-ax1 = fig.add_subplot(gs[0, 1])
+plt.sca(ax1)
 strm = ax1.streamplot(X, Y, U, V, color=U, linewidth=2, cmap='autumn')
 fig.colorbar(strm.lines)
 ax1.set_title('Varying Color')
 
 #  Varying line width along a streamline
-ax2 = fig.add_subplot(gs[1, 0])
 lw = 5*speed / speed.max()
 ax2.streamplot(X, Y, U, V, density=0.6, color='k', linewidth=lw)
 ax2.set_title('Varying Line Width')
 
 # Controlling the starting points of the streamlines
 seed_points = np.array([[-2, -1, 0, 1, 2, -1], [-2, -1,  0, 1, 2, 2]])
 
-ax3 = fig.add_subplot(gs[1, 1])
+plt.sca(ax3)
 strm = ax3.streamplot(X, Y, U, V, color=U, linewidth=2,
                       cmap='autumn', start_points=seed_points.T)
 fig.colorbar(strm.lines)
@@ -61,6 +61,9 @@
 U[:20, :20] = np.nan
 U = np.ma.array(U, mask=mask)
 
+gs = gridspec.GridSpec(nrows=3, ncols=2, height_ratios=[1, 1, 2])
+ax4.remove()
+ax5.remove()
 ax4 = fig.add_subplot(gs[2:, :])
 ax4.streamplot(X, Y, U, V, color='r')
 ax4.set_title('Streamplot with Masking')
diff --git a/examples/pie_and_polar_charts/polar_demo.py b/examples/pie_and_polar_charts/polar_demo.py
@@ -12,7 +12,7 @@
 r = np.arange(0, 2, 0.01)
 theta = 2 * np.pi * r
 
-ax = plt.subplot(111, projection='polar')
+fig, ax = plt.subplots(subplot_kw={'projection': 'polar'})
 ax.plot(theta, r)
 ax.set_rmax(2)
 ax.set_rticks([0.5, 1, 1.5, 2])  # Less radial ticks
diff --git a/examples/showcase/xkcd.py b/examples/showcase/xkcd.py
@@ -14,8 +14,8 @@
     # Based on "Stove Ownership" from XKCD by Randall Munroe
     # https://xkcd.com/418/
 
-    fig = plt.figure()
-    ax = fig.add_axes((0.1, 0.2, 0.8, 0.7))
+    fig, ax = plt.subplots()
+    ax.set_position((0.1, 0.2, 0.8, 0.7))
     ax.spines['right'].set_color('none')
     ax.spines['top'].set_color('none')
     ax.set_xticks([])
@@ -44,8 +44,8 @@
     # Based on "The Data So Far" from XKCD by Randall Munroe
     # https://xkcd.com/373/
 
-    fig = plt.figure()
-    ax = fig.add_axes((0.1, 0.2, 0.8, 0.7))
+    fig, ax = plt.subplots()
+    ax.set_position((0.1, 0.2, 0.8, 0.7))
     ax.bar([0, 1], [0, 100], 0.25)
     ax.spines['right'].set_color('none')
     ax.spines['top'].set_color('none')
diff --git a/examples/subplots_axes_and_figures/subplot.py b/examples/subplots_axes_and_figures/subplot.py
@@ -15,14 +15,14 @@
 y1 = np.cos(2 * np.pi * x1) * np.exp(-x1)
 y2 = np.cos(2 * np.pi * x2)
 
-plt.subplot(2, 1, 1)
-plt.plot(x1, y1, 'o-')
-plt.title('A tale of 2 subplots')
-plt.ylabel('Damped oscillation')
-
-plt.subplot(2, 1, 2)
-plt.plot(x2, y2, '.-')
-plt.xlabel('time (s)')
-plt.ylabel('Undamped')
+fig, (ax1, ax2) = plt.subplots(2, 1)
+fig.suptitle('A tale of 2 subplots')
+
+ax1.plot(x1, y1, 'o-')
+ax1.set_ylabel('Damped oscillation')
+
+ax2.plot(x2, y2, '.-')
+ax2.set_xlabel('time (s)')
+ax2.set_ylabel('Undamped')
 
 plt.show()
