Skip to content

Don't lose unit change handlers when pickling/unpickling. #19119

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 1 commit into from
Dec 18, 2020
Merged

Don't lose unit change handlers when pickling/unpickling. #19119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions lib/matplotlib/axes/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from collections import OrderedDict
from contextlib import ExitStack
import functools
import inspect
import itertools
import logging
Expand Down Expand Up @@ -562,13 +563,10 @@ def __init__(self, fig, rect,

self.update(kwargs)

if self.xaxis is not None:
self._xcid = self.xaxis.callbacks.connect(
'units finalize', lambda: self._on_units_changed(scalex=True))

if self.yaxis is not None:
self._ycid = self.yaxis.callbacks.connect(
'units finalize', lambda: self._on_units_changed(scaley=True))
for name, axis in self._get_axis_map().items():
axis.callbacks._pickled_cids.add(
axis.callbacks.connect(
'units finalize', self._unit_change_handler(name)))

rcParams = mpl.rcParams
self.tick_params(
Expand Down Expand Up @@ -2150,14 +2148,17 @@ def add_container(self, container):
container._remove_method = self.containers.remove
return container

def _on_units_changed(self, scalex=False, scaley=False):
def _unit_change_handler(self, axis_name, event=None):
"""
Callback for processing changes to axis units.

Currently requests updates of data limits and view limits.
Process axis units changes: requests updates to data and view limits.
"""
if event is None: # Allow connecting `self._unit_change_handler(name)`
return functools.partial(
self._unit_change_handler, axis_name, event=object())
_api.check_in_list(self._get_axis_map(), axis_name=axis_name)
self.relim()
self._request_autoscale_view(scalex=scalex, scaley=scaley)
self._request_autoscale_view(scalex=(axis_name == "x"),
scaley=(axis_name == "y"))

def relim(self, visible_only=False):
"""
Expand Down
10 changes: 3 additions & 7 deletions lib/matplotlib/lines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,13 +627,9 @@ def axes(self, ax):
# call the set method from the base-class property
Artist.axes.fset(self, ax)
if ax is not None:
# connect unit-related callbacks
if ax.xaxis is not None:
self._xcid = ax.xaxis.callbacks.connect('units',
self.recache_always)
if ax.yaxis is not None:
self._ycid = ax.yaxis.callbacks.connect('units',
self.recache_always)
for axis in ax._get_axis_map().values():
axis.callbacks._pickled_cids.add(
axis.callbacks.connect('units', self.recache_always))

def set_data(self, *args):
"""
Expand Down
23 changes: 10 additions & 13 deletions lib/mpl_toolkits/mplot3d/axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""

from collections import defaultdict
import functools
from functools import reduce
from itertools import compress
import math
Expand Down Expand Up @@ -111,12 +112,6 @@ def __init__(
# func used to format z -- fall back on major formatters
self.fmt_zdata = None

if self.zaxis is not None:
self._zcid = self.zaxis.callbacks.connect(
'units finalize', lambda: self._on_units_changed(scalez=True))
else:
self._zcid = None

self.mouse_init()
self.figure.canvas.callbacks._pickled_cids.update({
self.figure.canvas.mpl_connect(
Expand Down Expand Up @@ -475,14 +470,16 @@ def get_axis_position(self):
zhigh = tc[0][2] > tc[2][2]
return xhigh, yhigh, zhigh

def _on_units_changed(self, scalex=False, scaley=False, scalez=False):
"""
Callback for processing changes to axis units.

Currently forces updates of data limits and view limits.
"""
def _unit_change_handler(self, axis_name, event=None):
# docstring inherited
if event is None: # Allow connecting `self._unit_change_handler(name)`
return functools.partial(
self._unit_change_handler, axis_name, event=object())
_api.check_in_list(self._get_axis_map(), axis_name=axis_name)
self.relim()
self.autoscale_view(scalex=scalex, scaley=scaley, scalez=scalez)
self.autoscale_view(scalex=(axis_name == "x"),
scaley=(axis_name == "y"),
scalez=(axis_name == "z"))

def update_datalim(self, xys, **kwargs):
pass
Expand Down