Merge pull request #26331 from anntzer/rgbaa

timhoffm · web-flow · commit 2a4d905ff2e6 · 2023-07-17T21:35:05.000+02:00
Support standard Axes in RGBAxes.
diff --git a/lib/mpl_toolkits/axes_grid1/axes_rgb.py b/lib/mpl_toolkits/axes_grid1/axes_rgb.py
@@ -1,7 +1,9 @@
+from types import MethodType
+
 import numpy as np
 
 from .axes_divider import make_axes_locatable, Size
-from .mpl_axes import Axes
+from .mpl_axes import Axes, SimpleAxisArtist
 
 
 def make_rgb_axes(ax, pad=0.01, axes_class=None, **kwargs):
@@ -108,8 +110,17 @@ def __init__(self, *args, pad=0, **kwargs):
             ax, pad=pad, axes_class=axes_class, **kwargs)
         # Set the line color and ticks for the axes.
         for ax1 in [self.RGB, self.R, self.G, self.B]:
-            ax1.axis[:].line.set_color("w")
-            ax1.axis[:].major_ticks.set_markeredgecolor("w")
+            if isinstance(ax1.axis, MethodType):
+                ad = Axes.AxisDict(self)
+                ad.update(
+                    bottom=SimpleAxisArtist(ax1.xaxis, 1, ax1.spines["bottom"]),
+                    top=SimpleAxisArtist(ax1.xaxis, 2, ax1.spines["top"]),
+                    left=SimpleAxisArtist(ax1.yaxis, 1, ax1.spines["left"]),
+                    right=SimpleAxisArtist(ax1.yaxis, 2, ax1.spines["right"]))
+            else:
+                ad = ax1.axis
+            ad[:].line.set_color("w")
+            ad[:].major_ticks.set_markeredgecolor("w")
 
     def imshow_rgb(self, r, g, b, **kwargs):
         """
diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py
@@ -790,3 +790,4 @@ def test_anchored_locator_base_call():
 
 def test_grid_with_axes_class_not_overriding_axis():
     Grid(plt.figure(), 111, (2, 2), axes_class=mpl.axes.Axes)
+    RGBAxes(plt.figure(), 111, axes_class=mpl.axes.Axes)

Original file line number	Diff line number	Diff line change
`@@ -790,3 +790,4 @@ def test_anchored_locator_base_call():`
`790`	`790`
`791`	`791`	`def test_grid_with_axes_class_not_overriding_axis():`
`792`	`792`	`Grid(plt.figure(), 111, (2, 2), axes_class=mpl.axes.Axes)`
	`793`	`+ RGBAxes(plt.figure(), 111, axes_class=mpl.axes.Axes)`