Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Small TransformWrapper cleanups. #24640

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 7, 2022
Merged

Small TransformWrapper cleanups. #24640

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
8 changes: 8 additions & 0 deletions lib/matplotlib/tests/test_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,3 +722,11 @@ def test_deepcopy():
b1.translate(3, 4)
assert not s._invalid
assert (s.get_matrix() == a.get_matrix()).all()


def test_transformwrapper():
t = mtransforms.TransformWrapper(mtransforms.Affine2D())
with pytest.raises(ValueError, match=(
r"The input and output dims of the new child \(1, 1\) "
r"do not match those of current child \(2, 2\)")):
t.set(scale.LogTransform(10))
48 changes: 21 additions & 27 deletions lib/matplotlib/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,15 +1699,8 @@ def __init__(self, child):
be replaced with :meth:`set`.
"""
_api.check_isinstance(Transform, child=child)
self._init(child)
self.set_children(child)

def _init(self, child):
Transform.__init__(self)
self.input_dims = child.input_dims
self.output_dims = child.output_dims
self._set(child)
self._invalid = 0
super().__init__()
self.set(child)

def __eq__(self, other):
return self._child.__eq__(other)
Expand All @@ -1718,8 +1711,24 @@ def frozen(self):
# docstring inherited
return self._child.frozen()

def _set(self, child):
def set(self, child):
"""
Replace the current child of this transform with another one.

The new child must have the same number of input and output
dimensions as the current child.
"""
if hasattr(self, "_child"): # Absent during init.
new_dims = (child.input_dims, child.output_dims)
old_dims = (self._child.input_dims, self._child.output_dims)
if new_dims != old_dims:
raise ValueError(
f"The input and output dims of the new child {new_dims} "
f"do not match those of current child {old_dims}")
self._child._parents.pop(id(self), None)

self._child = child
self.set_children(child)

self.transform = child.transform
self.transform_affine = child.transform_affine
Expand All @@ -1730,31 +1739,16 @@ def _set(self, child):
self.get_affine = child.get_affine
self.inverted = child.inverted
self.get_matrix = child.get_matrix

# note we do not wrap other properties here since the transform's
# child can be changed with WrappedTransform.set and so checking
# is_affine and other such properties may be dangerous.

def set(self, child):
"""
Replace the current child of this transform with another one.

The new child must have the same number of input and output
dimensions as the current child.
"""
if (child.input_dims != self.input_dims or
child.output_dims != self.output_dims):
raise ValueError(
"The new child must have the same number of input and output "
"dimensions as the current child")

self.set_children(child)
self._set(child)

self._invalid = 0
self.invalidate()
self._invalid = 0

input_dims = property(lambda self: self._child.input_dims)
output_dims = property(lambda self: self._child.output_dims)
is_affine = property(lambda self: self._child.is_affine)
is_separable = property(lambda self: self._child.is_separable)
has_inverse = property(lambda self: self._child.has_inverse)
Expand Down