Merge pull request matplotlib#15642 from anntzer/uninterpolate

dopplershift · web-flow · commit cdb81b60c52b · 2019-11-11T12:00:07.000-07:00
Remove interpolation="nearest" from most examples.
diff --git a/examples/axes_grid1/demo_axes_divider.py b/examples/axes_grid1/demo_axes_divider.py
@@ -21,7 +21,7 @@ def get_demo_image():
 def demo_simple_image(ax):
     Z, extent = get_demo_image()
 
-    im = ax.imshow(Z, extent=extent, interpolation="nearest")
+    im = ax.imshow(Z, extent=extent)
     cb = plt.colorbar(im)
     plt.setp(cb.ax.get_yticklabels(), visible=False)
 
@@ -60,7 +60,7 @@ def demo_locatable_axes_hard(fig):
 
     Z, extent = get_demo_image()
 
-    im = ax.imshow(Z, extent=extent, interpolation="nearest")
+    im = ax.imshow(Z, extent=extent)
     plt.colorbar(im, cax=ax_cb)
     plt.setp(ax_cb.get_yticklabels(), visible=False)
 
@@ -75,7 +75,7 @@ def demo_locatable_axes_easy(ax):
     fig.add_axes(ax_cb)
 
     Z, extent = get_demo_image()
-    im = ax.imshow(Z, extent=extent, interpolation="nearest")
+    im = ax.imshow(Z, extent=extent)
 
     plt.colorbar(im, cax=ax_cb)
     ax_cb.yaxis.tick_right()
@@ -92,8 +92,8 @@ def demo_images_side_by_side(ax):
     fig1 = ax.get_figure()
     fig1.add_axes(ax2)
 
-    ax.imshow(Z, extent=extent, interpolation="nearest")
-    ax2.imshow(Z, extent=extent, interpolation="nearest")
+    ax.imshow(Z, extent=extent)
+    ax2.imshow(Z, extent=extent)
     ax2.yaxis.set_tick_params(labelleft=False)
 
 
diff --git a/examples/axes_grid1/demo_axes_grid.py b/examples/axes_grid1/demo_axes_grid.py
@@ -34,7 +34,7 @@ def demo_simple_grid(fig):
                      )
     Z, extent = get_demo_image()
     for ax in grid:
-        ax.imshow(Z, extent=extent, interpolation="nearest")
+        ax.imshow(Z, extent=extent)
     # This only affects axes in first column and second row as share_all=False.
     grid.axes_llc.set_xticks([-2, 0, 2])
     grid.axes_llc.set_yticks([-2, 0, 2])
@@ -55,7 +55,7 @@ def demo_grid_with_single_cbar(fig):
 
     Z, extent = get_demo_image()
     for ax in grid:
-        im = ax.imshow(Z, extent=extent, interpolation="nearest")
+        im = ax.imshow(Z, extent=extent)
     grid.cbar_axes[0].colorbar(im)
 
     for cax in grid.cbar_axes:
@@ -82,7 +82,7 @@ def demo_grid_with_each_cbar(fig):
                      )
     Z, extent = get_demo_image()
     for ax, cax in zip(grid, grid.cbar_axes):
-        im = ax.imshow(Z, extent=extent, interpolation="nearest")
+        im = ax.imshow(Z, extent=extent)
         cax.colorbar(im)
         cax.toggle_label(False)
 
@@ -110,8 +110,7 @@ def demo_grid_with_each_cbar_labelled(fig):
     # Use a different colorbar range every time
     limits = ((0, 1), (-2, 2), (-1.7, 1.4), (-1.5, 1))
     for ax, cax, vlim in zip(grid, grid.cbar_axes, limits):
-        im = ax.imshow(Z, extent=extent, interpolation="nearest",
-                       vmin=vlim[0], vmax=vlim[1])
+        im = ax.imshow(Z, extent=extent, vmin=vlim[0], vmax=vlim[1])
         cb = cax.colorbar(im)
         cb.set_ticks((vlim[0], vlim[1]))
 
diff --git a/examples/axes_grid1/demo_axes_grid2.py b/examples/axes_grid1/demo_axes_grid2.py
@@ -58,8 +58,7 @@ def add_inner_title(ax, title, loc, **kwargs):
                  )
 
 for i, (ax, z) in enumerate(zip(grid, ZS)):
-    im = ax.imshow(
-        z, origin="lower", extent=extent, interpolation="nearest")
+    im = ax.imshow(z, origin="lower", extent=extent)
     cb = ax.cax.colorbar(im)
     # Changing the colorbar ticks
     if i in [1, 2]:
