Skip to content

Commit 387a34e

Browse files
anntzeranntzer
committed
New Formatter API.
A back-compatibility layer is missing. The LogFormatter and variants classes could use some improvement. Assigment to `Axes.fmt_{x,y}data` has been removed as assignment to `Axes.format_{x,y}data` does exactly the same.
1 parent 2a4863c commit 387a34e

36 files changed

+897
-1057
lines changed

‎doc/users/recipes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ the x locations are formatted the same way the tick labels are, e.g.,
139139
a higher degree of precision, e.g., giving us the exact date out mouse is
140140
hovering over. To fix the first problem, we can use
141141
:func:`matplotlib.figure.Figure.autofmt_xdate` and to fix the second
142-
problem we can use the ``ax.fmt_xdata`` attribute which can be set to
142+
problem we can use the ``ax.format_xdata`` attribute which can be set to
143143
any function that takes a scalar and returns a string. matplotlib has
144144
a number of date formatters built in, so we'll use one of those.
145145

@@ -157,7 +157,7 @@ a number of date formatters built in, so we'll use one of those.
157157
# use a more precise date string for the x axis locations in the
158158
# toolbar
159159
import matplotlib.dates as mdates
160-
ax.fmt_xdata = mdates.DateFormatter('%Y-%m-%d')
160+
ax.format_xdata = mdates.DateFormatter('%Y-%m-%d').format_for_cursor
161161
plt.title('fig.autofmt_xdate fixes the labels')
162162

163163
Now when you hover your mouse over the plotted data, you'll see date

‎examples/api/custom_projection_example.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,12 @@ class DegreeFormatter(Formatter):
291291
"""
292292

293293
def __init__(self, round_to=1.0):
294+
super(HammerAxes.DegreeFormatter, self).__init__()
294295
self._round_to = round_to
295296

296-
def __call__(self, x, pos=None):
297+
def format_for_tick(self, x, pos=None):
297298
degrees = np.round(np.degrees(x) / self._round_to) * self._round_to
298-
# \u00b0 : degree symbol
299-
return "%d\u00b0" % degrees
299+
return "%d\N{DEGREE SIGN}" % degrees
300300

301301
def set_longitude_grid(self, degrees):
302302
"""

‎examples/api/custom_scale_example.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ def set_default_locators_and_formatters(self, axis):
7070
value::
7171
"""
7272
class DegreeFormatter(Formatter):
73-
def __call__(self, x, pos=None):
74-
# \u00b0 : degree symbol
75-
return "%d\u00b0" % (np.degrees(x))
73+
def format_for_tick(self, x, pos=None):
74+
return "%d\N{DEGREE SIGN}" % (np.degrees(x))
7675

7776
axis.set_major_locator(FixedLocator(
7877
np.radians(np.arange(-90, 90, 10))))

‎examples/api/date_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# format the coords message box
5353
def price(x):
5454
return '$%1.2f' % x
55-
ax.format_xdata = mdates.DateFormatter('%Y-%m-%d')
55+
ax.format_xdata = mdates.DateFormatter('%Y-%m-%d').format_for_cursor
5656
ax.format_ydata = price
5757
ax.grid(True)
5858

‎examples/pylab_examples/contour_label_demo.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ def __repr__(self):
8080

8181
CS = plt.contour(X, Y, 100**Z, locator=plt.LogLocator())
8282
fmt = ticker.LogFormatterMathtext()
83-
fmt.create_dummy_axis()
84-
plt.clabel(CS, CS.levels, fmt=fmt)
83+
plt.clabel(CS, CS.levels, fmt=fmt.format_for_tick)
8584
plt.title("$100^Z$")
8685

8786
plt.show()

‎examples/pylab_examples/date_demo1.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
# format the coords message box
4646
def price(x):
4747
return '$%1.2f' % x
48-
ax.fmt_xdata = DateFormatter('%Y-%m-%d')
49-
ax.fmt_ydata = price
48+
ax.format_xdata = DateFormatter('%Y-%m-%d').format_for_cursor
49+
ax.format_ydata = price
5050
ax.grid(True)
5151

5252
fig.autofmt_xdate()

‎examples/pylab_examples/date_demo_convert.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
ax.xaxis.set_minor_locator(HourLocator(arange(0, 25, 6)))
2828
ax.xaxis.set_major_formatter(DateFormatter('%Y-%m-%d'))
2929

30-
ax.fmt_xdata = DateFormatter('%Y-%m-%d %H:%M:%S')
30+
ax.format_xdata = DateFormatter('%Y-%m-%d %H:%M:%S').format_for_cursor
3131
fig.autofmt_xdate()
3232

3333
plt.show()

‎examples/pylab_examples/date_index_formatter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222

2323
class MyFormatter(Formatter):
2424
def __init__(self, dates, fmt='%Y-%m-%d'):
25+
super(MyFormatter, self).__init__()
2526
self.dates = dates
2627
self.fmt = fmt
2728

28-
def __call__(self, x, pos=0):
29+
def format_for_tick(self, x, pos=0):
2930
'Return the label for time x at position pos'
3031
ind = int(round(x))
3132
if ind >= len(self.dates) or ind < 0:

‎examples/pylab_examples/demo_ribbon_box.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def draw(self, renderer, *args, **kwargs):
104104
]
105105
heights = np.random.random(years.shape) * 7000 + 3000
106106

107-
fmt = ScalarFormatter(useOffset=False)
107+
fmt = ScalarFormatter(use_offset=False)
108108
ax.xaxis.set_major_formatter(fmt)
109109

110110
for year, h, bc in zip(years, heights, box_colors):

‎examples/pylab_examples/finance_work2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def moving_average_convergence(x, nslow=26, nfast=12):
186186
label.set_rotation(30)
187187
label.set_horizontalalignment('right')
188188

189-
ax.fmt_xdata = mdates.DateFormatter('%Y-%m-%d')
189+
ax.format_xdata = mdates.DateFormatter('%Y-%m-%d').format_for_cursor
190190

191191

192192
class MyLocator(mticker.MaxNLocator):

0 commit comments

Comments
 (0)