Skip to content

REF: make plotting less stateful (6) #55886

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
merged 3 commits into from
Nov 9, 2023
Merged

REF: make plotting less stateful (6) #55886

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51c0403
REF: make plotting less stateful
jbrockmendel Nov 8, 2023
f449fb2
mypy fixup
jbrockmendel Nov 8, 2023
b0c1d08
Fix registry test
jbrockmendel Nov 9, 2023
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
32 changes: 23 additions & 9 deletions pandas/plotting/_matplotlib/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
TYPE_CHECKING,
Any,
Literal,
cast,
final,
)
import warnings
Expand Down Expand Up @@ -126,8 +127,6 @@ def _kind(self) -> str:
def orientation(self) -> str | None:
return None

axes: np.ndarray # of Axes objects

def __init__(
self,
data,
Expand Down Expand Up @@ -236,10 +235,11 @@ def __init__(
self.mark_right = kwds.pop("mark_right", True)
self.stacked = kwds.pop("stacked", False)

# ax may be an Axes object or (if self.subplots) an ndarray of
# Axes objects
self.ax = ax
# TODO: deprecate fig keyword as it is ignored, not passed in tests
# as of 2023-11-05
self.axes = np.array([], dtype=object) # "real" version get set in `generate`

# parse errorbar input if given
xerr = kwds.pop("xerr", None)
Expand Down Expand Up @@ -463,7 +463,7 @@ def draw(self) -> None:
@final
def generate(self) -> None:
self._compute_plot_data()
fig = self._setup_subplots()
fig = self.fig
self._make_plot(fig)
self._add_table()
self._make_legend()
Expand Down Expand Up @@ -509,7 +509,19 @@ def _maybe_right_yaxis(self, ax: Axes, axes_num: int):
return new_ax

@final
def _setup_subplots(self) -> Figure:
@cache_readonly
def fig(self) -> Figure:
return self._axes_and_fig[1]

@final
@cache_readonly
# TODO: can we annotate this as both a Sequence[Axes] and ndarray[object]?
def axes(self) -> Sequence[Axes]:
return self._axes_and_fig[0]

@final
@cache_readonly
def _axes_and_fig(self) -> tuple[Sequence[Axes], Figure]:
if self.subplots:
naxes = (
self.nseries if isinstance(self.subplots, bool) else len(self.subplots)
Expand Down Expand Up @@ -552,8 +564,8 @@ def _setup_subplots(self) -> Figure:
elif self.logy == "sym" or self.loglog == "sym":
[a.set_yscale("symlog") for a in axes]

self.axes = axes
return fig
axes_seq = cast(Sequence["Axes"], axes)
return axes_seq, fig

@property
def result(self):
Expand All @@ -562,7 +574,8 @@ def result(self):
"""
if self.subplots:
if self.layout is not None and not is_list_like(self.ax):
return self.axes.reshape(*self.layout)
# error: "Sequence[Any]" has no attribute "reshape"
return self.axes.reshape(*self.layout) # type: ignore[attr-defined]
else:
return self.axes
else:
Expand Down Expand Up @@ -972,7 +985,8 @@ def _get_ax(self, i: int):
i = self._col_idx_to_axis_idx(i)
ax = self.axes[i]
ax = self._maybe_right_yaxis(ax, i)
self.axes[i] = ax
# error: Unsupported target for indexed assignment ("Sequence[Any]")
self.axes[i] = ax # type: ignore[index]
else:
ax = self.axes[0]
ax = self._maybe_right_yaxis(ax, i)
Expand Down