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

Commit5d25792

committed

Let Formatters format all ticks at once.

This is useful especially when labels are interdependent (e.g.ConciseDateFormatter, but also LogFormatter which currently relies onset_locs, etc.).Because `set_major_formatter`/`set_minor_formatter` (somewhat unusually)enforces that its argument is a Formatter subclass, even third-partyformatters will inherit from the base class and have this methoddefined.

1 parent4cab2ec commit5d25792Copy full SHA for 5d25792

File tree

4 files changed

+22

-28

lines changed

lib
- matplotlib
- mpl_toolkits/axisartist
  - axislines.py

4 files changed

+22

-28

lines changed

`‎lib/matplotlib/axis.py`

Lines changed: 12 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -940,24 +940,18 @@ def iter_ticks(self):`
`940`	`940`	`"""`
`941`	`941`	`Iterate through all of the major and minor ticks.`
`942`	`942`	`"""`
`943`		`-majorLocs=self.major.locator()`
`944`		`-majorTicks=self.get_major_ticks(len(majorLocs))`
`945`		`-self.major.formatter.set_locs(majorLocs)`
`946`		`-majorLabels= [self.major.formatter(val,i)`
`947`		`-fori,valinenumerate(majorLocs)]`
`948`		`-`
`949`		`-minorLocs=self.minor.locator()`
`950`		`-minorTicks=self.get_minor_ticks(len(minorLocs))`
`951`		`-self.minor.formatter.set_locs(minorLocs)`
`952`		`-minorLabels= [self.minor.formatter(val,i)`
`953`		`-fori,valinenumerate(minorLocs)]`
`954`		`-`
`955`		`-major_minor= [`
`956`		`- (majorTicks,majorLocs,majorLabels),`
`957`		`- (minorTicks,minorLocs,minorLabels)]`
`958`		`-`
`959`		`-forgroupinmajor_minor:`
`960`		`-yieldfromzip(*group)`
	`943`	`+major_locs=self.major.locator()`
	`944`	`+major_ticks=self.get_major_ticks(len(major_locs))`
	`945`	`+self.major.formatter.set_locs(major_locs)`
	`946`	`+major_labels=self.major.formatter.format_ticks(major_locs)`
	`947`	`+`
	`948`	`+minor_locs=self.minor.locator()`
	`949`	`+minor_ticks=self.get_minor_ticks(len(minor_locs))`
	`950`	`+self.minor.formatter.set_locs(minor_locs)`
	`951`	`+minor_labels=self.minor.formatter.format_ticks(minor_locs)`
	`952`	`+`
	`953`	`+yieldfromzip(major_ticks,major_locs,major_labels)`
	`954`	`+yieldfromzip(minor_ticks,minor_locs,minor_labels)`
`961`	`955`
`962`	`956`	`defget_ticklabel_extents(self,renderer):`
`963`	`957`	`"""`

`‎lib/matplotlib/colorbar.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ def _ticker(self, locator, formatter):`
`765`	`765`	`self._manual_tick_data_values=b`
`766`	`766`	`ticks=self._locate(b)`
`767`	`767`	`formatter.set_locs(b)`
`768`		`-ticklabels=[formatter(t,i)fori,tinenumerate(b)]`
	`768`	`+ticklabels=formatter.format_ticks(b)`
`769`	`769`	`offset_string=formatter.get_offset()`
`770`	`770`	`returnticks,ticklabels,offset_string`
`771`	`771`

`‎lib/matplotlib/ticker.py`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,10 @@ def __call__(self, x, pos=None):`
`253`	`253`	`"""`
`254`	`254`	`raiseNotImplementedError('Derived must override')`
`255`	`255`
	`256`	`+defformat_ticks(self,values):`
	`257`	`+"""Return the tick labels for all the ticks at once."""`
	`258`	`+return [self(value,i)fori,valueinenumerate(values)]`
	`259`	`+`
`256`	`260`	`defformat_data(self,value):`
`257`	`261`	`"""`
`258`	`262`	`Returns the full string representation of the value with the`
`@@ -291,7 +295,7 @@ def fix_minus(self, s):`
`291`	`295`	`returns`
`292`	`296`
`293`	`297`	`def_set_locator(self,locator):`
`294`		`-"""Subclasses may want to override this to set a locator."""`
	`298`	`+"""Subclasses may want to override this to set a locator."""`
`295`	`299`	`pass`
`296`	`300`
`297`	`301`

`‎lib/mpl_toolkits/axisartist/axislines.py`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,14 +226,12 @@ def get_tick_iterators(self, axes):`
`226`	`226`	`major=self.axis.major`
`227`	`227`	`majorLocs=major.locator()`
`228`	`228`	`major.formatter.set_locs(majorLocs)`
`229`		`-majorLabels= [major.formatter(val,i)`
`230`		`-fori,valinenumerate(majorLocs)]`
	`229`	`+majorLabels=major.formatter.format_ticks(majorLocs)`
`231`	`230`
`232`	`231`	`minor=self.axis.minor`
`233`	`232`	`minorLocs=minor.locator()`
`234`	`233`	`minor.formatter.set_locs(minorLocs)`
`235`		`-minorLabels= [minor.formatter(val,i)`
`236`		`-fori,valinenumerate(minorLocs)]`
	`234`	`+minorLabels=minor.formatter.format_ticks(minorLocs)`
`237`	`235`
`238`	`236`	`trans_tick=self.get_tick_transform(axes)`
`239`	`237`
`@@ -323,14 +321,12 @@ def get_tick_iterators(self, axes):`
`323`	`321`	`major=self.axis.major`
`324`	`322`	`majorLocs=major.locator()`
`325`	`323`	`major.formatter.set_locs(majorLocs)`
`326`		`-majorLabels= [major.formatter(val,i)`
`327`		`-fori,valinenumerate(majorLocs)]`
	`324`	`+majorLabels=major.formatter.format_ticks(majorLocs)`
`328`	`325`
`329`	`326`	`minor=self.axis.minor`
`330`	`327`	`minorLocs=minor.locator()`
`331`	`328`	`minor.formatter.set_locs(minorLocs)`
`332`		`-minorLabels= [minor.formatter(val,i)`
`333`		`-fori,valinenumerate(minorLocs)]`
	`329`	`+minorLabels=minor.formatter.format_ticks(minorLocs)`
`334`	`330`
`335`	`331`	`tr2ax=axes.transData+axes.transAxes.inverted()`
`336`	`332`

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!

Commit5d25792

File tree

4 files changed

4 files changed

`‎lib/matplotlib/axis.py`

`‎lib/matplotlib/colorbar.py`

`‎lib/matplotlib/ticker.py`

`‎lib/mpl_toolkits/axisartist/axislines.py`

0 commit comments