Skip to content

BUG: Correct the previous bug fixing on xlim for plotting #28059

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.

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
merged 8 commits into from
Aug 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions pandas/plotting/_matplotlib/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
from pandas.plotting._matplotlib.style import _get_standard_colors
from pandas.plotting._matplotlib.tools import (
_flatten,
_get_all_lines,
_get_xlim,
_handle_shared_axes,
_subplots,
format_date_labels,
Expand Down Expand Up @@ -1099,8 +1101,13 @@ def _make_plot(self):
)
self._add_legend_handle(newlines[0], label, index=i)

# GH27686 set_xlim will truncate xaxis to fixed space
ax.relim()
if self._is_ts_plot():

# reset of xlim should be used for ts data
# TODO: GH28021, should find a way to change view limit on xaxis
lines = _get_all_lines(ax)
left, right = _get_xlim(lines)
ax.set_xlim(left, right)

@classmethod
def _plot(cls, ax, x, y, style=None, column_num=None, stacking_id=None, **kwds):
Expand Down
21 changes: 21 additions & 0 deletions pandas/plotting/_matplotlib/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,3 +356,24 @@ def _set_ticks_props(axes, xlabelsize=None, xrot=None, ylabelsize=None, yrot=Non
if yrot is not None:
plt.setp(ax.get_yticklabels(), rotation=yrot)
return axes


def _get_all_lines(ax):
lines = ax.get_lines()

if hasattr(ax, "right_ax"):
lines += ax.right_ax.get_lines()

if hasattr(ax, "left_ax"):
lines += ax.left_ax.get_lines()

return lines


def _get_xlim(lines):
left, right = np.inf, -np.inf
for l in lines:
x = l.get_xdata(orig=False)
left = min(np.nanmin(x), left)
right = max(np.nanmax(x), right)
return left, right
24 changes: 7 additions & 17 deletions pandas/tests/plotting/test_datetimelike.py
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,6 @@ def test_get_finder(self):
assert conv.get_finder("A") == conv._annual_finder
assert conv.get_finder("W") == conv._daily_finder

# TODO: The finder should be retested due to wrong xlim values on x-axis
@pytest.mark.xfail(reason="TODO: check details in GH28021")
@pytest.mark.slow
def test_finder_daily(self):
day_lst = [10, 40, 252, 400, 950, 2750, 10000]
Expand All @@ -444,8 +442,6 @@ def test_finder_daily(self):
assert rs1 == xpl1
assert rs2 == xpl2

# TODO: The finder should be retested due to wrong xlim values on x-axis
@pytest.mark.xfail(reason="TODO: check details in GH28021")
@pytest.mark.slow
def test_finder_quarterly(self):
yrs = [3.5, 11]
Expand All @@ -469,8 +465,6 @@ def test_finder_quarterly(self):
assert rs1 == xpl1
assert rs2 == xpl2

# TODO: The finder should be retested due to wrong xlim values on x-axis
@pytest.mark.xfail(reason="TODO: check details in GH28021")
@pytest.mark.slow
def test_finder_monthly(self):
yrs = [1.15, 2.5, 4, 11]
Expand Down Expand Up @@ -504,8 +498,6 @@ def test_finder_monthly_long(self):
xp = Period("1989Q1", "M").ordinal
assert rs == xp

# TODO: The finder should be retested due to wrong xlim values on x-axis
@pytest.mark.xfail(reason="TODO: check details in GH28021")
@pytest.mark.slow
def test_finder_annual(self):
xp = [1987, 1988, 1990, 1990, 1995, 2020, 2070, 2170]
Expand All @@ -530,7 +522,7 @@ def test_finder_minutely(self):
_, ax = self.plt.subplots()
ser.plot(ax=ax)
xaxis = ax.get_xaxis()
rs = xaxis.get_majorticklocs()[1]
rs = xaxis.get_majorticklocs()[0]
xp = Period("1/1/1999", freq="Min").ordinal

assert rs == xp
Expand All @@ -542,7 +534,7 @@ def test_finder_hourly(self):
_, ax = self.plt.subplots()
ser.plot(ax=ax)
xaxis = ax.get_xaxis()
rs = xaxis.get_majorticklocs()[1]
rs = xaxis.get_majorticklocs()[0]
xp = Period("1/1/1999", freq="H").ordinal

assert rs == xp
Expand Down Expand Up @@ -1418,9 +1410,7 @@ def test_plot_outofbounds_datetime(self):

def test_format_timedelta_ticks_narrow(self):

expected_labels = [
"00:00:00.0000000{:0>2d}".format(i) for i in np.arange(0, 10, 2)
]
expected_labels = ["00:00:00.0000000{:0>2d}".format(i) for i in np.arange(10)]

rng = timedelta_range("0", periods=10, freq="ns")
df = DataFrame(np.random.randn(len(rng), 3), rng)
Expand All @@ -1430,8 +1420,8 @@ def test_format_timedelta_ticks_narrow(self):
labels = ax.get_xticklabels()

result_labels = [x.get_text() for x in labels]
assert (len(result_labels) - 2) == len(expected_labels)
assert result_labels[1:-1] == expected_labels
assert len(result_labels) == len(expected_labels)
assert result_labels == expected_labels

def test_format_timedelta_ticks_wide(self):
expected_labels = [
Expand All @@ -1454,8 +1444,8 @@ def test_format_timedelta_ticks_wide(self):
labels = ax.get_xticklabels()

result_labels = [x.get_text() for x in labels]
assert (len(result_labels) - 2) == len(expected_labels)
assert result_labels[1:-1] == expected_labels
assert len(result_labels) == len(expected_labels)
assert result_labels == expected_labels

def test_timedelta_plot(self):
# test issue #8711
Expand Down