NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commit9cf03c0

authored

Merge pull request#22850 from timhoffm/get_tick-simplification

2 parents4e20f15 +120328f commit9cf03c0Copy full SHA for 9cf03c0

File tree

2 files changed

+13

-29

lines changed

lib/matplotlib
- axis.py
- projections
  - polar.py

2 files changed

+13

-29

lines changed

`‎lib/matplotlib/axis.py‎`

Lines changed: 11 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,6 +635,9 @@ class Axis(martist.Artist):`
`635`	`635`	`The minor ticks.`
`636`	`636`	`"""`
`637`	`637`	`OFFSETTEXTPAD=3`
	`638`	`+# The class used in _get_tick() to create tick instances. Must either be`
	`639`	`+# overwritten in subclasses, or subclasses must reimplement _get_tick().`
	`640`	`+_tick_class=None`
`638`	`641`
`639`	`642`	`def__str__(self):`
`640`	`643`	`return"{}({},{})".format(`
`@@ -1437,7 +1440,12 @@ def get_ticks_direction(self, minor=False):`
`1437`	`1440`
`1438`	`1441`	`def_get_tick(self,major):`
`1439`	`1442`	`"""Return the default tick instance."""`
`1440`		`-raiseNotImplementedError('derived must override')`
	`1443`	`+ifself._tick_classisNone:`
	`1444`	`+raiseNotImplementedError(`
	`1445`	`+f"The Axis subclass{self.__class__.__name__} must define "`
	`1446`	`+"_tick_class or reimplement _get_tick()")`
	`1447`	`+tick_kw=self._major_tick_kwifmajorelseself._minor_tick_kw`
	`1448`	`+returnself._tick_class(self.axes,0,major=major,**tick_kw)`
`1441`	`1449`
`1442`	`1450`	`def_get_tick_label_size(self,axis_name):`
`1443`	`1451`	`"""`
`@@ -2133,6 +2141,7 @@ def setter(self, vmin, vmax, ignore=False):`
`2133`	`2141`	`classXAxis(Axis):`
`2134`	`2142`	`__name__='xaxis'`
`2135`	`2143`	`axis_name='x'#: Read-only name identifying the axis.`
	`2144`	`+_tick_class=XTick`
`2136`	`2145`
`2137`	`2146`	`def__init__(self,args,*kwargs):`
`2138`	`2147`	`super().__init__(args,*kwargs)`
`@@ -2173,13 +2182,6 @@ def contains(self, mouseevent):`
`2173`	`2182`	`t<y<t+self.pickradius)`
`2174`	`2183`	`returninaxis, {}`
`2175`	`2184`
`2176`		`-def_get_tick(self,major):`
`2177`		`-ifmajor:`
`2178`		`-tick_kw=self._major_tick_kw`
`2179`		`-else:`
`2180`		`-tick_kw=self._minor_tick_kw`
`2181`		`-returnXTick(self.axes,0,major=major,**tick_kw)`
`2182`		`-`
`2183`	`2185`	`defset_label_position(self,position):`
`2184`	`2186`	`"""`
`2185`	`2187`	`Set the label position (top or bottom)`
`@@ -2389,6 +2391,7 @@ def get_tick_space(self):`
`2389`	`2391`	`classYAxis(Axis):`
`2390`	`2392`	`__name__='yaxis'`
`2391`	`2393`	`axis_name='y'#: Read-only name identifying the axis.`
	`2394`	`+_tick_class=YTick`
`2392`	`2395`
`2393`	`2396`	`def__init__(self,args,*kwargs):`
`2394`	`2397`	`super().__init__(args,*kwargs)`
`@@ -2431,13 +2434,6 @@ def contains(self, mouseevent):`
`2431`	`2434`	`r<x<r+self.pickradius)`
`2432`	`2435`	`returninaxis, {}`
`2433`	`2436`
`2434`		`-def_get_tick(self,major):`
`2435`		`-ifmajor:`
`2436`		`-tick_kw=self._major_tick_kw`
`2437`		`-else:`
`2438`		`-tick_kw=self._minor_tick_kw`
`2439`		`-returnYTick(self.axes,0,major=major,**tick_kw)`
`2440`		`-`
`2441`	`2437`	`defset_label_position(self,position):`
`2442`	`2438`	`"""`
`2443`	`2439`	`Set the label position (left or right)`

`‎lib/matplotlib/projections/polar.py‎`

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -358,13 +358,7 @@ class ThetaAxis(maxis.XAxis):`
`358`	`358`	`"""`
`359`	`359`	`__name__='thetaaxis'`
`360`	`360`	`axis_name='theta'#: Read-only name identifying the axis.`
`361`		`-`
`362`		`-def_get_tick(self,major):`
`363`		`-ifmajor:`
`364`		`-tick_kw=self._major_tick_kw`
`365`		`-else:`
`366`		`-tick_kw=self._minor_tick_kw`
`367`		`-returnThetaTick(self.axes,0,major=major,**tick_kw)`
	`361`	`+_tick_class=ThetaTick`
`368`	`362`
`369`	`363`	`def_wrap_locator_formatter(self):`
`370`	`364`	`self.set_major_locator(ThetaLocator(self.get_major_locator()))`
`@@ -653,18 +647,12 @@ class RadialAxis(maxis.YAxis):`
`653`	`647`	`"""`
`654`	`648`	`__name__='radialaxis'`
`655`	`649`	`axis_name='radius'#: Read-only name identifying the axis.`
	`650`	`+_tick_class=RadialTick`
`656`	`651`
`657`	`652`	`def__init__(self,args,*kwargs):`
`658`	`653`	`super().__init__(args,*kwargs)`
`659`	`654`	`self.sticky_edges.y.append(0)`
`660`	`655`
`661`		`-def_get_tick(self,major):`
`662`		`-ifmajor:`
`663`		`-tick_kw=self._major_tick_kw`
`664`		`-else:`
`665`		`-tick_kw=self._minor_tick_kw`
`666`		`-returnRadialTick(self.axes,0,major=major,**tick_kw)`
`667`		`-`
`668`	`656`	`def_wrap_locator_formatter(self):`
`669`	`657`	`self.set_major_locator(RadialLocator(self.get_major_locator(),`
`670`	`658`	`self.axes))`

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!

Commit9cf03c0

File tree

2 files changed

2 files changed

`‎lib/matplotlib/axis.py‎`

`‎lib/matplotlib/projections/polar.py‎`

0 commit comments