Merge pull request #15981 from anntzer/keepcbaroutline

QuLogic · web-flow · commit b42d6d92e2c9 · 2020-03-13T21:59:59.000-04:00
Reuse colorbar outline and patch when updating the colorbar.
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -444,9 +444,19 @@ def __init__(self, ax, cmap=None,
         self.extendfrac = extendfrac
         self.extendrect = extendrect
         self.solids = None
-        self.lines = list()
-        self.outline = None
-        self.patch = None
+        self.lines = []
+
+        self.outline = mpatches.Polygon(
+            np.empty((0, 2)),
+            edgecolor=mpl.rcParams['axes.edgecolor'], facecolor='none',
+            linewidth=mpl.rcParams['axes.linewidth'], closed=True, zorder=2)
+        ax.add_artist(self.outline)
+        self.outline.set(clip_box=None, clip_path=None)
+        self.patch = mpatches.Polygon(
+            np.empty((0, 2)),
+            color=mpl.rcParams['axes.facecolor'], linewidth=0.01, zorder=-1)
+        ax.add_artist(self.patch)
+
         self.dividers = None
         self.locator = None
         self.formatter = None
@@ -719,26 +729,8 @@ def _config_axes(self, X, Y):
         ax.update_datalim(xy)
         ax.set_xlim(*ax.dataLim.intervalx)
         ax.set_ylim(*ax.dataLim.intervaly)
-        if self.outline is not None:
-            self.outline.remove()
-        self.outline = mpatches.Polygon(
-            xy, edgecolor=mpl.rcParams['axes.edgecolor'],
-            facecolor='none',
-            linewidth=mpl.rcParams['axes.linewidth'],
-            closed=True,
-            zorder=2)
-        ax.add_artist(self.outline)
-        self.outline.set_clip_box(None)
-        self.outline.set_clip_path(None)
-        c = mpl.rcParams['axes.facecolor']
-        if self.patch is not None:
-            self.patch.remove()
-        self.patch = mpatches.Polygon(xy, edgecolor=c,
-                                      facecolor=c,
-                                      linewidth=0.01,
-                                      zorder=-1)
-        ax.add_artist(self.patch)
-
+        self.outline.set_xy(xy)
+        self.patch.set_xy(xy)
         self.update_ticks()
 
     def _set_label(self):
@@ -1322,10 +1314,18 @@ def update_bruteforce(self, mappable):
         self.formatter = None
 
         # clearing the axes will delete outline, patch, solids, and lines:
-        self.outline = None
-        self.patch = None
+        self.outline = mpatches.Polygon(
+            np.empty((0, 2)),
+            edgecolor=mpl.rcParams['axes.edgecolor'], facecolor='none',
+            linewidth=mpl.rcParams['axes.linewidth'], closed=True, zorder=2)
+        self.ax.add_artist(self.outline)
+        self.outline.set(clip_box=None, clip_path=None)
+        self.patch = mpatches.Polygon(
+            np.empty((0, 2)),
+            color=mpl.rcParams['axes.facecolor'], linewidth=0.01, zorder=-1)
+        self.ax.add_artist(self.patch)
         self.solids = None
-        self.lines = list()
+        self.lines = []
         self.dividers = None
         self.update_normal(mappable)
         self.draw_all()
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -522,13 +522,16 @@ def test_colorbar_scale_reset():
     fig, ax = plt.subplots()
     pcm = ax.pcolormesh(z, cmap='RdBu_r', rasterized=True)
     cbar = fig.colorbar(pcm, ax=ax)
+    cbar.outline.set_edgecolor('red')
     assert cbar.ax.yaxis.get_scale() == 'linear'
 
     pcm.set_norm(LogNorm(vmin=1, vmax=100))
     assert cbar.ax.yaxis.get_scale() == 'log'
     pcm.set_norm(Normalize(vmin=-20, vmax=20))
     assert cbar.ax.yaxis.get_scale() == 'linear'
 
+    assert cbar.outline.get_edgecolor() == mcolors.to_rgba('red')
+
 
 def test_colorbar_get_ticks_2():
     with rc_context({'_internal.classic_mode': False}):
