Skip to content

Commit c6e185d

Browse files
committed
Remove interpolation="nearest" from most examples.
It is now the default interpolation method (well, actually the default is "antialiased" but for the cases here they're the same). The explicit kwarg was left for examples actually illustrating the interpolation kwarg.
1 parent f7e7e46 commit c6e185d

19 files changed

+45
-64
lines changed

examples/axes_grid1/demo_axes_divider.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def get_demo_image():
2121
def demo_simple_image(ax):
2222
Z, extent = get_demo_image()
2323

24-
im = ax.imshow(Z, extent=extent, interpolation="nearest")
24+
im = ax.imshow(Z, extent=extent)
2525
cb = plt.colorbar(im)
2626
plt.setp(cb.ax.get_yticklabels(), visible=False)
2727

@@ -60,7 +60,7 @@ def demo_locatable_axes_hard(fig):
6060

6161
Z, extent = get_demo_image()
6262

63-
im = ax.imshow(Z, extent=extent, interpolation="nearest")
63+
im = ax.imshow(Z, extent=extent)
6464
plt.colorbar(im, cax=ax_cb)
6565
plt.setp(ax_cb.get_yticklabels(), visible=False)
6666

@@ -75,7 +75,7 @@ def demo_locatable_axes_easy(ax):
7575
fig.add_axes(ax_cb)
7676

7777
Z, extent = get_demo_image()
78-
im = ax.imshow(Z, extent=extent, interpolation="nearest")
78+
im = ax.imshow(Z, extent=extent)
7979

8080
plt.colorbar(im, cax=ax_cb)
8181
ax_cb.yaxis.tick_right()
@@ -92,8 +92,8 @@ def demo_images_side_by_side(ax):
9292
fig1 = ax.get_figure()
9393
fig1.add_axes(ax2)
9494

95-
ax.imshow(Z, extent=extent, interpolation="nearest")
96-
ax2.imshow(Z, extent=extent, interpolation="nearest")
95+
ax.imshow(Z, extent=extent)
96+
ax2.imshow(Z, extent=extent)
9797
ax2.yaxis.set_tick_params(labelleft=False)
9898

9999

examples/axes_grid1/demo_axes_grid.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def demo_simple_grid(fig):
3434
)
3535
Z, extent = get_demo_image()
3636
for ax in grid:
37-
ax.imshow(Z, extent=extent, interpolation="nearest")
37+
ax.imshow(Z, extent=extent)
3838
# This only affects axes in first column and second row as share_all=False.
3939
grid.axes_llc.set_xticks([-2, 0, 2])
4040
grid.axes_llc.set_yticks([-2, 0, 2])
@@ -55,7 +55,7 @@ def demo_grid_with_single_cbar(fig):
5555

5656
Z, extent = get_demo_image()
5757
for ax in grid:
58-
im = ax.imshow(Z, extent=extent, interpolation="nearest")
58+
im = ax.imshow(Z, extent=extent)
5959
grid.cbar_axes[0].colorbar(im)
6060

6161
for cax in grid.cbar_axes:
@@ -82,7 +82,7 @@ def demo_grid_with_each_cbar(fig):
8282
)
8383
Z, extent = get_demo_image()
8484
for ax, cax in zip(grid, grid.cbar_axes):
85-
im = ax.imshow(Z, extent=extent, interpolation="nearest")
85+
im = ax.imshow(Z, extent=extent)
8686
cax.colorbar(im)
8787
cax.toggle_label(False)
8888

@@ -110,8 +110,7 @@ def demo_grid_with_each_cbar_labelled(fig):
110110
# Use a different colorbar range every time
111111
limits = ((0, 1), (-2, 2), (-1.7, 1.4), (-1.5, 1))
112112
for ax, cax, vlim in zip(grid, grid.cbar_axes, limits):
113-
im = ax.imshow(Z, extent=extent, interpolation="nearest",
114-
vmin=vlim[0], vmax=vlim[1])
113+
im = ax.imshow(Z, extent=extent, vmin=vlim[0], vmax=vlim[1])
115114
cb = cax.colorbar(im)
116115
cb.set_ticks((vlim[0], vlim[1]))
117116

examples/axes_grid1/demo_axes_grid2.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ def add_inner_title(ax, title, loc, **kwargs):
5858
)
5959

6060
for i, (ax, z) in enumerate(zip(grid, ZS)):
61-
im = ax.imshow(
62-
z, origin="lower", extent=extent, interpolation="nearest")
61+
im = ax.imshow(z, origin="lower", extent=extent)
6362
cb = ax.cax.colorbar(im)
6463
# Changing the colorbar ticks
6564
if i in [1, 2]:
@@ -100,9 +99,7 @@ def add_inner_title(ax, title, loc, **kwargs):
10099
norm = matplotlib.colors.Normalize(vmax=vmax, vmin=vmin)
101100

102101
for ax, z in zip(grid2, ZS):
103-
im = ax.imshow(z, norm=norm,
104-
origin="lower", extent=extent,
105-
interpolation="nearest")
102+
im = ax.imshow(z, norm=norm, origin="lower", extent=extent)
106103

107104
# With cbar_mode="single", cax attribute of all axes are identical.
108105
ax.cax.colorbar(im)

examples/axes_grid1/demo_axes_hbox_divider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def make_heights_equal(fig, rect, ax1, ax2, pad):
3434
arr2 = np.arange(20).reshape((5, 4))
3535

