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

Commit3e4a204

committed

Fix resetting grid visibility

Actually, there were two issues:- 'gridOn' state should always be contained in the _tick_kw settings. This is needed because we support toggling via grid() and thus need to be able to query the state. Therefore, the _tick_kw dicts must be resetted instead of cleared.- grid(some_kwarg=...) i.e. with b=None and keywords must be treated explicitly as b=True as the docs already propose.Closes#20149.

1 parent363105b commit3e4a204Copy full SHA for 3e4a204

File tree

2 files changed

+30

-10

lines changed

lib/matplotlib
- axis.py
- tests
  - test_axes.py

2 files changed

+30

-10

lines changed

`‎lib/matplotlib/axis.py`

Lines changed: 17 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -786,6 +786,16 @@ def get_children(self):`
`786`	`786`	`return [self.label,self.offsetText,`
`787`	`787`	`self.get_major_ticks(),self.get_minor_ticks()]`
`788`	`788`
	`789`	`+def_reset_major_tick_kw(self):`
	`790`	`+self._major_tick_kw['gridOn']= (`
	`791`	`+mpl.rcParams['axes.grid']and`
	`792`	`+mpl.rcParams['axes.grid.which']in ('both','major'))`
	`793`	`+`
	`794`	`+def_reset_minor_tick_kw(self):`
	`795`	`+self._minor_tick_kw['gridOn']= (`
	`796`	`+mpl.rcParams['axes.grid']and`
	`797`	`+mpl.rcParams['axes.grid.which']in ('both','minor'))`
	`798`	`+`
`789`	`799`	`defclear(self):`
`790`	`800`	`"""`
`791`	`801`	`Clear the axis.`
`@@ -807,14 +817,8 @@ def clear(self):`
`807`	`817`	`# Clear the callback registry for this axis, or it may "leak"`
`808`	`818`	`self.callbacks=cbook.CallbackRegistry()`
`809`	`819`
`810`		`-# whether the grids are on`
`811`		`-self._major_tick_kw['gridOn']= (`
`812`		`-mpl.rcParams['axes.grid']and`
`813`		`-mpl.rcParams['axes.grid.which']in ('both','major'))`
`814`		`-self._minor_tick_kw['gridOn']= (`
`815`		`-mpl.rcParams['axes.grid']and`
`816`		`-mpl.rcParams['axes.grid.which']in ('both','minor'))`
`817`		`-`
	`820`	`+self._reset_major_tick_kw()`
	`821`	`+self._reset_minor_tick_kw()`
`818`	`822`	`self.reset_ticks()`
`819`	`823`
`820`	`824`	`self.converter=None`
`@@ -861,10 +865,10 @@ def set_tick_params(self, which='major', reset=False, **kw):`
`861`	`865`	`# future new ticks will automatically get them`
`862`	`866`	`ifreset:`
`863`	`867`	`ifwhichin ['major','both']:`
`864`		`-self._major_tick_kw.clear()`
	`868`	`+self._reset_major_tick_kw()`
`865`	`869`	`self._major_tick_kw.update(kwtrans)`
`866`	`870`	`ifwhichin ['minor','both']:`
`867`		`-self._minor_tick_kw.clear()`
	`871`	`+self._reset_minor_tick_kw()`
`868`	`872`	`self._minor_tick_kw.update(kwtrans)`
`869`	`873`	`self.reset_ticks()`
`870`	`874`	`else:`
`@@ -1413,6 +1417,9 @@ def grid(self, b=None, which='major', **kwargs):`
`1413`	`1417`
`1414`	`1418`	`grid(color='r', linestyle='-', linewidth=2)`
`1415`	`1419`	`"""`
	`1420`	`+ifbisNoneandkwargs:`
	`1421`	`+b=True# if any kwargs are supplied, assume you want the grid on`
	`1422`	`+`
`1416`	`1423`	`ifbisnotNone:`
`1417`	`1424`	`if'visible'inkwargsandbool(b)!=bool(kwargs['visible']):`
`1418`	`1425`	`raiseValueError(`

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

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4757,6 +4757,19 @@ def test_grid():`
`4757`	`4757`	`assertnotax.xaxis.majorTicks[0].gridline.get_visible()`
`4758`	`4758`
`4759`	`4759`
	`4760`	`+deftest_reset_grid():`
	`4761`	`+fig,ax=plt.subplots()`
	`4762`	`+ax.tick_params(reset=True,which='major',labelsize=10)`
	`4763`	`+assertnotax.xaxis.majorTicks[0].gridline.get_visible()`
	`4764`	`+ax.grid(color='red')# enables grid`
	`4765`	`+assertax.xaxis.majorTicks[0].gridline.get_visible()`
	`4766`	`+`
	`4767`	`+withplt.rc_context({'axes.grid':True}):`
	`4768`	`+ax.clear()`
	`4769`	`+ax.tick_params(reset=True,which='major',labelsize=10)`
	`4770`	`+assertax.xaxis.majorTicks[0].gridline.get_visible()`
	`4771`	`+`
	`4772`	`+`
`4760`	`4773`	`deftest_vline_limit():`
`4761`	`4774`	`fig=plt.figure()`
`4762`	`4775`	`ax=fig.gca()`

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!

Commit3e4a204

File tree

2 files changed

2 files changed

`‎lib/matplotlib/axis.py`

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

0 commit comments