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

Commit58e3432

committed

FIX: try hard to ensure at least 2 ticks with 'auto'

This requires falling back on a larger set of options for intervalsbetween ticks.Closes#5784.

1 parent46d6e6c commit58e3432Copy full SHA for 58e3432

File tree

1 file changed

+35

-9

lines changed

lib/matplotlib
- ticker.py

1 file changed

+35

-9

lines changed

`‎lib/matplotlib/ticker.py`

Lines changed: 35 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1619,6 +1619,8 @@ def __init__(self, args, *kwargs):`
`1619`	`1619`	`will be removed. If prune==None, no ticks will be removed.`
`1620`	`1620`
`1621`	`1621`	`"""`
	`1622`	`+self._fine_steps= [1,1.5,2,2.5,3,4,5,6,8,10]`
	`1623`	`+self._fine_int_steps= [1,2,3,4,5,6,8,10]`
`1622`	`1624`	`ifargs:`
`1623`	`1625`	`kwargs['nbins']=args[0]`
`1624`	`1626`	`iflen(args)>1:`
`@@ -1631,8 +1633,11 @@ def set_params(self, **kwargs):`
`1631`	`1633`	`"""Set parameters within this locator."""`
`1632`	`1634`	`if'nbins'inkwargs:`
`1633`	`1635`	`self._nbins=kwargs['nbins']`
`1634`		`-ifself._nbins!='auto':`
`1635`		`-self._nbins=int(self._nbins)`
	`1636`	`+ifself._nbins!='auto':`
	`1637`	`+self._nbins=int(self._nbins)`
	`1638`	`+self._steps2=None`
	`1639`	`+else:`
	`1640`	`+self._steps2=self._fine_steps`
`1636`	`1641`	`if'trim'inkwargs:`
`1637`	`1642`	`warnings.warn(`
`1638`	`1643`	`"The 'trim' keyword has no effect since version 2.0.",`
`@@ -1650,7 +1655,8 @@ def set_params(self, **kwargs):`
`1650`	`1655`	`if'steps'inkwargs:`
`1651`	`1656`	`steps=kwargs['steps']`
`1652`	`1657`	`ifstepsisNone:`
`1653`		`-self._steps= [1,1.5,2,2.5,3,4,5,6,8,10]`
	`1658`	`+self._steps=self._fine_steps`
	`1659`	`+self._steps2=None`
`1654`	`1660`	`else:`
`1655`	`1661`	`ifint(steps[-1])!=10:`
`1656`	`1662`	`steps=list(steps)`
`@@ -1660,11 +1666,19 @@ def set_params(self, **kwargs):`
`1660`	`1666`	`self._integer=kwargs['integer']`
`1661`	`1667`	`ifself._integer:`
`1662`	`1668`	`self._steps= [nforninself._stepsif_divmod(n,1)[1]<0.001]`
	`1669`	`+ifself._steps2isnotNone:`
	`1670`	`+self._steps2=self._fine_int_steps`
`1663`	`1671`
`1664`		`-def_raw_ticks(self,vmin,vmax):`
	`1672`	`+def_raw_ticks(self,vmin,vmax,steps=None):`
	`1673`	`+ifstepsisNone:`
	`1674`	`+steps=self._steps`
`1665`	`1675`	`nbins=self._nbins`
`1666`	`1676`	`ifnbins=='auto':`
`1667`		`-nbins=max(min(self.axis.get_tick_space(),9),1)`
	`1677`	`+if (rcParams['axes.autolimit_mode']=='round_numbers'`
	`1678`	`+andself._pruneisNone):`
	`1679`	`+nbins=max(min(self.axis.get_tick_space(),9),2)`
	`1680`	`+else:`
	`1681`	`+nbins=max(min(self.axis.get_tick_space(),9),4)`
`1668`	`1682`	`scale,offset=scale_range(vmin,vmax,nbins)`
`1669`	`1683`	`ifself._integer:`
`1670`	`1684`	`scale=max(1,scale)`
`@@ -1675,20 +1689,24 @@ def _raw_ticks(self, vmin, vmax):`
`1675`	`1689`	`best_vmax=vmax`
`1676`	`1690`	`best_vmin=vmin`
`1677`	`1691`
`1678`		`-forstepinself._steps:`
	`1692`	`+forstepinsteps:`
`1679`	`1693`	`ifstep<scaled_raw_step:`
`1680`	`1694`	`continue`
`1681`	`1695`	`step*=scale`
`1682`		`-best_vmin=vmin//step*step`
	`1696`	`+best_vmin=(vmin//step)*step`
`1683`	`1697`	`best_vmax=best_vmin+step*nbins`
`1684`	`1698`	`ifbest_vmax>=vmax:`
`1685`	`1699`	`break`
`1686`	`1700`
`1687`	`1701`	`# More than nbins may be required, e.g. vmin, vmax = -4.1, 4.1 gives`
`1688`	`1702`	`# nbins=9 but 10 bins are actually required after rounding. So we just`
`1689`	`1703`	`# create the bins that span the range we need instead.`
`1690`		`-low=round(Base(step).le(vmin-best_vmin)/step)`
`1691`		`-high=round(Base(step).ge(vmax-best_vmin)/step)`
	`1704`	`+ifrcParams['axes.autolimit_mode']=='round_numbers':`
	`1705`	`+low=round(Base(step).le(vmin-best_vmin)/step)`
	`1706`	`+high=round(Base(step).ge(vmax-best_vmin)/step)`
	`1707`	`+else:`
	`1708`	`+low=round(Base(step).ge(vmin-best_vmin)/step)`
	`1709`	`+high=round(Base(step).le(vmax-best_vmin)/step)`
`1692`	`1710`	`returnnp.arange(low,high+1)*step+best_vmin+offset`
`1693`	`1711`
`1694`	`1712`	`@cbook.deprecated("2.0")`
`@@ -1703,7 +1721,15 @@ def tick_values(self, vmin, vmax):`
`1703`	`1721`	`vmin,vmax=mtransforms.nonsingular(`
`1704`	`1722`	`vmin,vmax,expander=1e-13,tiny=1e-14)`
`1705`	`1723`	`locs=self._raw_ticks(vmin,vmax)`
	`1724`	`+locs= [locforlocinlocsifvmax>=loc>=vmin]`
	`1725`	`+nlocs=len(locs)`
`1706`	`1726`	`prune=self._prune`
	`1727`	`+ifprunein ('lower','upper'):`
	`1728`	`+nlocs-=1`
	`1729`	`+elifprune=='both':`
	`1730`	`+nlocs-=2`
	`1731`	`+ifself._steps2andnlocs<2:`
	`1732`	`+locs=self._raw_ticks(vmin,vmax,self._steps2)`
`1707`	`1733`	`ifprune=='lower':`
`1708`	`1734`	`locs=locs[1:]`
`1709`	`1735`	`elifprune=='upper':`

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!

Commit58e3432

File tree

1 file changed

1 file changed

`‎lib/matplotlib/ticker.py`

0 commit comments