Merge pull request #16741 from anntzer/rgbex

QuLogic · web-flow · commit 2883c9006e74 · 2020-03-12T22:44:36.000-04:00
Dedupe RGBAxes examples.
diff --git a/examples/axes_grid1/demo_axes_rgb.py b/examples/axes_grid1/demo_axes_rgb.py
@@ -5,22 +5,16 @@
 
 RGBAxes to show RGB composite images.
 """
+
 import numpy as np
+from matplotlib import cbook
 import matplotlib.pyplot as plt
-
 from mpl_toolkits.axes_grid1.axes_rgb import make_rgb_axes, RGBAxes
 
 
-def get_demo_image():
-    from matplotlib.cbook import get_sample_data
-    f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
-    z = np.load(f)
-    # z is a numpy array of 15x15
-    return z, (-3, 4, -4, 3)
-
-
 def get_rgb():
-    Z, extent = get_demo_image()
+    f = cbook.get_sample_data("axes_grid/bivariate_normal.npy")
+    Z = np.load(f)  # 15x15 numpy array.
 
     Z[Z < 0] = 0.
     Z = Z / Z.max()
@@ -46,7 +40,14 @@ def make_cube(r, g, b):
     return R, G, B, RGB
 
 
-def demo_rgb():
+def demo_rgb1():
+    fig = plt.figure()
+    ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8], pad=0.0)
+    r, g, b = get_rgb()
+    ax.imshow_rgb(r, g, b)
+
+
+def demo_rgb2():
     fig, ax = plt.subplots()
     ax_r, ax_g, ax_b = make_rgb_axes(ax, pad=0.02)
 
@@ -57,26 +58,16 @@ def demo_rgb():
     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()
-    ax.imshow_rgb(r, g, b)
-
-    for ax1 in [ax.RGB, ax.R, ax.G, ax.B]:
-        ax1.tick_params(axis='both', direction='in')
-        for sp1 in ax1.spines.values():
+    for ax in fig.axes:
+        ax.tick_params(axis='both', direction='in')
+        for sp1 in ax.spines.values():
             sp1.set_color("w")
-        for tick in ax1.xaxis.get_major_ticks() + ax1.yaxis.get_major_ticks():
+        for tick in ax.xaxis.get_major_ticks() + ax.yaxis.get_major_ticks():
             tick.tick1line.set_markeredgecolor("w")
             tick.tick2line.set_markeredgecolor("w")
 
-    return ax
-
 
-demo_rgb()
+demo_rgb1()
 demo_rgb2()
 
 plt.show()
diff --git a/examples/axes_grid1/simple_rgb.py b/examples/axes_grid1/simple_rgb.py
diff --git a/tutorials/toolkits/axes_grid.py b/tutorials/toolkits/axes_grid.py
@@ -307,20 +307,16 @@
     from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes
 
     fig = plt.figure()
-    ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
+    ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8], pad=0.0)
+    r, g, b = get_rgb()  # r, g, b are 2D images.
+    ax.imshow_rgb(r, g, b)
 
-    r, g, b = get_rgb() # r, g, b are 2-d images
-    ax.imshow_rgb(r, g, b,
-                  origin="lower", interpolation="nearest")
 
-
-.. figure:: ../../gallery/axes_grid1/images/sphx_glr_simple_rgb_001.png
-   :target: ../../gallery/axes_grid1/simple_rgb.html
+.. figure:: ../../gallery/axes_grid1/images/sphx_glr_demo_axes_rgb_001.png
+   :target: ../../gallery/axes_grid1/demo_axes_rgb.html
    :align: center
    :scale: 50
 
-   Simple Rgb
-
 
 AxesDivider
 ===========
