NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitadd6bbf

committed

Fix label_outer in the presence of colorbars.

The subgridspec to be considered should be the one containing both theaxes and the colorbar, not the sub-subgridspec of just the axes.

1 parent903d537 commitadd6bbfCopy full SHA for add6bbf

File tree

2 files changed

+37

-6

lines changed

lib/matplotlib
- axes
  - _base.py
- tests
  - test_subplots.py

2 files changed

+37

-6

lines changed

`‎lib/matplotlib/axes/_base.py`

Lines changed: 29 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4749,14 +4749,39 @@ def label_outer(self, remove_inner_ticks=False):`
`4749`	`4749`	`self._label_outer_yaxis(skip_non_rectangular_axes=False,`
`4750`	`4750`	`remove_inner_ticks=remove_inner_ticks)`
`4751`	`4751`
	`4752`	`+def_get_subplotspec_with_optional_colorbar(self):`
	`4753`	`+"""`
	`4754`	`+ Return the subplotspec for this Axes, except that if this Axes has been`
	`4755`	`+ moved to a subgridspec to make room for a colorbar, then return the`
	`4756`	`+ subplotspec that encloses both this Axes and the colorbar Axes.`
	`4757`	`+ """`
	`4758`	`+ss=self.get_subplotspec()`
	`4759`	`+ifnotss:`
	`4760`	`+return`
	`4761`	`+gs=ss.get_gridspec()`
	`4762`	`+# Match against subgridspec hierarchy set up by colorbar.make_axes_gridspec.`
	`4763`	`+if (isinstance(gs,mpl.gridspec.GridSpecFromSubplotSpec)`
	`4764`	`+andgs.nrows*gs.ncols==6):`
	`4765`	`+foraxinself.figure.axes:`
	`4766`	`+if (axisnotself`
	`4767`	`+andhasattr(ax,"_colorbar_info")`
	`4768`	`+andax.get_subplotspec()`
	`4769`	`+andisinstance(ax.get_subplotspec().get_gridspec(),`
	`4770`	`+mpl.gridspec.GridSpecFromSubplotSpec)`
	`4771`	`+and (ax.get_subplotspec().get_gridspec()._subplot_spec`
	`4772`	`+isgs._subplot_spec)):`
	`4773`	`+ss=gs._subplot_spec`
	`4774`	`+break`
	`4775`	`+returnss`
	`4776`	`+`
`4752`	`4777`	`def_label_outer_xaxis(self,*,skip_non_rectangular_axes,`
`4753`	`4778`	`remove_inner_ticks=False):`
`4754`	`4779`	`# see documentation in label_outer.`
`4755`	`4780`	`ifskip_non_rectangular_axesandnotisinstance(self.patch,`
`4756`	`4781`	`mpl.patches.Rectangle):`
`4757`	`4782`	`return`
`4758`		`-ss=self.get_subplotspec()`
`4759`		`-ifnotss:`
	`4783`	`+ss=self._get_subplotspec_with_optional_colorbar()`
	`4784`	`+ifssisNone:`
`4760`	`4785`	`return`
`4761`	`4786`	`label_position=self.xaxis.get_label_position()`
`4762`	`4787`	`ifnotss.is_first_row():# Remove top label/ticklabels/offsettext.`
`@@ -4782,8 +4807,8 @@ def _label_outer_yaxis(self, *, skip_non_rectangular_axes,`
`4782`	`4807`	`ifskip_non_rectangular_axesandnotisinstance(self.patch,`
`4783`	`4808`	`mpl.patches.Rectangle):`
`4784`	`4809`	`return`
`4785`		`-ss=self.get_subplotspec()`
`4786`		`-ifnotss:`
	`4810`	`+ss=self._get_subplotspec_with_optional_colorbar()`
	`4811`	`+ifssisNone:`
`4787`	`4812`	`return`
`4788`	`4813`	`label_position=self.yaxis.get_label_position()`
`4789`	`4814`	`ifnotss.is_first_col():# Remove left label/ticklabels/offsettext.`

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

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`importnumpyasnp`
`5`	`5`	`importpytest`
`6`	`6`
	`7`	`+importmatplotlibasmpl`
`7`	`8`	`frommatplotlib.axesimportAxes,SubplotBase`
`8`	`9`	`importmatplotlib.pyplotasplt`
`9`	`10`	`frommatplotlib.testing.decoratorsimportcheck_figures_equal,image_comparison`
`@@ -111,10 +112,15 @@ def test_shared():`
`111`	`112`
`112`	`113`
`113`	`114`	`@pytest.mark.parametrize('remove_ticks', [True,False])`
`114`		`-deftest_label_outer(remove_ticks):`
`115`		`-f,axs=plt.subplots(2,2,sharex=True,sharey=True)`
	`115`	`+@pytest.mark.parametrize('layout_engine', ['tight','constrained'])`
	`116`	`+@pytest.mark.parametrize('with_colorbar', [True,False])`
	`117`	`+deftest_label_outer(remove_ticks,layout_engine,with_colorbar):`
	`118`	`+fig=plt.figure(layout=layout_engine)`
	`119`	`+axs=fig.subplots(2,2,sharex=True,sharey=True)`
`116`	`120`	`foraxinaxs.flat:`
`117`	`121`	`ax.set(xlabel="foo",ylabel="bar")`
	`122`	`+ifwith_colorbar:`
	`123`	`+fig.colorbar(mpl.cm.ScalarMappable(),ax=ax)`
`118`	`124`	`ax.label_outer(remove_inner_ticks=remove_ticks)`
`119`	`125`	`check_ticklabel_visible(`
`120`	`126`	`axs.flat, [False,False,True,True], [True,False,True,False])`

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!

Commitadd6bbf

File tree

2 files changed

2 files changed

`‎lib/matplotlib/axes/_base.py`

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

0 commit comments