DOC: switch to OO interface in color + image/contour examples

phobson · commit 7e0cd3571514 · 2016-10-10T08:20:39.000-07:00
diff --git a/examples/color/color_cycle_demo.py b/examples/color/color_cycle_demo.py
@@ -31,5 +31,5 @@
 ax1.set_title('Set axes color cycle to cmyk')
 
 # Tweak spacing between subplots to prevent labels from overlapping
-plt.subplots_adjust(hspace=0.3)
+fig.subplots_adjust(hspace=0.3)
 plt.show()
diff --git a/examples/images_contours_and_fields/contourf_log.py b/examples/images_contours_and_fields/contourf_log.py
@@ -30,7 +30,8 @@
 
 # Automatic selection of levels works; setting the
 # log locator tells contourf to use a log scale:
-cs = plt.contourf(X, Y, z, locator=ticker.LogLocator(), cmap=cm.PuBu_r)
+fig, ax = plt.subplots()
+cs = ax.contourf(X, Y, z, locator=ticker.LogLocator(), cmap=cm.PuBu_r)
 
 # Alternatively, you can manually set the levels
 # and the norm:
@@ -41,6 +42,6 @@
 
 # The 'extend' kwarg does not work yet with a log scale.
 
-cbar = plt.colorbar()
+cbar = fig.colorbar(cs)
 
 plt.show()
diff --git a/examples/images_contours_and_fields/image_demo.py b/examples/images_contours_and_fields/image_demo.py
@@ -7,6 +7,7 @@
 image_file = cbook.get_sample_data('ada.png')
 image = plt.imread(image_file)
 
-plt.imshow(image)
-plt.axis('off')  # clear x- and y-axes
+fig, ax = plt.subplots()
+ax.imshow(image)
+ax.axis('off')  # clear x- and y-axes
 plt.show()
diff --git a/examples/images_contours_and_fields/image_demo_clip_path.py b/examples/images_contours_and_fields/image_demo_clip_path.py
@@ -14,5 +14,5 @@
 patch = patches.Circle((260, 200), radius=200, transform=ax.transData)
 im.set_clip_path(patch)
 
-plt.axis('off')
+ax.axis('off')
 plt.show()
diff --git a/examples/images_contours_and_fields/interpolation_none_vs_nearest.py b/examples/images_contours_and_fields/interpolation_none_vs_nearest.py
@@ -23,16 +23,13 @@
                      [0.6, 0.3, 0.0, 0.2], [0.7, 0.9, 0.4, 0.6]])
 
 # Create a 2x2 table of plots
-fig = plt.figure(figsize=[8.0, 7.5])
-ax = plt.subplot(2, 2, 1)
-ax.imshow(big_im, interpolation='none')
-ax = plt.subplot(2, 2, 2)
-ax.imshow(big_im, interpolation='nearest')
-ax = plt.subplot(2, 2, 3)
-ax.imshow(small_im, interpolation='none')
-ax = plt.subplot(2, 2, 4)
-ax.imshow(small_im, interpolation='nearest')
-plt.subplots_adjust(left=0.24, wspace=0.2, hspace=0.1,
+fig, axes = plt.subplots(figsize=[8.0, 7.5], ncols=2, nrows=2)
+
+axes[0, 0].imshow(big_im, interpolation='none')
+axes[0, 1].imshow(big_im, interpolation='nearest')
+axes[1, 0].imshow(small_im, interpolation='none')
+axes[1, 1].imshow(small_im, interpolation='nearest')
+fig.subplots_adjust(left=0.24, wspace=0.2, hspace=0.1,
                     bottom=0.05, top=0.86)
 
 # Label the rows and columns of the table
@@ -60,6 +57,6 @@
 pdf_im_path = cbook.get_sample_data('None_vs_nearest-pdf.png')
 pdf_im = plt.imread(pdf_im_path)
 fig2 = plt.figure(figsize=[8.0, 7.5])
-plt.figimage(pdf_im)
+fig2.figimage(pdf_im)
 
 plt.show()
diff --git a/examples/images_contours_and_fields/streamplot_demo_masking.py b/examples/images_contours_and_fields/streamplot_demo_masking.py
@@ -18,9 +18,10 @@
 U = np.ma.array(U, mask=mask)
 U[:20, :20] = np.nan
 
-plt.streamplot(X, Y, U, V, color='r')
+fig, ax = plt.subplots()
+ax.streamplot(X, Y, U, V, color='r')
 
-plt.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5,
-           interpolation='nearest', cmap=plt.cm.gray)
+ax.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5,
+          interpolation='nearest', cmap=plt.cm.gray)
 
 plt.show()