3636
fig, (ax1, ax2) = plt.subplots(1, 2)
37-
ax1.imshow(arr1, interpolation="nearest")
38-
ax2.imshow(arr2, interpolation="nearest")
37+
ax1.imshow(arr1)
38+
ax2.imshow(arr2)
3939

4040
rect = 111 # subplot param for combined axes
4141
make_heights_equal(fig, rect, ax1, ax2, pad=0.5) # pad in inches

examples/axes_grid1/demo_axes_rgb.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,18 @@ def demo_rgb():
5252

5353
r, g, b = get_rgb()
5454
im_r, im_g, im_b, im_rgb = make_cube(r, g, b)
55-
kwargs = dict(origin="lower", interpolation="nearest")
56-
ax.imshow(im_rgb, **kwargs)
57-
ax_r.imshow(im_r, **kwargs)
58-
ax_g.imshow(im_g, **kwargs)
59-
ax_b.imshow(im_b, **kwargs)
55+
ax.imshow(im_rgb)
56+
ax_r.imshow(im_r)
57+
ax_g.imshow(im_g)
58+
ax_b.imshow(im_b)
6059

6160

6261
def demo_rgb2():
6362
fig = plt.figure()
6463
ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8], pad=0.0)
6564

6665
r, g, b = get_rgb()
67-
kwargs = dict(origin="lower", interpolation="nearest")
68-
ax.imshow_rgb(r, g, b, **kwargs)
69-
70-
ax.RGB.set_xlim(0., 9.5)
71-
ax.RGB.set_ylim(0.9, 10.6)
66+
ax.imshow_rgb(r, g, b)
7267

7368
for ax1 in [ax.RGB, ax.R, ax.G, ax.B]:
7469
ax1.tick_params(axis='both', direction='in')

examples/axes_grid1/demo_colorbar_of_inset_axes.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ def get_demo_image():
2828

2929

3030
axins = zoomed_inset_axes(ax, zoom=2, loc='upper left')
31-
im = axins.imshow(Z, extent=extent, interpolation="nearest",
32-
origin="lower")
31+
im = axins.imshow(Z, extent=extent, origin="lower")
3332

3433
plt.xticks(visible=False)
3534
plt.yticks(visible=False)

examples/axes_grid1/demo_edge_colorbar.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
This example shows how to use one common colorbar for each row or column
77
of an image grid.
88
"""
9+
910
import matplotlib.pyplot as plt
1011
from mpl_toolkits.axes_grid1 import AxesGrid
1112

1213

14+
plt.rcParams["mpl_toolkits.legacy_colorbar"] = False
15+
16+
1317
def get_demo_image():
1418
import numpy as np
1519
from matplotlib.cbook import get_sample_data
@@ -38,8 +42,7 @@ def demo_bottom_cbar(fig):
3842
Z, extent = get_demo_image()
3943
cmaps = [plt.get_cmap("autumn"), plt.get_cmap("summer")]
4044
for i in range(4):
41-
im = grid[i].imshow(Z, extent=extent, interpolation="nearest",
42-
cmap=cmaps[i//2])
45+
im = grid[i].imshow(Z, extent=extent, cmap=cmaps[i//2])
4346
if i % 2:
4447
grid.cbar_axes[i//2].colorbar(im)
4548

@@ -69,8 +72,7 @@ def demo_right_cbar(fig):
6972
Z, extent = get_demo_image()
7073
cmaps = [plt.get_cmap("spring"), plt.get_cmap("winter")]
7174
for i in range(4):
72-
im = grid[i].imshow(Z, extent=extent, interpolation="nearest",
73-
cmap=cmaps[i//2])
75+
im = grid[i].imshow(Z, extent=extent, cmap=cmaps[i//2])
7476
if i % 2:
7577
grid.cbar_axes[i//2].colorbar(im)
7678

examples/axes_grid1/inset_locator_demo2.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,11 @@ def add_sizebar(ax, size):
6161
Z2[30:30 + ny, 30:30 + nx] = Z
6262

6363
# extent = [-3, 4, -4, 3]
64-
ax2.imshow(Z2, extent=extent, interpolation="nearest",
65-
origin="lower")
64+
ax2.imshow(Z2, extent=extent, origin="lower")
6665

6766

6867
axins2 = zoomed_inset_axes(ax2, 6, loc=1) # zoom = 6
69-
axins2.imshow(Z2, extent=extent, interpolation="nearest",
70-
origin="lower")
68+
axins2.imshow(Z2, extent=extent, origin="lower")
7169

7270
# sub region of the original image
7371
x1, x2, y1, y2 = -1.5, -0.9, -2.5, -1.9

examples/axes_grid1/simple_axesgrid2.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def get_demo_image():
3434
im3 = Z[:, 10:]
3535
vmin, vmax = Z.min(), Z.max()
3636
for ax, im in zip(grid, [im1, im2, im3]):
37-
ax.imshow(im, origin="lower", vmin=vmin, vmax=vmax,
38-
interpolation="nearest")
37+
ax.imshow(im, origin="lower", vmin=vmin, vmax=vmax)
3938

4039
plt.show()

examples/axes_grid1/simple_rgb.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ def get_rgb():
3535
ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
3636

3737
r, g, b = get_rgb()
38-
kwargs = dict(origin="lower", interpolation="nearest")
39-
ax.imshow_rgb(r, g, b, **kwargs)
38+
ax.imshow_rgb(r, g, b, origin="lower")
4039

4140
ax.RGB.set_xlim(0., 9.5)
4241
ax.RGB.set_ylim(0.9, 10.6)

0 commit comments

Comments
 (0)