Commit75e2d22

authored

Merge pull request#25052 from oscargus/tablebbox

Support both Bbox and list for bbox to table/Table

2 parentsc9d7bff +51aba38 commit75e2d22Copy full SHA for 75e2d22

File tree

+35

-4

lines changed

+35

-4

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ def __init__(self, ax, loc=None, bbox=None, **kwargs):`
`285`	`285`	`loc : str`
`286`	`286`	`The position of the cell with respect to ax. This must be one of`
`287`	`287`	the `~.Table.codes`.
`288`		- bbox : `.Bbox` orNone
	`288`	+ bbox : `.Bbox` or[xmin, ymin, width, height], optional
`289`	`289`	`A bounding box to draw the table into. If this is not None, this`
`290`	`290`	`overrides loc.`
`291`	`291`
`@@ -595,7 +595,10 @@ def _update_positions(self, renderer):`
`595`	`595`
`596`	`596`	`ifself._bboxisnotNone:`
`597`	`597`	`# Position according to bbox`
`598`		`-rl,rb,rw,rh=self._bbox`
	`598`	`+ifisinstance(self._bbox,Bbox):`
	`599`	`+rl,rb,rw,rh=self._bbox.bounds`
	`600`	`+else:`
	`601`	`+rl,rb,rw,rh=self._bbox`
`599`	`602`	`self.scale(rw/w,rh/h)`
`600`	`603`	`ox=rl-l`
`601`	`604`	`oy=rb-b`
`@@ -710,7 +713,7 @@ def table(ax,`
`710`	`713`	`The position of the cell with respect to ax. This must be one of`
`711`	`714`	the `~.Table.codes`.
`712`	`715`
`713`		- bbox : `.Bbox`, optional
	`716`	+ bbox : `.Bbox` or [xmin, ymin, width, height], optional
`714`	`717`	`A bounding box to draw the table into. If this is not None, this`
`715`	`718`	`overrides loc.`
`716`	`719`

Lines changed: 29 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`importmatplotlib.pyplotasplt`
`2`	`2`	`importnumpyasnp`
`3`		`-frommatplotlib.testing.decoratorsimportimage_comparison`
	`3`	`+frommatplotlib.testing.decoratorsimportimage_comparison,check_figures_equal`
`4`	`4`
`5`	`5`	`frommatplotlib.tableimportCustomCell,Table`
`6`	`6`	`frommatplotlib.pathimportPath`
	`7`	`+frommatplotlib.transformsimportBbox`
`7`	`8`
`8`	`9`
`9`	`10`	`deftest_non_square():`
`@@ -194,3 +195,30 @@ def test_table_cells():`
`194`	`195`	`# properties and setp`
`195`	`196`	`table.properties()`
`196`	`197`	`plt.setp(table)`
	`198`	`+`
	`199`	`+`
	`200`	`+@check_figures_equal(extensions=["png"])`
	`201`	`+deftest_table_bbox(fig_test,fig_ref):`
	`202`	`+data= [[2,3],`
	`203`	`+ [4,5]]`
	`204`	`+`
	`205`	`+col_labels= ('Foo','Bar')`
	`206`	`+row_labels= ('Ada','Bob')`
	`207`	`+`
	`208`	`+cell_text= [[f"{x}"forxinrow]forrowindata]`
	`209`	`+`
	`210`	`+ax_list=fig_test.subplots()`
	`211`	`+ax_list.table(cellText=cell_text,`
	`212`	`+rowLabels=row_labels,`
	`213`	`+colLabels=col_labels,`
	`214`	`+loc='center',`
	`215`	`+bbox=[0.1,0.2,0.8,0.6]`
	`216`	`+ )`
	`217`	`+`
	`218`	`+ax_bbox=fig_ref.subplots()`
	`219`	`+ax_bbox.table(cellText=cell_text,`
	`220`	`+rowLabels=row_labels,`
	`221`	`+colLabels=col_labels,`
	`222`	`+loc='center',`
	`223`	`+bbox=Bbox.from_extents(0.1,0.2,0.9,0.8)`
	`224`	`+ )`

Comments

(0)