Commit71dd3ae

authored

Merge pull request#13126 from jklymak/fix-minor-log

FIX: minor log ticks overwrite

2 parents910f9fd +1f70d7a commit71dd3aeCopy full SHA for 71dd3ae

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,10 @@ def test_switch_to_autolocator(self):`
`183`	`183`	`loc=mticker.LogLocator(subs="all")`
`184`	`184`	`assert_array_equal(loc.tick_values(0.45,0.55),`
`185`	`185`	`[0.44,0.46,0.48,0.5,0.52,0.54,0.56])`
	`186`	`+# check that we skip 1.0, and 10, because this is a minor locator`
	`187`	`+loc=mticker.LogLocator(subs=np.arange(2,10))`
	`188`	`+assert1.0notinloc.tick_values(0.9,20.)`
	`189`	`+assert10.0notinloc.tick_values(0.9,20.)`
`186`	`190`
`187`	`191`	`deftest_set_params(self):`
`188`	`192`	`"""`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2093,9 +2093,7 @@ def is_decade(x, base=10):`
`2093`	`2093`
`2094`	`2094`
`2095`	`2095`	`defis_close_to_int(x):`
`2096`		`-ifnotnp.isfinite(x):`
`2097`		`-returnFalse`
`2098`		`-returnabs(x-round(x))<1e-10`
	`2096`	`+returnabs(x-np.round(x))<1e-10`
`2099`	`2097`
`2100`	`2098`
`2101`	`2099`	`classLogLocator(Locator):`
`@@ -2256,7 +2254,12 @@ def tick_values(self, vmin, vmax):`
`2256`	`2254`	`# If we're a minor locator *that expects at least two ticks per`
`2257`	`2255`	`# decade* and the major locator stride is 1 and there's no more`
`2258`	`2256`	`# than one minor tick, switch to AutoLocator.`
`2259`		`-returnAutoLocator().tick_values(vmin,vmax)`
	`2257`	`+ticklocs=AutoLocator().tick_values(vmin,vmax)`
	`2258`	`+# Don't overstrike the major labels. Assumes major locs are`
	`2259`	`+# at b = self._base`
	`2260`	`+ticklocs=ticklocs[`
	`2261`	`+~is_close_to_int(np.log(ticklocs)/np.log(b))]`
	`2262`	`+returnticklocs`
`2260`	`2263`	`returnself.raise_if_exceeds(ticklocs)`
`2261`	`2264`
`2262`	`2265`	`defview_limits(self,vmin,vmax):`

Comments

(0)