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

Commitc5b9ce4

committed

Avoid 1-tick or 0-tick log-scaled axis.

... by switching to AutoLocator when the minor LogLocator would produceno more than one tick.

1 parentf8b425d commitc5b9ce4Copy full SHA for c5b9ce4

File tree

2 files changed

+27

-14

lines changed

lib/matplotlib
- tests
  - test_ticker.py
- ticker.py

2 files changed

+27

-14

lines changed

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

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`importwarnings`
`2`	`2`
`3`	`3`	`importnumpyasnp`
`4`		`-fromnumpy.testingimportassert_almost_equal`
	`4`	`+fromnumpy.testingimportassert_almost_equal,assert_array_equal`
`5`	`5`	`importpytest`
`6`	`6`
`7`	`7`	`importmatplotlib`
`@@ -179,6 +179,11 @@ def test_basic(self):`
`179`	`179`	`test_value=np.array([0.5,1.,2.,4.,8.,16.,32.,64.,128.,256.])`
`180`	`180`	`assert_almost_equal(loc.tick_values(1,100),test_value)`
`181`	`181`
	`182`	`+deftest_switch_to_autolocator(self):`
	`183`	`+loc=mticker.LogLocator(subs="all")`
	`184`	`+assert_array_equal(loc.tick_values(0.45,0.55),`
	`185`	`+ [0.44,0.46,0.48,0.5,0.52,0.54,0.56])`
	`186`	`+`
`182`	`187`	`deftest_set_params(self):`
`183`	`188`	`"""`
`184`	`189`	`Create log locator with default value, base=10.0, subs=[1.0],`

`‎lib/matplotlib/ticker.py`

Lines changed: 21 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -2165,13 +2165,13 @@ def tick_values(self, vmin, vmax):`
`2165`	`2165`	`"log-scaled.")`
`2166`	`2166`
`2167`	`2167`	`_log.debug('vmin %s vmax %s',vmin,vmax)`
`2168`		`-vmin=math.log(vmin)/math.log(b)`
`2169`		`-vmax=math.log(vmax)/math.log(b)`
`2170`	`2168`
`2171`	`2169`	`ifvmax<vmin:`
`2172`	`2170`	`vmin,vmax=vmax,vmin`
	`2171`	`+log_vmin=math.log(vmin)/math.log(b)`
	`2172`	`+log_vmax=math.log(vmax)/math.log(b)`
`2173`	`2173`
`2174`		`-numdec=math.floor(vmax)-math.ceil(vmin)`
	`2174`	`+numdec=math.floor(log_vmax)-math.ceil(log_vmin)`
`2175`	`2175`
`2176`	`2176`	`ifisinstance(self._subs,str):`
`2177`	`2177`	`_first=2.0ifself._subs=='auto'else1.0`
`@@ -2195,32 +2195,40 @@ def tick_values(self, vmin, vmax):`
`2195`	`2195`	`whilenumdec//stride+1>numticks:`
`2196`	`2196`	`stride+=1`
`2197`	`2197`
`2198`		`-# Does subs include anything other than 1?`
	`2198`	`+# Does subs include anything other than 1? Essentially a hack to know`
	`2199`	`+# whether we're a major or a minor locator.`
`2199`	`2200`	`have_subs=len(subs)>1or (len(subs)==1andsubs[0]!=1.0)`
`2200`	`2201`
`2201`		`-decades=np.arange(math.floor(vmin)-stride,`
`2202`		`-math.ceil(vmax)+2*stride,stride)`
	`2202`	`+decades=np.arange(math.floor(log_vmin)-stride,`
	`2203`	`+math.ceil(log_vmax)+2*stride,stride)`
`2203`	`2204`
`2204`	`2205`	`ifhasattr(self,'_transform'):`
`2205`	`2206`	`ticklocs=self._transform.inverted().transform(decades)`
`2206`	`2207`	`ifhave_subs:`
`2207`	`2208`	`ifstride==1:`
`2208`	`2209`	`ticklocs=np.ravel(np.outer(subs,ticklocs))`
`2209`	`2210`	`else:`
`2210`		`-# no ticklocs if we have more than one decade`
`2211`		`-# between major ticks.`
`2212`		`-ticklocs= []`
	`2211`	`+# No ticklocs if we have >1 decade between major ticks.`
	`2212`	`+ticklocs=np.array([])`
`2213`	`2213`	`else:`
`2214`	`2214`	`ifhave_subs:`
`2215`		`-ticklocs= []`
`2216`	`2215`	`ifstride==1:`
`2217`		`-fordecadeStartinb**decades:`
`2218`		`-ticklocs.extend(subs*decadeStart)`
	`2216`	`+ticklocs=np.concatenate(`
	`2217`	`+ [subsdecade_startfordecade_startinb*decades])`
	`2218`	`+else:`
	`2219`	`+ticklocs=np.array([])`
`2219`	`2220`	`else:`
`2220`	`2221`	`ticklocs=b**decades`
`2221`	`2222`
`2222`	`2223`	`_log.debug('ticklocs %r',ticklocs)`
`2223`		`-returnself.raise_if_exceeds(np.asarray(ticklocs))`
	`2224`	`+if (len(subs)>1`
	`2225`	`+andstride==1`
	`2226`	`+and ((vmin<=ticklocs)& (ticklocs<=vmax)).sum()<=1):`
	`2227`	`+# If we're a minor locator *that expects at least two ticks per`
	`2228`	`+# decade* and the major locator stride is 1 and there's no more`
	`2229`	`+# than one minor tick, switch to AutoLocator.`
	`2230`	`+returnAutoLocator().tick_values(vmin,vmax)`
	`2231`	`+returnself.raise_if_exceeds(ticklocs)`
`2224`	`2232`
`2225`	`2233`	`defview_limits(self,vmin,vmax):`
`2226`	`2234`	`'Try to choose the view limits intelligently'`

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!

Commitc5b9ce4

File tree

2 files changed

2 files changed

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

`‎lib/matplotlib/ticker.py`

0 commit comments