Commit5bf04bd

tacaswell

authored and

meeseeksmachine

committed

Backport PR#20771: FIX: tickspacing for subfigures

1 parent433ec04 commit5bf04bdCopy full SHA for 5bf04bd

File tree

4 files changed

+61

-5

lines changed

lib/matplotlib
- axis.py
- figure.py
- tests
  - baseline_images/test_figure
    - test_subfigure_scatter_size.png
  - test_figure.py

4 files changed

+61

-5

lines changed

`‎lib/matplotlib/axis.py`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2261,8 +2261,10 @@ def set_default_intervals(self):`
`2261`	`2261`	`self.stale=True`
`2262`	`2262`
`2263`	`2263`	`defget_tick_space(self):`
`2264`		`-ends=self.axes.transAxes.transform([[0,0], [1,0]])`
`2265`		`-length= ((ends[1][0]-ends[0][0])/self.axes.figure.dpi)*72`
	`2264`	`+ends=mtransforms.Bbox.from_bounds(0,0,1,1)`
	`2265`	`+ends=ends.transformed(self.axes.transAxes-`
	`2266`	`+self.figure.dpi_scale_trans)`
	`2267`	`+length=ends.width*72`
`2266`	`2268`	`# There is a heuristic here that the aspect ratio of tick text`
`2267`	`2269`	`# is no more than 3:1`
`2268`	`2270`	`size=self._get_tick_label_size('x')*3`
`@@ -2526,8 +2528,10 @@ def set_default_intervals(self):`
`2526`	`2528`	`self.stale=True`
`2527`	`2529`
`2528`	`2530`	`defget_tick_space(self):`
`2529`		`-ends=self.axes.transAxes.transform([[0,0], [0,1]])`
`2530`		`-length= ((ends[1][1]-ends[0][1])/self.axes.figure.dpi)*72`
	`2531`	`+ends=mtransforms.Bbox.from_bounds(0,0,1,1)`
	`2532`	`+ends=ends.transformed(self.axes.transAxes-`
	`2533`	`+self.figure.dpi_scale_trans)`
	`2534`	`+length=ends.height*72`
`2531`	`2535`	`# Having a spacing of at least 2 just looks good.`
`2532`	`2536`	`size=self._get_tick_label_size('y')*2`
`2533`	`2537`	`ifsize>0:`

`‎lib/matplotlib/figure.py`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1985,7 +1985,6 @@ def __init__(self, parent, subplotspec, *,`
`1985`	`1985`	`self.subplotpars=parent.subplotpars`
`1986`	`1986`	`self.dpi_scale_trans=parent.dpi_scale_trans`
`1987`	`1987`	`self._axobservers=parent._axobservers`
`1988`		`-self.dpi=parent.dpi`
`1989`	`1988`	`self.canvas=parent.canvas`
`1990`	`1989`	`self.transFigure=parent.transFigure`
`1991`	`1990`	`self.bbox_relative=None`
`@@ -2006,6 +2005,14 @@ def __init__(self, parent, subplotspec, *,`
`2006`	`2005`	`ifparent._layoutgridisnotNone:`
`2007`	`2006`	`self.init_layoutgrid()`
`2008`	`2007`
	`2008`	`+@property`
	`2009`	`+defdpi(self):`
	`2010`	`+returnself._parent.dpi`
	`2011`	`+`
	`2012`	`+@dpi.setter`
	`2013`	`+defdpi(self,value):`
	`2014`	`+self._parent.dpi=value`
	`2015`	`+`
`2009`	`2016`	`def_redo_transform_rel_fig(self,bbox=None):`
`2010`	`2017`	`"""`
`2011`	`2018`	`Make the transSubfigure bbox relative to Figure transform.`

`‎lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png`

4.5 KB

`‎lib/matplotlib/tests/test_figure.py`

Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1020,6 +1020,51 @@ def test_subfigure_spanning():`
`1020`	`1020`	`np.testing.assert_allclose(sub_figs[2].bbox.max, [w,h/3])`
`1021`	`1021`
`1022`	`1022`
	`1023`	`+@mpl.style.context('mpl20')`
	`1024`	`+deftest_subfigure_ticks():`
	`1025`	`+# This tests a tick-spacing error that only seems applicable`
	`1026`	`+# when the subfigures are saved to file. It is very hard to replicate`
	`1027`	`+fig=plt.figure(constrained_layout=True,figsize=(10,3))`
	`1028`	`+# create left/right subfigs nested in bottom subfig`
	`1029`	`+ (subfig_bl,subfig_br)=fig.subfigures(1,2,wspace=0.01,`
	`1030`	`+width_ratios=[7,2])`
	`1031`	`+`
	`1032`	`+# put ax1-ax3 in gridspec of bottom-left subfig`
	`1033`	`+gs=subfig_bl.add_gridspec(nrows=1,ncols=14)`
	`1034`	`+`
	`1035`	`+ax1=subfig_bl.add_subplot(gs[0, :1])`
	`1036`	`+ax1.scatter(x=[-56.46881504821776,24.179891162109396],y=[1500,3600])`
	`1037`	`+`
	`1038`	`+ax2=subfig_bl.add_subplot(gs[0,1:3],sharey=ax1)`
	`1039`	`+ax2.scatter(x=[-126.5357270050049,94.68456736755368],y=[1500,3600])`
	`1040`	`+ax3=subfig_bl.add_subplot(gs[0,3:14],sharey=ax1)`
	`1041`	`+`
	`1042`	`+fig.set_dpi(120)`
	`1043`	`+fig.draw_no_output()`
	`1044`	`+ticks120=ax2.get_xticks()`
	`1045`	`+fig.set_dpi(300)`
	`1046`	`+fig.draw_no_output()`
	`1047`	`+ticks300=ax2.get_xticks()`
	`1048`	`+np.testing.assert_allclose(ticks120,ticks300)`
	`1049`	`+`
	`1050`	`+`
	`1051`	`+@image_comparison(['test_subfigure_scatter_size.png'],style='mpl20',`
	`1052`	`+remove_text=True)`
	`1053`	`+deftest_subfigure_scatter_size():`
	`1054`	`+# markers in the left- and right-most subplots should be the same`
	`1055`	`+fig=plt.figure()`
	`1056`	`+gs=fig.add_gridspec(1,2)`
	`1057`	`+ax0=fig.add_subplot(gs[1])`
	`1058`	`+ax0.scatter([1,2,3], [1,2,3],s=30,marker='s')`
	`1059`	`+ax0.scatter([3,4,5], [1,2,3],s=[20,30,40],marker='s')`
	`1060`	`+`
	`1061`	`+sfig=fig.add_subfigure(gs[0])`
	`1062`	`+axs=sfig.subplots(1,2)`
	`1063`	`+foraxin [ax0,axs[0]]:`
	`1064`	`+ax.scatter([1,2,3], [1,2,3],s=30,marker='s',color='r')`
	`1065`	`+ax.scatter([3,4,5], [1,2,3],s=[20,30,40],marker='s',color='g')`
	`1066`	`+`
	`1067`	`+`
`1023`	`1068`	`deftest_add_subplot_kwargs():`
`1024`	`1069`	`# fig.add_subplot() always creates new axes, even if axes kwargs differ.`
`1025`	`1070`	`fig=plt.figure()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit5bf04bd

File tree

4 files changed

4 files changed

`‎lib/matplotlib/axis.py`

`‎lib/matplotlib/figure.py`

`‎lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png`

`‎lib/matplotlib/tests/test_figure.py`

0 commit comments