Major speed improvement for non-rectilinear projections.

mdboom · mdboom · commit 80cc9aa45722 · 2007-12-20T17:18:12.000Z
svn path=/branches/transforms/; revision=4782
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -304,6 +304,11 @@ def update_position(self, loc):
         'Set the location of tick in data coords with scalar loc'
         x = loc
 
+        nonlinear = (hasattr(self.axes, 'yaxis') and
+                     self.axes.yaxis.get_scale() != 'linear' or
+                     hasattr(self.axes, 'xaxis') and
+                     self.axes.xaxis.get_scale() != 'linear')
+
         if self.tick1On:
             self.tick1line.set_xdata((x,))
         if self.tick2On:
@@ -314,6 +319,12 @@ def update_position(self, loc):
             self.label1.set_x(x)
         if self.label2On:
             self.label2.set_x(x)
+
+        if nonlinear:
+            self.tick1line._invalid = True
+            self.tick2line._invalid = True
+            self.gridline._invalid = True
+
         self._loc = loc
 
     def get_view_interval(self):
@@ -425,6 +436,12 @@ def _get_gridline(self):
     def update_position(self, loc):
         'Set the location of tick in data coords with scalar loc'
         y = loc
+
+        nonlinear = (hasattr(self.axes, 'yaxis') and
+                     self.axes.yaxis.get_scale() != 'linear' or
+                     hasattr(self.axes, 'xaxis') and
+                     self.axes.xaxis.get_scale() != 'linear')
+
         if self.tick1On:
             self.tick1line.set_ydata((y,))
         if self.tick2On:
@@ -435,6 +452,11 @@ def update_position(self, loc):
             self.label1.set_y( y )
         if self.label2On:
             self.label2.set_y( y )
+        if nonlinear:
+            self.tick1line._invalid = True
+            self.tick2line._invalid = True
+            self.gridline._invalid = True
+
         self._loc = loc
 
 
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -396,9 +396,6 @@ def set_data(self, *args):
             self._xorig = x
             self._yorig = y
             self._invalid = True
-        else:
-            if hasattr(self, "_transformed_path"):
-                self._transformed_path._invalid = self._transformed_path.INVALID_NON_AFFINE
 
     def recache(self):
         #if self.axes is None: print 'recache no axes'
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -93,13 +93,15 @@ def invalidate(self):
         """
         # If we are an affine transform being changed, we can set the
         # flag to INVALID_AFFINE_ONLY
-        value = ((self.is_affine or self.is_bbox)
-                 and self.INVALID_AFFINE
-                 or self.INVALID)
+        value = (self.is_affine) and self.INVALID_AFFINE or self.INVALID
 
         # Shortcut: If self is already invalid, that means its parents
         # are as well, so we don't need to do anything.
-        if self._invalid == value or not len(self._parents):
+        if self._invalid == value:
+            return
+
+        if not len(self._parents):
+            self._invalid = value
             return
 
         # Invalidate all ancestors of self using pseudo-recursion.
@@ -108,7 +110,7 @@ def invalidate(self):
         while len(stack):
             root = stack.pop()
             # Stop at subtrees that have already been invalidated
-            if root._invalid == 0 or root.pass_through:
+            if root._invalid != value or root.pass_through:
                 root._invalid = value
                 stack.extend(root._parents.keys())
 
@@ -198,6 +200,7 @@ class BboxBase(TransformNode):
     read-only access to its data.
     """
     is_bbox = True
+    is_affine = True
 
     #* Redundant: Removed for performance
     #
@@ -208,6 +211,7 @@ class BboxBase(TransformNode):
         def _check(points):
             if ma.isMaskedArray(points):
                 warnings.warn("Bbox bounds are a masked array.")
+            points = npy.asarray(points)
             if (points[1,0] - points[0,0] == 0 or
                 points[1,1] - points[0,1] == 0):
                 warnings.warn("Singular Bbox.")
@@ -1011,6 +1015,8 @@ class TransformWrapper(Transform):
     transform may only be replaced with another child transform of the
     same dimensions.
     """
+    pass_through = True
+
     def __init__(self, child):
         """
         child: A Transform instance.  This child may later be replaced
@@ -1546,7 +1552,6 @@ class BlendedAffine2D(Affine2DBase):
     This version is an optimization for the case where both child
     transforms are of type Affine2DBase.
     """
-
     is_separable = True
 
     def __init__(self, x_transform, y_transform):
@@ -1917,8 +1922,8 @@ def get_transformed_path_and_affine(self):
         the transform already applied, along with the affine part of
         the path necessary to complete the transformation.
         """
-        if (self._invalid & self.INVALID_NON_AFFINE or
-            self._transformed_path is None):
+        if ((self._invalid & self.INVALID_NON_AFFINE == self.INVALID_NON_AFFINE)
+            or self._transformed_path is None):
             self._transformed_path = \
                 self._transform.transform_path_non_affine(self._path)
         self._invalid = 0
@@ -1928,7 +1933,7 @@ def get_fully_transformed_path(self):
         """
         Return a fully-transformed copy of the child path.
         """
-        if (self._invalid & self.INVALID_NON_AFFINE
+        if ((self._invalid & self.INVALID_NON_AFFINE == self.INVALID_NON_AFFINE)
             or self._transformed_path is None):
             self._transformed_path = \
                 self._transform.transform_path_non_affine(self._path)