@@ -100,9 +99,7 @@ def add_inner_title(ax, title, loc, **kwargs):
 norm = matplotlib.colors.Normalize(vmax=vmax, vmin=vmin)
 
 for ax, z in zip(grid2, ZS):
-    im = ax.imshow(z, norm=norm,
-                   origin="lower", extent=extent,
-                   interpolation="nearest")
+    im = ax.imshow(z, norm=norm, origin="lower", extent=extent)
 
 # With cbar_mode="single", cax attribute of all axes are identical.
 ax.cax.colorbar(im)
diff --git a/examples/axes_grid1/demo_axes_hbox_divider.py b/examples/axes_grid1/demo_axes_hbox_divider.py
@@ -34,8 +34,8 @@ def make_heights_equal(fig, rect, ax1, ax2, pad):
     arr2 = np.arange(20).reshape((5, 4))
 
     fig, (ax1, ax2) = plt.subplots(1, 2)
-    ax1.imshow(arr1, interpolation="nearest")
-    ax2.imshow(arr2, interpolation="nearest")
+    ax1.imshow(arr1)
+    ax2.imshow(arr2)
 
     rect = 111  # subplot param for combined axes
     make_heights_equal(fig, rect, ax1, ax2, pad=0.5)  # pad in inches
diff --git a/examples/axes_grid1/demo_axes_rgb.py b/examples/axes_grid1/demo_axes_rgb.py
@@ -52,23 +52,18 @@ def demo_rgb():
 
     r, g, b = get_rgb()
     im_r, im_g, im_b, im_rgb = make_cube(r, g, b)
-    kwargs = dict(origin="lower", interpolation="nearest")
-    ax.imshow(im_rgb, **kwargs)
-    ax_r.imshow(im_r, **kwargs)
-    ax_g.imshow(im_g, **kwargs)
-    ax_b.imshow(im_b, **kwargs)
+    ax.imshow(im_rgb)
+    ax_r.imshow(im_r)
+    ax_g.imshow(im_g)
+    ax_b.imshow(im_b)
 
 
 def demo_rgb2():
     fig = plt.figure()
     ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8], pad=0.0)
 
     r, g, b = get_rgb()
-    kwargs = dict(origin="lower", interpolation="nearest")
-    ax.imshow_rgb(r, g, b, **kwargs)
-
-    ax.RGB.set_xlim(0., 9.5)
-    ax.RGB.set_ylim(0.9, 10.6)
+    ax.imshow_rgb(r, g, b)
 
     for ax1 in [ax.RGB, ax.R, ax.G, ax.B]:
         ax1.tick_params(axis='both', direction='in')
diff --git a/examples/axes_grid1/demo_colorbar_of_inset_axes.py b/examples/axes_grid1/demo_colorbar_of_inset_axes.py
@@ -28,8 +28,7 @@ def get_demo_image():
 
 
 axins = zoomed_inset_axes(ax, zoom=2, loc='upper left')
-im = axins.imshow(Z, extent=extent, interpolation="nearest",
-                  origin="lower")
+im = axins.imshow(Z, extent=extent, origin="lower")
 
 plt.xticks(visible=False)
 plt.yticks(visible=False)
