Commite0de606

authored

Merge pull request#25520 from rcomer/backport-25499

Backport PR#25499: FIX: use locators in adjust_bbox

2 parentsc37415e +a42649e commite0de606Copy full SHA for e0de606

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ def adjust_bbox(fig, bbox_inches, fixed_dpi=None):`
`23`	`23`	`locator_list= []`
`24`	`24`	`sentinel=object()`
`25`	`25`	`foraxinfig.axes:`
`26`		`-locator_list.append(ax.get_axes_locator())`
	`26`	`+locator=ax.get_axes_locator()`
	`27`	`+iflocatorisnotNone:`
	`28`	`+ax.apply_aspect(locator(ax,None))`
	`29`	`+locator_list.append(locator)`
`27`	`30`	`current_pos=ax.get_position(original=False).frozen()`
`28`	`31`	`ax.set_axes_locator(lambdaa,r,_pos=current_pos:_pos)`
`29`	`32`	`# override the method that enforces the aspect ratio on the Axes`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -532,13 +532,24 @@ def test_savefig_pixel_ratio(backend):`
`532`	`532`	`assertratio1==ratio2`
`533`	`533`
`534`	`534`
`535`		`-deftest_savefig_preserve_layout_engine(tmp_path):`
	`535`	`+deftest_savefig_preserve_layout_engine():`
`536`	`536`	`fig=plt.figure(layout='compressed')`
`537`		`-fig.savefig(tmp_path/'foo.png',bbox_inches='tight')`
	`537`	`+fig.savefig(io.BytesIO(),bbox_inches='tight')`
`538`	`538`
`539`	`539`	`assertfig.get_layout_engine()._compress`
`540`	`540`
`541`	`541`
	`542`	`+deftest_savefig_locate_colorbar():`
	`543`	`+fig,ax=plt.subplots()`
	`544`	`+pc=ax.pcolormesh(np.random.randn(2,2))`
	`545`	`+cbar=fig.colorbar(pc,aspect=40)`
	`546`	`+fig.savefig(io.BytesIO(),bbox_inches=mpl.transforms.Bbox([[0,0], [4,4]]))`
	`547`	`+`
	`548`	`+# Check that an aspect ratio has been applied.`
	`549`	`+assert (cbar.ax.get_position(original=True).bounds!=`
	`550`	`+cbar.ax.get_position(original=False).bounds)`
	`551`	`+`
	`552`	`+`
`542`	`553`	`deftest_figure_repr():`
`543`	`554`	`fig=plt.figure(figsize=(10,20),dpi=10)`
`544`	`555`	`assertrepr(fig)=="<Figure size 100x200 with 0 Axes>"`

Comments

(0)