FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix ConciseDateFormatter offset during zoom by jklymak · Pull Request #21785 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Fix ConciseDateFormatter offset during zoom #21785

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

Merged
QuLogic merged 2 commits into from
Nov 29, 2021
Conversation 0 Commits 2 Checks 0 Files changed
Merged

Fix ConciseDateFormatter offset during zoom #21785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c06924
FIX: label offset on zoom
jklymak Nov 28, 2021
2ad1d5d
TST: add a test for changing offset
jklymak Nov 28, 2021
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
10 changes: 6 additions & 4 deletions lib/matplotlib/dates.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -791,15 +791,15 @@ def format_ticks(self, values):
# offset fmt are for the offset in the upper left of the
# or lower right of the axis.
offsetfmts = self.offset_formats
show_offset = self.show_offset

# determine the level we will label at:
# mostly 0: years, 1: months, 2: days,
# 3: hours, 4: minutes, 5: seconds, 6: microseconds
for level in range(5, -1, -1):
if len(np.unique(tickdate[:, level])) > 1:
# level is less than 2 so a year is already present in the axis
if (level < 2):
self.show_offset = False
if level < 2:
show_offset = False
break
elif level == 0:
# all tickdate are the same, so only micros might be different
Expand Down Expand Up @@ -839,11 +839,13 @@ def format_ticks(self, values):
if '.' in labels[nn]:
labels[nn] = labels[nn][:-trailing_zeros].rstrip('.')

if self.show_offset:
if show_offset:
# set the offset string:
self.offset_string = tickdatetime[-1].strftime(offsetfmts[level])
if self._usetex:
self.offset_string = _wrap_in_tex(self.offset_string)
else:
self.offset_string = ''

if self._usetex:
return [_wrap_in_tex(l) for l in labels]
Expand Down
22 changes: 22 additions & 0 deletions lib/matplotlib/tests/test_dates.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,28 @@ def test_concise_formatter_show_offset(t_delta, expected):
assert formatter.get_offset() == expected


def test_offset_changes():
fig, ax = plt.subplots()

d1 = datetime.datetime(1997, 1, 1)
d2 = d1 + datetime.timedelta(weeks=520)

locator = mdates.AutoDateLocator()
formatter = mdates.ConciseDateFormatter(locator)
ax.xaxis.set_major_locator(locator)
ax.xaxis.set_major_formatter(formatter)

ax.plot([d1, d2], [0, 0])
fig.draw_without_rendering()
assert formatter.get_offset() == ''
ax.set_xlim(d1, d1 + datetime.timedelta(weeks=3))
fig.draw_without_rendering()
assert formatter.get_offset() == '1997-Jan'
ax.set_xlim(d1, d1 + datetime.timedelta(weeks=520))
fig.draw_without_rendering()
assert formatter.get_offset() == ''


@pytest.mark.parametrize('t_delta, expected', [
(datetime.timedelta(weeks=52 * 200),
['$\\mathdefault{%d}$' % (t, ) for t in range(1980, 2201, 20)]),
Expand Down
Back | FazBrowse Home | New Git URL