diff --git a/examples/axes_grid1/demo_edge_colorbar.py b/examples/axes_grid1/demo_edge_colorbar.py
@@ -6,10 +6,14 @@
 This example shows how to use one common colorbar for each row or column
 of an image grid.
 """
+
 import matplotlib.pyplot as plt
 from mpl_toolkits.axes_grid1 import AxesGrid
 
 
+plt.rcParams["mpl_toolkits.legacy_colorbar"] = False
+
+
 def get_demo_image():
     import numpy as np
     from matplotlib.cbook import get_sample_data
@@ -38,8 +42,7 @@ def demo_bottom_cbar(fig):
     Z, extent = get_demo_image()
     cmaps = [plt.get_cmap("autumn"), plt.get_cmap("summer")]
     for i in range(4):
-        im = grid[i].imshow(Z, extent=extent, interpolation="nearest",
-                            cmap=cmaps[i//2])
+        im = grid[i].imshow(Z, extent=extent, cmap=cmaps[i//2])
         if i % 2:
             grid.cbar_axes[i//2].colorbar(im)
 
@@ -69,8 +72,7 @@ def demo_right_cbar(fig):
     Z, extent = get_demo_image()
     cmaps = [plt.get_cmap("spring"), plt.get_cmap("winter")]
     for i in range(4):
-        im = grid[i].imshow(Z, extent=extent, interpolation="nearest",
-                            cmap=cmaps[i//2])
+        im = grid[i].imshow(Z, extent=extent, cmap=cmaps[i//2])
         if i % 2:
             grid.cbar_axes[i//2].colorbar(im)
 
diff --git a/examples/axes_grid1/inset_locator_demo2.py b/examples/axes_grid1/inset_locator_demo2.py
@@ -61,13 +61,11 @@ def add_sizebar(ax, size):
 Z2[30:30 + ny, 30:30 + nx] = Z
 
 # extent = [-3, 4, -4, 3]
-ax2.imshow(Z2, extent=extent, interpolation="nearest",
-          origin="lower")
+ax2.imshow(Z2, extent=extent, origin="lower")
 
 
 axins2 = zoomed_inset_axes(ax2, 6, loc=1)  # zoom = 6
-axins2.imshow(Z2, extent=extent, interpolation="nearest",
-              origin="lower")
+axins2.imshow(Z2, extent=extent, origin="lower")
 
 # sub region of the original image
 x1, x2, y1, y2 = -1.5, -0.9, -2.5, -1.9
diff --git a/examples/axes_grid1/simple_axesgrid2.py b/examples/axes_grid1/simple_axesgrid2.py
@@ -34,7 +34,6 @@ def get_demo_image():
 im3 = Z[:, 10:]
 vmin, vmax = Z.min(), Z.max()
 for ax, im in zip(grid, [im1, im2, im3]):
-    ax.imshow(im, origin="lower", vmin=vmin, vmax=vmax,
-              interpolation="nearest")
+    ax.imshow(im, origin="lower", vmin=vmin, vmax=vmax)
 
 plt.show()
diff --git a/examples/axes_grid1/simple_rgb.py b/examples/axes_grid1/simple_rgb.py
@@ -35,8 +35,7 @@ def get_rgb():
 ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
 
 r, g, b = get_rgb()
-kwargs = dict(origin="lower", interpolation="nearest")
-ax.imshow_rgb(r, g, b, **kwargs)
+ax.imshow_rgb(r, g, b, origin="lower")
 
 ax.RGB.set_xlim(0., 9.5)
 ax.RGB.set_ylim(0.9, 10.6)
diff --git a/examples/axisartist/demo_curvelinear_grid2.py b/examples/axisartist/demo_curvelinear_grid2.py
@@ -57,9 +57,7 @@ def inv_tr(x, y):
     fig.add_subplot(ax1)
 
     ax1.imshow(np.arange(25).reshape(5, 5),
-               vmax=50, cmap=plt.cm.gray_r,
-               interpolation="nearest",
-               origin="lower")
+               vmax=50, cmap=plt.cm.gray_r, origin="lower")
 
 
 if __name__ == "__main__":
diff --git a/examples/color/custom_cmap.py b/examples/color/custom_cmap.py
@@ -92,10 +92,9 @@
 fig.subplots_adjust(left=0.02, bottom=0.06, right=0.95, top=0.94, wspace=0.05)
 for n_bin, ax in zip(n_bins, axs.ravel()):
     # Create the colormap
-    cm = LinearSegmentedColormap.from_list(
-        cmap_name, colors, N=n_bin)
+    cm = LinearSegmentedColormap.from_list(cmap_name, colors, N=n_bin)
     # Fewer bins will result in "coarser" colomap interpolation
-    im = ax.imshow(Z, interpolation='nearest', origin='lower', cmap=cm)
+    im = ax.imshow(Z, origin='lower', cmap=cm)
     ax.set_title("N bins: %s" % n_bin)
     fig.colorbar(im, ax=ax)
 
@@ -188,11 +187,11 @@
 
 # Make 4 subplots:
 
-im1 = axs[0, 0].imshow(Z, interpolation='nearest', cmap=blue_red1)
+im1 = axs[0, 0].imshow(Z, cmap=blue_red1)
 fig.colorbar(im1, ax=axs[0, 0])
 
 cmap = plt.get_cmap('BlueRed2')
-im2 = axs[1, 0].imshow(Z, interpolation='nearest', cmap=cmap)
+im2 = axs[1, 0].imshow(Z, cmap=cmap)
 fig.colorbar(im2, ax=axs[1, 0])
 
 # Now we will set the third cmap as the default.  One would
@@ -201,7 +200,7 @@
 
 plt.rcParams['image.cmap'] = 'BlueRed3'
 
-im3 = axs[0, 1].imshow(Z, interpolation='nearest')
+im3 = axs[0, 1].imshow(Z)
 fig.colorbar(im3, ax=axs[0, 1])
 axs[0, 1].set_title("Alpha = 1")
 
@@ -215,7 +214,7 @@
 # Draw a line with low zorder so it will be behind the image.
 axs[1, 1].plot([0, 10 * np.pi], [0, 20 * np.pi], color='c', lw=20, zorder=-1)
 
-im4 = axs[1, 1].imshow(Z, interpolation='nearest')
+im4 = axs[1, 1].imshow(Z)
 fig.colorbar(im4, ax=axs[1, 1])
 
 # Here it is: changing the colormap for the current image and its
diff --git a/examples/images_contours_and_fields/image_zcoord.py b/examples/images_contours_and_fields/image_zcoord.py
@@ -19,7 +19,7 @@
 X = 10*np.random.rand(5, 3)
 
 fig, ax = plt.subplots()
-ax.imshow(X, interpolation='nearest')
+ax.imshow(X)
 
 numrows, numcols = X.shape
 
diff --git a/examples/images_contours_and_fields/plot_streamplot.py b/examples/images_contours_and_fields/plot_streamplot.py
@@ -65,8 +65,7 @@
 ax4.streamplot(X, Y, U, V, color='r')
 ax4.set_title('Streamplot with Masking')
 
-ax4.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5,
-          interpolation='nearest', cmap='gray', aspect='auto')
+ax4.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5, cmap='gray', aspect='auto')
 ax4.set_aspect('equal')
 
 plt.tight_layout()
diff --git a/examples/pyplots/whats_new_99_axes_grid.py b/examples/pyplots/whats_new_99_axes_grid.py
@@ -42,8 +42,7 @@ def get_rgb():
 ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
 
 r, g, b = get_rgb()
-kwargs = dict(origin="lower", interpolation="nearest")
-ax.imshow_rgb(r, g, b, **kwargs)
+ax.imshow_rgb(r, g, b, origin="lower")
 
 ax.RGB.set_xlim(0., 9.5)
 ax.RGB.set_ylim(0.9, 10.6)
diff --git a/examples/subplots_axes_and_figures/zoom_inset_axes.py b/examples/subplots_axes_and_figures/zoom_inset_axes.py
@@ -27,13 +27,11 @@ def get_demo_image():
 ny, nx = Z.shape
 Z2[30:30 + ny, 30:30 + nx] = Z
 
-ax.imshow(Z2, extent=extent, interpolation="nearest",
-          origin="lower")
+ax.imshow(Z2, extent=extent, origin="lower")
 
 # inset axes....
 axins = ax.inset_axes([0.5, 0.5, 0.47, 0.47])
-axins.imshow(Z2, extent=extent, interpolation="nearest",
-          origin="lower")
+axins.imshow(Z2, extent=extent, origin="lower")
 # sub region of the original image
 x1, x2, y1, y2 = -1.5, -0.9, -2.5, -1.9
 axins.set_xlim(x1, x2)
diff --git a/examples/ticks_and_spines/colorbar_tick_labelling_demo.py b/examples/ticks_and_spines/colorbar_tick_labelling_demo.py
@@ -20,7 +20,7 @@
 
 data = np.clip(randn(250, 250), -1, 1)
 
-cax = ax.imshow(data, interpolation='nearest', cmap=cm.coolwarm)
+cax = ax.imshow(data, cmap=cm.coolwarm)
 ax.set_title('Gaussian noise with vertical colorbar')
 
 # Add colorbar, make sure to specify tick locations to match desired ticklabels
@@ -34,7 +34,7 @@
 
 data = np.clip(randn(250, 250), -1, 1)
 
-cax = ax.imshow(data, interpolation='nearest', cmap=cm.afmhot)
+cax = ax.imshow(data, cmap=cm.afmhot)
 ax.set_title('Gaussian noise with horizontal colorbar')
 
 cbar = fig.colorbar(cax, ticks=[-1, 0, 1], orientation='horizontal')
diff --git a/examples/ticks_and_spines/spines_dropped.py b/examples/ticks_and_spines/spines_dropped.py
@@ -14,7 +14,7 @@
 fig, ax = plt.subplots()
 
 image = np.random.uniform(size=(10, 10))
-ax.imshow(image, cmap=plt.cm.gray, interpolation='nearest')
+ax.imshow(image, cmap=plt.cm.gray)
 ax.set_title('dropped spines')
 
 # Move left and bottom spines outward by 10 points
diff --git a/examples/user_interfaces/embedding_in_wx3_sgskip.py b/examples/user_interfaces/embedding_in_wx3_sgskip.py
@@ -63,7 +63,7 @@ def init_plot_data(self):
         y = np.arange(100.0) * 2 * np.pi / 50.0
         self.x, self.y = np.meshgrid(x, y)
         z = np.sin(self.x) + np.cos(self.y)
-        self.im = a.imshow(z, cmap=cm.RdBu)  # , interpolation='nearest')
+        self.im = a.imshow(z, cmap=cm.RdBu)
 
         zmax = np.max(z) - ERR_TOL
         ymax_i, xmax_i = np.nonzero(z >= zmax)
