Skip to content

Caching the results of Transform.transform_path for non-affine transforms #723

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 9 commits into from
Jun 8, 2012
Merged

Caching the results of Transform.transform_path for non-affine transforms #723

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
753c9a2
Single commit of necessary transform changes.
Feb 28, 2012
c4ceace
Fixed is_affine inheritance & added scatter test which highlighted th…
Mar 6, 2012
bf4dd97
Fixed failing unit test. (in test_axes)
Mar 6, 2012
4c88a6d
Moved scatter test into test_axes.py
Mar 20, 2012
c088477
Fixed broken handling of WrappedTransform
Apr 20, 2012
1b1b340
Intermediate commit to request some assistance.
Apr 20, 2012
e9cc98e
Fixed __array__ releated bug that I introduced.
May 1, 2012
c898bdf
Improved comments.
May 1, 2012
a81545c
Now working with rebased master.
pelson Jun 7, 2012
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
Prev Previous commit
Next Next commit
Fixed broken handling of WrappedTransform
  • Loading branch information
@pelson
Phil Elson authored and pelson committed Jun 7, 2012
commit c0884772332c011429a604d0ab0d04ab2f41a02c
14 changes: 9 additions & 5 deletions lib/matplotlib/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,11 +1293,11 @@ def _set(self, child):
self.transform_path_non_affine = child.transform_path_non_affine
self.get_affine = child.get_affine
self.inverted = child.inverted
self.is_affine = child.is_affine
self.get_matrix = child.get_matrix

def __eq__(self, other):
return self._child == other
# 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):
"""
Expand Down Expand Up @@ -2044,9 +2044,13 @@ def composite_transform_factory(a, b):

c = a + b
"""
if a == IdentityTransform():
# check to see if any of a or b are IdentityTransforms. Note we
# do not use equality here since we may have wrapped transforms
# which are currently equal to Identity, but since wrapped transforms
# are mutable, they may not always be equal.
if isinstance(a, IdentityTransform):
return b
elif b == IdentityTransform():
elif isinstance(b, IdentityTransform):
return a
elif a.is_affine and b.is_affine:
return CompositeAffine2D(a, b)
Expand Down