Support SubFigures in AxesDivider.

anntzer · anntzer · commit e77352028f47 · 2021-04-25T17:12:43.000+02:00
diff --git a/examples/axes_grid1/simple_axes_divider1.py b/examples/axes_grid1/simple_axes_divider1.py
@@ -16,51 +16,53 @@ def setup(ax, text):
                    left=False, labelleft=False)
 
 
+fig = plt.figure(figsize=(12, 6))
+sfs = fig.subfigures(1, 2)
+
+
 ##############################################################################
 # Fixed axes sizes; fixed paddings.
 
-fig = plt.figure(figsize=(6, 6))
-fig.suptitle("Fixed axes sizes, fixed paddings")
+sfs[0].suptitle("Fixed axes sizes, fixed paddings")
 
 # Sizes are in inches.
 horiz = [Size.Fixed(1.), Size.Fixed(.5), Size.Fixed(1.5), Size.Fixed(.5)]
 vert = [Size.Fixed(1.5), Size.Fixed(.5), Size.Fixed(1.)]
 
 rect = (0.1, 0.1, 0.8, 0.8)
 # Divide the axes rectangle into a grid with sizes specified by horiz * vert.
-divider = Divider(fig, rect, horiz, vert, aspect=False)
+div = Divider(sfs[0], rect, horiz, vert, aspect=False)
 
 # The rect parameter will actually be ignored and overridden by axes_locator.
-ax1 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=0))
+ax1 = sfs[0].add_axes(rect, axes_locator=div.new_locator(nx=0, ny=0))
 setup(ax1, "nx=0, ny=0")
-ax2 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=2))
+ax2 = sfs[0].add_axes(rect, axes_locator=div.new_locator(nx=0, ny=2))
 setup(ax2, "nx=0, ny=2")
-ax3 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, ny=2))
+ax3 = sfs[0].add_axes(rect, axes_locator=div.new_locator(nx=2, ny=2))
 setup(ax3, "nx=2, ny=2")
-ax4 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, nx1=4, ny=0))
+ax4 = sfs[0].add_axes(rect, axes_locator=div.new_locator(nx=2, nx1=4, ny=0))
 setup(ax4, "nx=2, nx1=4, ny=0")
 
 ##############################################################################
 # Axes sizes that scale with the figure size; fixed paddings.
 
-fig = plt.figure(figsize=(6, 6))
-fig.suptitle("Scalable axes sizes, fixed paddings")
+sfs[1].suptitle("Scalable axes sizes, fixed paddings")
 
 horiz = [Size.Scaled(1.5), Size.Fixed(.5), Size.Scaled(1.), Size.Scaled(.5)]
 vert = [Size.Scaled(1.), Size.Fixed(.5), Size.Scaled(1.5)]
 
 rect = (0.1, 0.1, 0.8, 0.8)
 # Divide the axes rectangle into a grid with sizes specified by horiz * vert.
-divider = Divider(fig, rect, horiz, vert, aspect=False)
+div = Divider(sfs[1], rect, horiz, vert, aspect=False)
 
 # The rect parameter will actually be ignored and overridden by axes_locator.
-ax1 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=0))
+ax1 = sfs[1].add_axes(rect, axes_locator=div.new_locator(nx=0, ny=0))
 setup(ax1, "nx=0, ny=0")
-ax2 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=0, ny=2))
+ax2 = sfs[1].add_axes(rect, axes_locator=div.new_locator(nx=0, ny=2))
 setup(ax2, "nx=0, ny=2")
-ax3 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, ny=2))
+ax3 = sfs[1].add_axes(rect, axes_locator=div.new_locator(nx=2, ny=2))
 setup(ax3, "nx=2, ny=2")
-ax4 = fig.add_axes(rect, axes_locator=divider.new_locator(nx=2, nx1=4, ny=0))
+ax4 = sfs[1].add_axes(rect, axes_locator=div.new_locator(nx=2, nx1=4, ny=0))
 setup(ax4, "nx=2, nx1=4, ny=0")
 
 plt.show()
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -195,21 +195,21 @@ def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
         renderer
         """
 
-        figW, figH = self._fig.get_size_inches()
+        fig_w, fig_h = self._fig.bbox.size / self._fig.dpi
         x, y, w, h = self.get_position_runtime(axes, renderer)
 
         hsizes = self.get_horizontal_sizes(renderer)
         vsizes = self.get_vertical_sizes(renderer)
-        k_h = self._calc_k(hsizes, figW*w)
-        k_v = self._calc_k(vsizes, figH*h)
+        k_h = self._calc_k(hsizes, fig_w*w)
+        k_v = self._calc_k(vsizes, fig_h*h)
 
         if self.get_aspect():
             k = min(k_h, k_v)
             ox = self._calc_offsets(hsizes, k)
             oy = self._calc_offsets(vsizes, k)
 
-            ww = (ox[-1] - ox[0]) / figW
-            hh = (oy[-1] - oy[0]) / figH
+            ww = (ox[-1] - ox[0]) / fig_w
+            hh = (oy[-1] - oy[0]) / fig_h
             pb = mtransforms.Bbox.from_bounds(x, y, w, h)
             pb1 = mtransforms.Bbox.from_bounds(x, y, ww, hh)
             pb1_anchored = pb1.anchored(self.get_anchor(), pb)
@@ -225,8 +225,8 @@ def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
         if ny1 is None:
             ny1 = ny + 1
 
-        x1, w1 = x0 + ox[nx] / figW, (ox[nx1] - ox[nx]) / figW
-        y1, h1 = y0 + oy[ny] / figH, (oy[ny1] - oy[ny]) / figH
+        x1, w1 = x0 + ox[nx] / fig_w, (ox[nx1] - ox[nx]) / fig_w
+        y1, h1 = y0 + oy[ny] / fig_h, (oy[ny1] - oy[ny]) / fig_h
 
         return mtransforms.Bbox.from_bounds(x1, y1, w1, h1)
 
@@ -657,7 +657,7 @@ def new_locator(self, nx, nx1=None):
 
     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
         # docstring inherited
-        fig_w, fig_h = self._fig.get_size_inches()
+        fig_w, fig_h = self._fig.bbox.size / self._fig.dpi
         x, y, w, h = self.get_position_runtime(axes, renderer)
         y_equal_sizes = self.get_vertical_sizes(renderer)
         x_summed_sizes = self.get_horizontal_sizes(renderer)
@@ -693,7 +693,7 @@ def new_locator(self, ny, ny1=None):
 
     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
         # docstring inherited
-        fig_w, fig_h = self._fig.get_size_inches()
+        fig_w, fig_h = self._fig.bbox.size / self._fig.dpi
         x, y, w, h = self.get_position_runtime(axes, renderer)
         x_equal_sizes = self.get_horizontal_sizes(renderer)
         y_summed_sizes = self.get_vertical_sizes(renderer)
