10000 Merge pull request #26078 from anntzer/pu · matplotlib/matplotlib@f27d081 · GitHub
[go: up one dir, main page]
Skip to content

Commit f27d081

Browse files
ksundenksunden
authored
Merge pull request #26078 from anntzer/pu
Fix parasite_axes does not properly handle units
2 parents 846280f + e418f5c commit f27d081

File tree

4 files changed

+31
-23
lines changed

4 files changed

+31
-23
lines changed

‎lib/matplotlib/axes/_axes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ def plot(self, *args, scalex=True, scaley=True, data=None, **kwargs):
17151715
(``'green'``) or hex strings (``'#008000'``).
17161716
"""
17171717
kwargs = cbook.normalize_kwargs(kwargs, mlines.Line2D)
1718-
lines = [*self._get_lines(*args, data=data, **kwargs)]
1718+
lines = [*self._get_lines(self, *args, data=data, **kwargs)]
17191719
for line in lines:
17201720
self.add_line(line)
17211721
if scalex:
@@ -3575,7 +3575,7 @@ def _upcast_err(err):
35753575
# that would call self._process_unit_info again, and do other indirect
35763576
# data processing.
35773577
(data_line, base_style), = self._get_lines._plot_args(
3578-
(x, y) if fmt == '' else (x, y, fmt), kwargs, return_kwargs=True)
3578+
self, (x, y) if fmt == '' else (x, y, fmt), kwargs, return_kwargs=True)
35793579

35803580
# Do this after creating `data_line` to avoid modifying `base_style`.
35813581
if barsabove:
@@ -5283,7 +5283,7 @@ def fill(self, *args, data=None, **kwargs):
52835283
# For compatibility(!), get aliases from Line2D rather than Patch.
52845284
kwargs = cbook.normalize_kwargs(kwargs, mlines.Line2D)
52855285
# _get_patches_for_fill returns a generator, convert it to a list.
5286-
patches = [*self._get_patches_for_fill(*args, data=data, **kwargs)]
5286+
patches = [*self._get_patches_for_fill(self, *args, data=data, **kwargs)]
52875287
for poly in patches:
52885288
self.add_patch(poly)
52895289
self._request_autoscale_view()

‎lib/matplotlib/axes/_base.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,14 @@ class _process_plot_var_args:
219219
220220
an arbitrary number of *x*, *y*, *fmt* are allowed
221221
"""
222-
def __init__(self, axes, command='plot'):
223-
self.axes = axes
222+
223+
def __init__(self, command='plot'):
224224
self.command = command
225225
self.set_prop_cycle(None)
226226

227227
def __getstate__(self):
228228
# note: it is not possible to pickle a generator (and thus a cycler).
229-
return {'axes': self.axes, 'command': self.command}
229+
return {'command': self.command}
230230

231231
def __setstate__(self, state):
232232
self.__dict__ = state.copy()
@@ -238,8 +238,8 @@ def set_prop_cycle(self, cycler):
238238
self.prop_cycler = itertools.cycle(cycler)
239239
self._prop_keys = cycler.keys # This should make a copy
240240

241-
def __call__(self, *args, data=None, **kwargs):
242-
self.axes._process_unit_info(kwargs=kwargs)
241+
def __call__(self, axes, *args, data=None, **kwargs):
242+
axes._process_unit_info(kwargs=kwargs)
243243

244244
for pos_only in "xy":
245245
if pos_only in kwargs:
@@ -309,7 +309,7 @@ def __call__(self, *args, data=None, **kwargs):
309309
this += args[0],
310310
args = args[1:]
311311
yield from self._plot_args(
312-
this, kwargs, ambiguous_fmt_datakey=ambiguous_fmt_datakey)
312+
axes, this, kwargs, ambiguous_fmt_datakey=ambiguous_fmt_datakey)
313313

314314
def get_next_color(self):
315315
"""Return the next color in the cycle."""
@@ -344,17 +344,17 @@ def _setdefaults(self, defaults, kw):
344344
if kw.get(k, None) is None:
345345
kw[k] = defaults[k]
346346

347-
def _makeline(self, x, y, kw, kwargs):
347+ def _makeline(self, axes, x, y, kw, kwargs):
348348
kw = {**kw, **kwargs} # Don't modify the original kw.
349349
default_dict = self._getdefaults(set(), kw)
350350
self._setdefaults(default_dict, kw)
351351
seg = mlines.Line2D(x, y, **kw)
352352
return seg, kw
353353

