FIX: subfigure indexing error

jklymak · jklymak · commit 704a37cff53d · 2021-04-12T09:20:39.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1992,11 +1992,11 @@ def _redo_transform_rel_fig(self, bbox=None):
 
         x0 = 0
         if not self._subplotspec.is_first_col():
-            x0 += np.sum(wr[self._subplotspec.colspan.start - 1]) / np.sum(wr)
+            x0 += np.sum(wr[:self._subplotspec.colspan.start]) / np.sum(wr)
 
         y0 = 0
         if not self._subplotspec.is_last_row():
-            y0 += 1 - (np.sum(hr[self._subplotspec.rowspan.stop - 1]) /
+            y0 += 1 - (np.sum(hr[:(self._subplotspec.rowspan.stop)]) /
                        np.sum(hr))
 
         if self.bbox_relative is None:
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -967,6 +967,39 @@ def test_subfigure_double():
     axsRight = subfigs[1].subplots(2, 2)
 
 
+def test_subfigure_spanning():
+    # test that subfigures get laid out properly...
+    fig = plt.figure(constrained_layout=True)
+    gs = fig.add_gridspec(3, 3)
+    sub_figs = []
+    sub_figs += [fig.add_subfigure(gs[0, 0])]
+    sub_figs += [fig.add_subfigure(gs[0:2, 1])]
+    sub_figs += [fig.add_subfigure(gs[2, 1:3])]
+
+    w = 640
+    h = 480
+    minp = sub_figs[0].bbox.min
+    exp = np.array([0., h*2/3])
+    np.testing.assert_allclose(minp, exp)
+    maxp = sub_figs[0].bbox.max
+    exp = np.array([w / 3, h])
+    np.testing.assert_allclose(maxp, exp)
+
+    minp = sub_figs[1].bbox.min
+    exp = np.array([w / 3, h * 1 / 3])
+    np.testing.assert_allclose(minp, exp)
+    maxp = sub_figs[1].bbox.max
+    exp = np.array([w * 2 / 3, h])
+    np.testing.assert_allclose(maxp, exp)
+
+    minp = sub_figs[2].bbox.min
+    exp = np.array([w / 3, 0])
+    np.testing.assert_allclose(minp, exp)
+    maxp = sub_figs[2].bbox.max
+    exp = np.array([w, h * 1 / 3])
+    np.testing.assert_allclose(maxp, exp)
+
+
 def test_add_subplot_kwargs():
     # fig.add_subplot() always creates new axes, even if axes kwargs differ.
     fig = plt.figure()
