Commitd77efae

committed

FIX: fix submerged margins algorithm being applied twice

1 parent200808c commitd77efaeCopy full SHA for d77efae

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -521,11 +521,13 @@ def match_submerged_margins(layoutgrids, fig):`
`521`	`521`	`See test_constrained_layout::test_constrained_layout12 for an example.`
`522`	`522`	`"""`
`523`	`523`
	`524`	`+axsdone= []`
`524`	`525`	`forsfiginfig.subfigs:`
`525`		`-match_submerged_margins(layoutgrids,sfig)`
	`526`	`+axsdone+=match_submerged_margins(layoutgrids,sfig)`
`526`	`527`
`527`	`528`	`axs= [aforainfig.get_axes()`
`528`		`-ifa.get_subplotspec()isnotNoneanda.get_in_layout()]`
	`529`	`+if (a.get_subplotspec()isnotNoneanda.get_in_layout()and`
	`530`	`+anotinaxsdone)]`
`529`	`531`
`530`	`532`	`forax1inaxs:`
`531`	`533`	`ss1=ax1.get_subplotspec()`
`@@ -592,6 +594,8 @@ def match_submerged_margins(layoutgrids, fig):`
`592`	`594`	`foriinss1.rowspan[:-1]:`
`593`	`595`	`lg1.edit_margin_min('bottom',maxsubb,cell=i)`
`594`	`596`
	`597`	`+returnaxs`
	`598`	`+`
`595`	`599`
`596`	`600`	`defget_cb_parent_spans(cbax):`
`597`	`601`	`"""`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -721,3 +721,23 @@ def test_layout_leak():`
`721`	`721`	`gc.collect()`
`722`	`722`	`assertnotany(isinstance(obj,mpl._layoutgrid.LayoutGrid)`
`723`	`723`	`forobjingc.get_objects())`
	`724`	`+`
	`725`	`+`
	`726`	`+deftest_submerged_subfig():`
	`727`	`+"""`
	`728`	`+ Test that the submerged margin logic does not get called multiple times`
	`729`	`+ on same axes if it is already in a subfigure`
	`730`	`+ """`
	`731`	`+fig=plt.figure(figsize=(4,5),layout='constrained')`
	`732`	`+figures=fig.subfigures(3,1)`
	`733`	`+axs= []`
	`734`	`+forfinfigures.flatten():`
	`735`	`+gs=f.add_gridspec(2,2)`
	`736`	`+foriinrange(2):`
	`737`	`+axs+= [f.add_subplot(gs[i,0])]`
	`738`	`+axs[-1].plot()`
	`739`	`+f.add_subplot(gs[:,1]).plot()`
	`740`	`+fig.draw_without_rendering()`
	`741`	`+foraxinaxs[1:]:`
	`742`	`+assertnp.allclose(ax.get_position().bounds[-1],`
	`743`	`+axs[0].get_position().bounds[-1],atol=1e-6)`

Comments

(0)