354-
def _makefill(self, x, y, kw, kwargs):
354+
def _makefill(self, axes, x, y, kw, kwargs):
355355
# Polygon doesn't directly support unitized inputs.
356-
x = self.axes.convert_xunits(x)
357-
y = self.axes.convert_yunits(y)
356+
x = axes.convert_xunits(x)
357+
y = axes.convert_yunits(y)
358358

359359
kw = kw.copy() # Don't modify the original kw.
360360
kwargs = kwargs.copy()
@@ -403,7 +403,7 @@ def _makefill(self, x, y, kw, kwargs):
403403
seg.set(**kwargs)
404404
return seg, kwargs
405405

406-
def _plot_args(self, tup, kwargs, *,
406+
def _plot_args(self, axes, tup, kwargs, *,
407407
return_kwargs=False, ambiguous_fmt_datakey=False):
408408
"""
409409
Process the arguments of ``plot([x], y, [fmt], **kwargs)`` calls.
@@ -495,10 +495,10 @@ def _plot_args(self, tup, kwargs, *,
495495
else:
496496
x, y = index_of(xy[-1])
497497

498-
if self.axes.xaxis is not None:
499-
self.axes.xaxis.update_units(x)
500-
if self.axes.yaxis is not None:
501-
self.axes.yaxis.update_units(y)
498+
if axes.xaxis is not None:
499+
axes.xaxis.update_units(x)
500+
if axes.yaxis is not None:
501+
axes.yaxis.update_units(y)
502502

503503
if x.shape[0] != y.shape[0]:
504504
raise ValueError(f"x and y must have same first dimension, but "
@@ -534,7 +534,7 @@ def _plot_args(self, tup, kwargs, *,
534534
else:
535535
labels = [label] * n_datasets
536536

537-
result = (make_artist(x[:, j % ncx], y[:, j % ncy], kw,
537+
result = (make_artist(axes, x[:, j % ncx], y[:, j % ncy], kw,
538538
{**kwargs, 'label': label})
539539
for j, label in enumerate(labels))
540540

@@ -1292,8 +1292,8 @@ def __clear(self):
12921292
self._tight = None
12931293
self._use_sticky_edges = True
12941294

1295-
self._get_lines = _process_plot_var_args(self)
1296-
self._get_patches_for_fill = _process_plot_var_args(self, 'fill')
1295+
self._get_lines = _process_plot_var_args()
1296+
self._get_patches_for_fill = _process_plot_var_args('fill')
12971297

12981298
self._gridOn = mpl.rcParams['axes.grid']
12991299
old_children, self._children = self._children, []

‎lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
zoomed_inset_axes, mark_inset, inset_axes, BboxConnectorPatch,
2929
InsetPosition)
3030
import mpl_toolkits.axes_grid1.mpl_axes
31-
3231
import pytest
3332

3433
import numpy as np
@@ -92,6 +91,15 @@ def test_twin_axes_empty_and_removed():
9291
plt.subplots_adjust(wspace=0.5, hspace=1)
9392

9493

94+
def test_twin_axes_both_with_units():
95+
host = host_subplot(111)
96+
host.plot_date([0, 1, 2], [0, 1, 2], xdate=False, ydate=True)
97+
twin = host.twinx()
98+
twin.plot(["a", "b", "c"])
99+
assert host.get_yticklabels()[0].get_text() == "00:00:00"
100+
assert twin.get_yticklabels()[0].get_text() == "a"
101+
102+
95103
def test_axesgrid_colorbar_log_smoketest():
96104
fig = plt.figure()
97105
grid = AxesGrid(fig, 111, # modified to be only subplot

‎lib/mpl_toolkits/mplot3d/axes3d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3042,7 +3042,7 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
30423042
# that would call self._process_unit_info again, and do other indirect
30433043
# data processing.
30443044
(data_line, base_style), = self._get_lines._plot_args(
3045-
(x, y) if fmt == '' else (x, y, fmt), kwargs, return_kwargs=True)
3045+
self, (x, y) if fmt == '' else (x, y, fmt), kwargs, return_kwargs=True)
30463046
art3d.line_2d_to_3d(data_line, zs=z)
30473047

30483048
# Do this after creating `data_line` to avoid modifying `base_style`.

0 commit comments

Comments
 (0)
0