Commit 1c3c32f

authored

Merge pull request matplotlib#30367 from anntzer/st

Support passing xticks/yticks when constructing secondary_axis.

2 parents e99f7f8 + a0bc7e9 commit 1c3c32fCopy full SHA for 1c3c32f

File tree

+48

-4

lines changed

+48

-4

lines changed

Lines changed: 20 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import functools`
`1`	`2`	`import numbers`
`2`	`3`
`3`	`4`	`import numpy as np`
`@@ -145,10 +146,25 @@ def apply_aspect(self, position=None):`
`145`	`146`	`self._set_lims()`
`146`	`147`	`super().apply_aspect(position)`
`147`	`148`
`148`		`- @_docstring.copy(Axis.set_ticks)`
`149`		`- def set_ticks(self, ticks, labels=None, , minor=False, *kwargs):`
`150`		`- ret = self._axis.set_ticks(ticks, labels, minor=minor, **kwargs)`
`151`		`- self.stale = True`
	`149`	`+ @functools.wraps(_AxesBase.set_xticks)`
	`150`	`+ def set_xticks(self, args, *kwargs):`
	`151`	`+ if self._orientation == "y":`
	`152`	`+ raise TypeError("Cannot set xticks on a secondary y-axis")`
	`153`	`+ ret = super().set_xticks(args, *kwargs)`
	`154`	`+ self._ticks_set = True`
	`155`	`+ return ret`
	`156`	`+`
	`157`	`+ @functools.wraps(_AxesBase.set_yticks)`
	`158`	`+ def set_yticks(self, args, *kwargs):`
	`159`	`+ if self._orientation == "x":`
	`160`	`+ raise TypeError("Cannot set yticks on a secondary x-axis")`
	`161`	`+ ret = super().set_yticks(args, *kwargs)`
	`162`	`+ self._ticks_set = True`
	`163`	`+ return ret`
	`164`	`+`
	`165`	`+ @functools.wraps(Axis.set_ticks)`
	`166`	`+ def set_ticks(self, args, *kwargs):`
	`167`	`+ ret = self._axis.set_ticks(args, *kwargs)`
`152`	`168`	`self._ticks_set = True`
`153`	`169`	`return ret`
`154`	`170`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,22 @@ class SecondaryAxis(_AxesBase):`
`29`	`29`	`location: Literal["top", "bottom", "right", "left"] \| float,`
`30`	`30`	`transform: Transform \| None = ...`
`31`	`31`	`) -> None: ...`
	`32`	`+ def set_xticks(`
	`33`	`+ self,`
	`34`	`+ ticks: ArrayLike,`
	`35`	`+ labels: Iterable[str] \| None = ...,`
	`36`	`+ *,`
	`37`	`+ minor: bool = ...,`
	`38`	`+ **kwargs`
	`39`	`+ ) -> list[Tick]: ...`
	`40`	`+ def set_yticks(`
	`41`	`+ self,`
	`42`	`+ ticks: ArrayLike,`
	`43`	`+ labels: Iterable[str] \| None = ...,`
	`44`	`+ *,`
	`45`	`+ minor: bool = ...,`
	`46`	`+ **kwargs`
	`47`	`+ ) -> list[Tick]: ...`
`32`	`48`	`def set_ticks(`
`33`	`49`	`self,`
`34`	`50`	`ticks: ArrayLike,`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8193,6 +8193,18 @@ def test_secondary_formatter():`
`8193`	`8193`	`secax.xaxis.get_major_formatter(), mticker.ScalarFormatter)`
`8194`	`8194`
`8195`	`8195`
	`8196`	`+def test_secondary_init_xticks():`
	`8197`	`+ fig, ax = plt.subplots()`
	`8198`	`+ secax = ax.secondary_xaxis(1, xticks=[0, 1])`
	`8199`	`+ assert isinstance(secax.xaxis.get_major_locator(), mticker.FixedLocator)`
	`8200`	`+ with pytest.raises(TypeError):`
	`8201`	`+ secax.set_yticks([0, 1])`
	`8202`	`+ secax = ax.secondary_yaxis(1, yticks=[0, 1])`
	`8203`	`+ assert isinstance(secax.yaxis.get_major_locator(), mticker.FixedLocator)`
	`8204`	`+ with pytest.raises(TypeError):`
	`8205`	`+ secax.set_xticks([0, 1])`
	`8206`	`+`
	`8207`	`+`
`8196`	`8208`	`def test_secondary_repr():`
`8197`	`8209`	`fig, ax = plt.subplots()`
`8198`	`8210`	`secax = ax.secondary_xaxis("top")`

Comments

(0)