Merge pull request #18453 from jklymak/fix-manual-place

jklymak · web-flow · commit fd8c87ecaccf · 2020-09-14T17:07:48.000-07:00
FIX: allow manually placed axes in constrained_layout
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -209,7 +209,7 @@ def _make_layout_margins(fig, renderer, *, w_pad=0, h_pad=0,
 
     # for ax in [a for a in fig._localaxes if hasattr(a, 'get_subplotspec')]:
     for ax in fig.get_axes():
-        if not hasattr(ax, 'get_subplotspec'):
+        if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
         ss = ax.get_subplotspec()
@@ -320,7 +320,8 @@ def _match_submerged_margins(fig):
     for panel in fig.panels:
         _match_submerged_margins(panel)
 
-    axs = [a for a in fig.get_axes() if hasattr(a, 'get_subplotspec')]
+    axs = [a for a in fig.get_axes() if (hasattr(a, 'get_subplotspec')
+                                         and a.get_in_layout())]
 
     for ax1 in axs:
         ss1 = ax1.get_subplotspec()
@@ -457,7 +458,7 @@ def _reposition_axes(fig, renderer, *, w_pad=0, h_pad=0, hspace=0, wspace=0):
     # for ax in fig._localaxes:
     #     if not hasattr(a, 'get_subplotspec'):
     for ax in fig.get_axes():
-        if not hasattr(ax, 'get_subplotspec'):
+        if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
         # grid bbox is in Figure co-ordinates, but we specify in panel
@@ -578,7 +579,7 @@ def _reset_margins(fig):
     for span in fig.panels:
         _reset_margins(span)
     for ax in fig.axes:
-        if hasattr(ax, 'get_subplotspec'):
+        if hasattr(ax, 'get_subplotspec') and ax.get_in_layout():
             ss = ax.get_subplotspec()
             gs = ss.get_gridspec()
             if gs._layoutgrid is not None:
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -926,7 +926,8 @@ def set_position(self, pos, which='both'):
         """
         self._set_position(pos, which=which)
         # because this is being called externally to the library we
-        # zero the constrained layout parts.
+        # don't let it be in the layout.
+        self.set_in_layout(False)
 
     def _set_position(self, pos, which='both'):
         """
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -487,3 +487,19 @@ def test_colorbars_no_overlapH():
         ax.tick_params(axis='both', direction='in')
         im = ax.imshow([[1, 2], [3, 4]])
         fig.colorbar(im, ax=ax, orientation="horizontal")
+
+
+def test_manually_set_position():
+    fig, axs = plt.subplots(1, 2, constrained_layout=True)
+    axs[0].set_position([0.2, 0.2, 0.3, 0.3])
+    fig.canvas.draw()
+    pp = axs[0].get_position()
+    np.testing.assert_allclose(pp, [[0.2, 0.2], [0.5, 0.5]])
+
+    fig, axs = plt.subplots(1, 2, constrained_layout=True)
+    axs[0].set_position([0.2, 0.2, 0.3, 0.3])
+    pc = axs[0].pcolormesh(np.random.rand(20, 20))
+    fig.colorbar(pc, ax=axs[0])
+    fig.canvas.draw()
+    pp = axs[0].get_position()
+    np.testing.assert_allclose(pp, [[0.2, 0.2], [0.44, 0.5]])
