Line2D: simplify set_data functionality; recache only a coord. that was set.

efiring · efiring · commit 01793268c97c · 2009-12-28T00:21:50.000Z
svn path=/trunk/matplotlib/; revision=8054
diff --git a/examples/pylab_examples/clippedline.py b/examples/pylab_examples/clippedline.py
@@ -1,6 +1,11 @@
 """
 Clip a line according to the current xlimits, and change the marker
-style when zoomed in
+style when zoomed in.
+
+It is not clear this example is still needed or valid; clipping
+is now automatic for Line2D objects when x is sorted in
+ascending order.
+
 """
 
 from matplotlib.lines import Line2D
@@ -19,8 +24,7 @@ def __init__(self, ax, *args, **kwargs):
 
     def set_data(self, *args, **kwargs):
         Line2D.set_data(self, *args, **kwargs)
-        if self._invalid:
-            self.recache()
+        self.recache()
         self.xorig = np.array(self._x)
         self.yorig = np.array(self._y)
 
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -248,7 +248,8 @@ def __init__(self, xdata, ydata,
 
         self._xorig = np.asarray([])
         self._yorig = np.asarray([])
-        self._invalid = True
+        self._invalidx = True
+        self._invalidy = True
         self.set_data(xdata, ydata)
 
     def contains(self, mouseevent):
@@ -272,7 +273,7 @@ def contains(self, mouseevent):
             raise ValueError,"pick radius should be a distance"
 
         # Make sure we have data to plot
-        if self._invalid:
+        if self._invalidy or self._invalidx:
             self.recache()
         if len(self._xy)==0: return False,{}
 
@@ -403,36 +404,28 @@ def set_data(self, *args):
         else:
             x, y = args
 
-        not_masked = 0
-        if not ma.isMaskedArray(x):
-            x = np.asarray(x)
-            not_masked += 1
-        if not ma.isMaskedArray(y):
-            y = np.asarray(y)
-            not_masked += 1
-
-        if (not_masked < 2 or
-            (x is not self._xorig and
-             (x.shape != self._xorig.shape or np.any(x != self._xorig))) or
-            (y is not self._yorig and
-              (y.shape != self._yorig.shape or np.any(y != self._yorig)))):
-            self._xorig = x
-            self._yorig = y
-            self._invalid = True
+        self.set_xdata(x)
+        self.set_ydata(y)
 
     def recache(self):
-        #if self.axes is None: print 'recache no axes'
-        #else: print 'recache units', self.axes.xaxis.units, self.axes.yaxis.units
-        if ma.isMaskedArray(self._xorig) or ma.isMaskedArray(self._yorig):
-            x = ma.asarray(self.convert_xunits(self._xorig), float)
-            y = ma.asarray(self.convert_yunits(self._yorig), float)
-            x = ma.ravel(x)
-            y = ma.ravel(y)
+        if self._invalidx:
+            xconv = self.convert_xunits(self._xorig)
+            if ma.isMaskedArray(self._xorig):
+                x = ma.asarray(xconv, float)
+            else:
+                x = np.asarray(xconv, float)
+            x = x.ravel()
+        else:
+            x = self._x
+        if self._invalidy:
+            yconv = self.convert_yunits(self._yorig)
+            if ma.isMaskedArray(self._yorig):
+                y = ma.asarray(yconv, float)
+            else:
+                y = np.asarray(yconv, float)
+            y = y.ravel()
         else:
-            x = np.asarray(self.convert_xunits(self._xorig), float)
-            y = np.asarray(self.convert_yunits(self._yorig), float)
-            x = np.ravel(x)
-            y = np.ravel(y)
+            y = self._y
 
         if len(x)==1 and len(y)>1:
             x = x * np.ones(y.shape, float)
@@ -455,16 +448,16 @@ def recache(self):
         self._subslice = False
         if (self.axes and len(x) > 100 and self._is_sorted(x) and
             self.axes.name == 'rectilinear' and
-            self.axes.get_xscale() == 'linear' and
-            self.axes.get_yscale() == 'linear'):
+            self.axes.get_xscale() == 'linear'):
             self._subslice = True
         if hasattr(self, '_path'):
             interpolation_steps = self._path._interpolation_steps
         else:
             interpolation_steps = 1
         self._path = Path(self._xy, None, interpolation_steps)
         self._transformed_path = None
-        self._invalid = False
+        self._invalidx = False
+        self._invalidy = False
 
     def _transform_path(self, subslice=None):
         # Masked arrays are now handled by the Path class itself
@@ -482,7 +475,8 @@ def set_transform(self, t):
         ACCEPTS: a :class:`matplotlib.transforms.Transform` instance
         """
         Artist.set_transform(self, t)
-        self._invalid = True
+        self._invalidx = True
+        self._invalidy = True
 
     def _is_sorted(self, x):
         "return true if x is sorted"
@@ -491,7 +485,7 @@ def _is_sorted(self, x):
 
     @allow_rasterization
     def draw(self, renderer):
-        if self._invalid:
+        if self._invalidy or self._invalidx:
             self.recache()
         if self._subslice and self.axes:
             # Need to handle monotonically decreasing case also...
@@ -619,7 +613,7 @@ def get_xdata(self, orig=True):
         """
         if orig:
             return self._xorig
-        if self._invalid:
+        if self._invalidx:
             self.recache()
         return self._x
 
@@ -632,7 +626,7 @@ def get_ydata(self, orig=True):
         """
         if orig:
             return self._yorig
-        if self._invalid:
+        if self._invalidy:
             self.recache()
         return self._y
 
@@ -641,15 +635,15 @@ def get_path(self):
         Return the :class:`~matplotlib.path.Path` object associated
         with this line.
         """
-        if self._invalid:
+        if self._invalidy or self._invalidx:
             self.recache()
         return self._path
 
     def get_xydata(self):
         """
         Return the *xy* data as a Nx2 numpy array.
         """
-        if self._invalid:
+        if self._invalidy or self.invalidx:
             self.recache()
         return self._xy
 
@@ -840,15 +834,17 @@ def set_xdata(self, x):
 
         ACCEPTS: 1D array
         """
-        self.set_data(x, self._yorig)
+        self._xorig = x
+        self._invalidx = True
 
     def set_ydata(self, y):
         """
         Set the data np.array for y
 
         ACCEPTS: 1D array
         """
-        self.set_data(self._xorig, y)
+        self._yorig = y
+        self._invalidy = True
 
     def set_dashes(self, seq):
         """
