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

Commit38da016

authored

Merge pull request#15606 from anntzer/locator-refresh

Simplify OldAutoLocator and AutoDateLocator.

2 parents3e6c5d0 +1f53c6b commit38da016Copy full SHA for 38da016

File tree

2 files changed

+14

-32

lines changed

lib/matplotlib
- dates.py
- ticker.py

2 files changed

+14

-32

lines changed

`‎lib/matplotlib/dates.py`

Lines changed: 5 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1220,7 +1220,6 @@ def __init__(self, tz=None, minticks=5, maxticks=None,`
`1220`	`1220`	`at 6 hour intervals.`
`1221`	`1221`	`"""`
`1222`	`1222`	`DateLocator.__init__(self,tz)`
`1223`		`-self._locator=YearLocator(tz=tz)`
`1224`	`1223`	`self._freq=YEARLY`
`1225`	`1224`	`self._freqs= [YEARLY,MONTHLY,DAILY,HOURLY,MINUTELY,`
`1226`	`1225`	`SECONDLY,MICROSECONDLY]`
`@@ -1258,9 +1257,10 @@ def __init__(self, tz=None, minticks=5, maxticks=None,`
`1258`	`1257`	`range(0,24),range(0,60),range(0,60),None]`
`1259`	`1258`
`1260`	`1259`	`def__call__(self):`
`1261`		`-"""Return the locations of the ticks."""`
`1262`		`-self.refresh()`
`1263`		`-returnself._locator()`
	`1260`	`+# docstring inherited`
	`1261`	`+dmin,dmax=self.viewlim_to_dt()`
	`1262`	`+locator=self.get_locator(dmin,dmax)`
	`1263`	`+returnlocator()`
`1264`	`1264`
`1265`	`1265`	`deftick_values(self,vmin,vmax):`
`1266`	`1266`	`returnself.get_locator(vmin,vmax).tick_values(vmin,vmax)`
`@@ -1279,15 +1279,6 @@ def nonsingular(self, vmin, vmax):`
`1279`	`1279`	`vmax=vmax+DAYS_PER_YEAR*2`
`1280`	`1280`	`returnvmin,vmax`
`1281`	`1281`
`1282`		`-defset_axis(self,axis):`
`1283`		`-DateLocator.set_axis(self,axis)`
`1284`		`-self._locator.set_axis(axis)`
`1285`		`-`
`1286`		`-defrefresh(self):`
`1287`		`-# docstring inherited`
`1288`		`-dmin,dmax=self.viewlim_to_dt()`
`1289`		`-self._locator=self.get_locator(dmin,dmax)`
`1290`		`-`
`1291`	`1282`	`def_get_unit(self):`
`1292`	`1283`	`ifself._freqin [MICROSECONDLY]:`
`1293`	`1284`	`return1./MUSECONDS_PER_DAY`
`@@ -1298,8 +1289,7 @@ def _get_unit(self):`
`1298`	`1289`	`defautoscale(self):`
`1299`	`1290`	`"""Try to choose the view limits intelligently."""`
`1300`	`1291`	`dmin,dmax=self.datalim_to_dt()`
`1301`		`-self._locator=self.get_locator(dmin,dmax)`
`1302`		`-returnself._locator.autoscale()`
	`1292`	`+returnself.get_locator(dmin,dmax).autoscale()`
`1303`	`1293`
`1304`	`1294`	`defget_locator(self,dmin,dmax):`
`1305`	`1295`	`"""Pick the best locator based on a distance."""`

`‎lib/matplotlib/ticker.py`

Lines changed: 9 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -2816,33 +2816,25 @@ class OldAutoLocator(Locator):`
`2816`	`2816`	`"""`
`2817`	`2817`	`On autoscale this class picks the best MultipleLocator to set the`
`2818`	`2818`	`view limits and the tick locs.`
`2819`		`-`
`2820`	`2819`	`"""`
`2821`		`-def__init__(self):`
`2822`		`-self._locator=LinearLocator()`
`2823`	`2820`
`2824`	`2821`	`def__call__(self):`
`2825`		`-"""Return the locations of the ticks."""`
`2826`		`-self.refresh()`
`2827`		`-returnself.raise_if_exceeds(self._locator())`
`2828`		`-`
`2829`		`-deftick_values(self,vmin,vmax):`
`2830`		`-raiseNotImplementedError('Cannot get tick locations for a '`
`2831`		`-'%s type.'%type(self))`
`2832`		`-`
`2833`		`-defrefresh(self):`
`2834`	`2822`	`# docstring inherited`
`2835`	`2823`	`vmin,vmax=self.axis.get_view_interval()`
`2836`	`2824`	`vmin,vmax=mtransforms.nonsingular(vmin,vmax,expander=0.05)`
`2837`	`2825`	`d=abs(vmax-vmin)`
`2838`		`-self._locator=self.get_locator(d)`
	`2826`	`+locator=self.get_locator(d)`
	`2827`	`+returnself.raise_if_exceeds(locator())`
`2839`	`2828`
`2840`		`-defview_limits(self,vmin,vmax):`
`2841`		`-"""Try to choose the view limits intelligently."""`
	`2829`	`+deftick_values(self,vmin,vmax):`
	`2830`	`+raiseNotImplementedError('Cannot get tick locations for a '`
	`2831`	`+'%s type.'%type(self))`
`2842`	`2832`
	`2833`	`+defview_limits(self,vmin,vmax):`
	`2834`	`+# docstring inherited`
`2843`	`2835`	`d=abs(vmax-vmin)`
`2844`		`-self._locator=self.get_locator(d)`
`2845`		`-returnself._locator.view_limits(vmin,vmax)`
	`2836`	`+locator=self.get_locator(d)`
	`2837`	`+returnlocator.view_limits(vmin,vmax)`
`2846`	`2838`
`2847`	`2839`	`defget_locator(self,d):`
`2848`	`2840`	`"""Pick the best locator based on a distance d."""`

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!

Commit38da016

File tree

2 files changed

2 files changed

`‎lib/matplotlib/dates.py`

`‎lib/matplotlib/ticker.py`

0 commit comments