add different senarioes for anchored_cbar_position_using_specgrid

shawnchen · shawnchen · commit 74f5f4853af0 · 2020-09-27T21:37:25.000+08:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -44,7 +44,6 @@
 import matplotlib.path as mpath
 import matplotlib.spines as mspines
 import matplotlib.transforms as mtransforms
-import matplotlib._layoutbox as layoutbox
 from matplotlib import docstring
 
 _log = logging.getLogger(__name__)
@@ -1515,10 +1514,6 @@ def make_axes_gridspec(parent, *, location=None, orientation=None,
     pad = kw.pop('pad', loc_settings["pad"])
     wh_space = 2 * pad / (1 - pad)
 
-    # we need to none the tree of layoutboxes because constrained_layout can't
-    # remove and replace the tree hierarchy w/o a segfault.
-    layoutbox.nonetree(parent.get_subplotspec().get_gridspec()._layoutbox)
-
     if location in ('left', 'right'):
         # for shrinking
         wh_ratios = [(1-anchor[1])*(1-shrink), shrink, anchor[1]*(1-shrink)]
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -629,44 +629,77 @@ def test_anchored_cbar_position_using_specgrid():
     levels = [0, 200, 400, 600, 800, 1000, 1200]
     shrink = 0.5
     anchor_y = 0.3
-    # vertival
+    # right
     fig, ax = plt.subplots()
     cs = ax.contourf(data, levels=levels)
     cbar = plt.colorbar(
             cs, ax=ax, use_gridspec=True,
-            orientation='vertical', anchor=(1, anchor_y), shrink=shrink)
+            location='right', anchor=(1, anchor_y), shrink=shrink)
 
-    # y1: the top of ax, y0: the bottom of ax, p0: the y postion of anchor
-    # cy1 : the top of colorbar ax, cy0: the bottom of colorbar ax
-    y1 = ax.get_position().y1
-    y0 = ax.get_position().y0
+    # the bottom left corner of one ax is (x0, y0)
+    # the top right corner of one ax is (x1, y1)
+    # p0: the verticle / horizontal postion of anchor
+    x0, y0, x1, y1 = ax.get_position().extents
+    cx0, cy0, cx1, cy1 = cbar.ax.get_position().extents
     p0 = (y1 - y0) * anchor_y + y0
-    cy1 = cbar.ax.get_position().y1
-    cy0 = cbar.ax.get_position().y0
 
     np.testing.assert_allclose(
             [cy1, cy0],
-            [y1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + y0 * shrink]
-            )
+            [y1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + y0 * shrink])
 
-    # horizontal
+    # left
+    fig, ax = plt.subplots()
+    cs = ax.contourf(data, levels=levels)
+    cbar = plt.colorbar(
+            cs, ax=ax, use_gridspec=True,
+            location='left', anchor=(1, anchor_y), shrink=shrink)
+
+    # the bottom left corner of one ax is (x0, y0)
+    # the top right corner of one ax is (x1, y1)
+    # p0: the verticle / horizontal postion of anchor
+    x0, y0, x1, y1 = ax.get_position().extents
+    cx0, cy0, cx1, cy1 = cbar.ax.get_position().extents
+    p0 = (y1 - y0) * anchor_y + y0
+
+    np.testing.assert_allclose(
+            [cy1, cy0],
+            [y1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + y0 * shrink])
+    # top
+    shrink = 0.5
+    anchor_x = 0.3
+    fig, ax = plt.subplots()
+    cs = ax.contourf(data, levels=levels)
+    cbar = plt.colorbar(
+            cs, ax=ax, use_gridspec=True,
+            location='top', anchor=(anchor_x, 1), shrink=shrink)
+
+    # the bottom left corner of one ax is (x0, y0)
+    # the top right corner of one ax is (x1, y1)
+    # p0: the verticle / horizontal postion of anchor
+    x0, y0, x1, y1 = ax.get_position().extents
+    cx0, cy0, cx1, cy1 = cbar.ax.get_position().extents
+    p0 = (x1 - x0) * anchor_x + x0
+
+    np.testing.assert_allclose(
+            [cx1, cx0],
+            [x1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + x0 * shrink])
+
+    # bottom
     shrink = 0.5
     anchor_x = 0.3
     fig, ax = plt.subplots()
     cs = ax.contourf(data, levels=levels)
     cbar = plt.colorbar(
             cs, ax=ax, use_gridspec=True,
-            orientation='horizontal', anchor=(anchor_x, 1), shrink=shrink)
+            location='bottom', anchor=(anchor_x, 1), shrink=shrink)
 
-    # x1: the right of ax, x0: the left of ax, p0: the x postion of anchor
-    # cx1 : the right of colorbar ax, cx0: the left of colorbar ax
-    x1 = ax.get_position().x1
-    x0 = ax.get_position().x0
+    # the bottom left corner of one ax is (x0, y0)
+    # the top right corner of one ax is (x1, y1)
+    # p0: the verticle / horizontal postion of anchor
+    x0, y0, x1, y1 = ax.get_position().extents
+    cx0, cy0, cx1, cy1 = cbar.ax.get_position().extents
     p0 = (x1 - x0) * anchor_x + x0
-    cx1 = cbar.ax.get_position().x1
-    cx0 = cbar.ax.get_position().x0
 
     np.testing.assert_allclose(
             [cx1, cx0],
-            [x1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + x0 * shrink]
-            )
+            [x1 * shrink + (1 - shrink) * p0, p0 * (1 - shrink) + x0 * shrink])
