Commitafbe5bb

committed

ENH: implement and use base layout_engine for more flexible layout.

1 parentad95791 commitafbe5bbCopy full SHA for afbe5bb

File tree

+461

-202

lines changed

+461

-202

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ Alphabetical list of modules:`
`66`	`66`	`fontconfig_pattern_api.rst`
`67`	`67`	`gridspec_api.rst`
`68`	`68`	`image_api.rst`
	`69`	`+layout_engine_api.rst`
`69`	`70`	`legend_api.rst`
`70`	`71`	`legend_handler_api.rst`
`71`	`72`	`lines_api.rst`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,9 @@`
	`1`	`+****************************`
	`2`	+``matplotlib.layout_engine``
	`3`	`+****************************`
	`4`	`+`
	`5`	`+..currentmodule::matplotlib.layout_engine`
	`6`	`+`
	`7`	`+..automodule::matplotlib.layout_engine`
	`8`	`+:members:`
	`9`	`+:inherited-members:`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`importnumpyasnp`
`19`	`19`
`20`	`20`	`frommatplotlibimport_api,artistasmartist`
	`21`	`+frommatplotlib.backend_basesimport_get_renderer`
`21`	`22`	`importmatplotlib.transformsasmtransforms`
`22`	`23`	`importmatplotlib._layoutgridasmlayoutgrid`
`23`	`24`
`@@ -62,7 +63,7 @@`
`62`	`63`
`63`	`64`
`64`	`65`	`######################################################`
`65`		`-defdo_constrained_layout(fig,renderer,h_pad,w_pad,`
	`66`	`+defdo_constrained_layout(fig,h_pad,w_pad,`
`66`	`67`	`hspace=None,wspace=None):`
`67`	`68`	`"""`
`68`	`69`	`Do the constrained_layout. Called at draw time in`
`@@ -91,6 +92,7 @@ def do_constrained_layout(fig, renderer, h_pad, w_pad,`
`91`	`92`	`layoutgrid : private debugging structure`
`92`	`93`	`"""`
`93`	`94`
	`95`	`+renderer=_get_renderer(fig)`
`94`	`96`	`# make layoutgrid tree...`
`95`	`97`	`layoutgrids=make_layoutgrids(fig,None)`
`96`	`98`	`ifnotlayoutgrids['hasgrids']:`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2271,7 +2271,7 @@ def print_figure(`
`2271`	`2271`	`ifbbox_inchesisNone:`
`2272`	`2272`	`bbox_inches=rcParams['savefig.bbox']`
`2273`	`2273`
`2274`		`-if (self.figure.get_constrained_layout()or`
	`2274`	`+if (self.figure.get_layout_engine()isnotNoneor`
`2275`	`2275`	`bbox_inches=="tight"):`
`2276`	`2276`	`# we need to trigger a draw before printing to make sure`
`2277`	`2277`	`# CL works. "tight" also needs a draw to get the right`
`@@ -2300,8 +2300,8 @@ def print_figure(`
`2300`	`2300`	`else:`
`2301`	`2301`	`_bbox_inches_restore=None`
`2302`	`2302`
`2303`		`-# we have already doneCL above, so turn it off:`
`2304`		`-stack.enter_context(self.figure._cm_set(constrained_layout=False))`
	`2303`	`+# we have already donelayout above, so turn it off:`
	`2304`	`+stack.enter_context(self.figure._cm_set(layout_engine=None))`
`2305`	`2305`	`try:`
`2306`	`2306`	`# _get_renderer may change the figure dpi (as vector formats`
`2307`	`2307`	`# force the figure dpi to 72), so we need to set it again here.`

Comments

(0)