Thanks to visit codestin.com
Credit goes to github.com

Skip to content

New Formatter API #5804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anntzer wants to merge 3 commits into from
Closed

New Formatter API #5804

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
387a34e
New Formatter API.
anntzer Jan 5, 2016
277574f
Restore some backcompat.
anntzer Jan 27, 2016
288bcc1
Clarify a few tests.
anntzer Jan 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore some backcompat.
  • Loading branch information
@anntzer
anntzer committed Jan 28, 2016
commit 277574f7f2689c6585d57882a46a1b8283101942
2 changes: 1 addition & 1 deletion examples/pylab_examples/demo_ribbon_box.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def draw(self, renderer, *args, **kwargs):
]
heights = np.random.random(years.shape) * 7000 + 3000

fmt = ScalarFormatter(use_offset=False)
fmt = ScalarFormatter(useOffset=False)
ax.xaxis.set_major_formatter(fmt)

for year, h, bc in zip(years, heights, box_colors):
Expand Down
32 changes: 16 additions & 16 deletions examples/pylab_examples/newscalarformatter_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@
verticalalignment='top')

ax1.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
ax1.xaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax1.yaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax1.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
ax1.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))

ax2.plot(x * 1e5, x * 1e-4)
ax2.xaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax2.yaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax2.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
ax2.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))

ax3.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
ax3.xaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax3.yaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax3.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
ax3.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))

ax4.plot(-x * 1e5, -x * 1e-4)
ax4.xaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax4.yaxis.set_major_formatter(ScalarFormatter(use_offset=False))
ax4.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
ax4.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))

# Example 4
x = np.arange(0, 1, .01)
Expand All @@ -56,18 +56,18 @@
verticalalignment='top')

ax1.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
ax1.xaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax1.yaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax1.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
ax1.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))

ax2.plot(x * 1e5, x * 1e-4)
ax2.xaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax2.yaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax2.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
ax2.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))

ax3.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
ax3.xaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax3.yaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax3.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
ax3.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))

ax4.plot(-x * 1e5, -x * 1e-4)
ax4.xaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax4.yaxis.set_major_formatter(ScalarFormatter(use_mathtext=True))
ax4.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
ax4.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))
plt.show()
9 changes: 7 additions & 2 deletions lib/matplotlib/axes/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,9 @@ def __init__(self, fig, rect,
self._hold = rcParams['axes.hold']
self._connected = {} # a dict from events to (id, func)
self.cla()
# funcs used to format x and y - fall back on major formatters
self.fmt_xdata = None
self.fmt_ydata = None

self.set_cursor_props((1, 'k')) # set the cursor properties for axes

Expand Down Expand Up @@ -3265,10 +3268,12 @@ def yaxis_date(self, tz=None):
self.yaxis.axis_date(tz)

def format_xdata(self, x):
return self.xaxis.get_major_formatter().format_for_cursor(x)
return (self.fmt_xdata(x) if self.fmt_xdata is not None
else self.xaxis.get_major_formatter().format_for_cursor(x))

def format_ydata(self, y):
return self.yaxis.get_major_formatter().format_for_cursor(y)
return (self.fmt_ydata(y) if self.fmt_ydata is not None
else self.yaxis.get_major_formatter().format_for_cursor(y))

def format_coord(self, x, y):
"""Return a format string formatting the *x*, *y* coord"""
Expand Down
19 changes: 9 additions & 10 deletions lib/matplotlib/ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,18 +319,14 @@ class ScalarFormatter(Formatter):
axes.formatter.limits rc parameter.
"""

def __init__(self, *args, **kwargs):
# Keyword-only arguments.
use_offset = kwargs.pop("use_offset", None)
use_mathtext = kwargs.pop("use_mathtext", None)
use_locale = kwargs.pop("use_locale", None)
super(ScalarFormatter, self).__init__(*args, **kwargs)
self._use_offset = (use_offset if use_offset is not None
def __init__(self, useOffset=None, useMathText=None, useLocale=None):
super(ScalarFormatter, self).__init__()
self._use_offset = (useOffset if useOffset is not None
else rcParams["axes.formatter.useoffset"])
self._usetex = rcParams["text.usetex"]
self._use_mathtext = (use_mathtext if use_mathtext is not None
self._use_mathtext = (useMathText if useMathText is not None
else rcParams["axes.formatter.use_mathtext"])
self._use_locale = (use_locale if use_locale is not None
self._use_locale = (useLocale if useLocale is not None
else rcParams["axes.formatter.use_locale"])
self._scientific = True
self._powerlimits = rcParams['axes.formatter.limits']
Expand Down Expand Up @@ -393,12 +389,15 @@ def _update(self):

def _set_offset(self):
locs = self.locs
if not len(locs) or not self._use_offset:
if not self._use_offset:
self._offset = 0
return
# Restrict to visible ticks.
vmin, vmax = sorted(self.axis.get_view_interval())
locs = locs[(vmin <= locs) & (locs <= vmax)]
if not len(locs):
self._offset = 0
return
lmin, lmax = locs.min(), locs.max()
# min, max comparing absolute values (we want division to round towards
# zero so we work on absolute values).
Expand Down
3 changes: 2 additions & 1 deletion lib/mpl_toolkits/axisartist/grid_finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ def set_factor(self, f):

class FormatterPrettyPrint(object):
def __init__(self, useMathText=True):
self._fmt = mticker.ScalarFormatter(use_mathtext=useMathText, use_offset=False)
self._fmt = mticker.ScalarFormatter(
useMathText=useMathText, useOffset=False)
self._fmt.set_axis({})
self._ignore_factor = True

Expand Down