Improved scatter argument handling; a few cleanups

efiring · efiring · commit 01bdca737838 · 2007-04-07T00:22:26.000Z
svn path=/trunk/matplotlib/; revision=3166
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -67,7 +67,7 @@ def delete_masked_points(*args):
     include arguments that can take string or array values, for
     example.
 
-    Array arguments must all have the same shape, and must
+    Array arguments must have the same length; masked arguments must
     be one-dimensional.
 
     Written as a helper for scatter, but may be more generally
@@ -79,7 +79,7 @@ def delete_masked_points(*args):
     mask = reduce(ma.mask_or, masks)
     margs = []
     for x in args:
-        if shape(x) == shape(mask):
+        if not is_string_like(x) and len(x) == len(mask):
             if (hasattr(x, 'get_compressed_copy')):
                 compressed_x = x.get_compressed_copy(mask)
             else:
@@ -3683,21 +3683,27 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
             faceted=True, **kwargs)
         Supported function signatures:
 
-            SCATTER(x, y) - make a scatter plot of x vs y
+            SCATTER(x, y, **kwargs)
+            SCATTER(x, y, s, **kwargs)
+            SCATTER(x, y, s, c, **kwargs)
 
-            SCATTER(x, y, s) - make a scatter plot of x vs y with size in area
-              given by s
+        Make a scatter plot of x versus y, where x, y are 1-D sequences
+        of the same length, N.
 
-            SCATTER(x, y, s, c) - make a scatter plot of x vs y with size in area
-              given by s and colors given by c
+        Arguments s and c can also be given as kwargs; this is encouraged
+        for readability.
 
-            SCATTER(x, y, s, c, **kwargs) - control colormapping and scaling
-              with keyword args; see below
+            s is a size in points^2.  It is a scalar
+              or an array of the same length as x and y.
 
-        Make a scatter plot of x versus y.  s is a size in points^2 a scalar
-        or an array of the same length as x or y.  c is a color and can be a
-        single color format string or a length(x) array of intensities which
-        will be mapped by the matplotlib.colors.colormap instance cmap
+            c is a color and can be a single color format string,
+              or a sequence of color specifications of length N,
+              or a sequence of N numbers to be mapped to colors
+              using the cmap and norm specified via kwargs (see below).
+              Note that c should not be a single numeric RGB or RGBA
+              sequence because that is indistinguishable from an array
+              of values to be colormapped. c can be a 2-D array in which
+              the rows are RGB or RGBA, however.
 
         The marker can be one of
 
@@ -3772,8 +3778,13 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
 
         # The inherent ambiguity is resolved in favor of color
         # mapping, not interpretation as rgb or rgba.
-        if not is_string_like(c) and iterable(c) and len(c)==len(x):
-            colors = None  # use cmap, norm after collection is created
+
+        if not is_string_like(c):
+            sh = shape(c)
+            if len(sh) == 1 and sh[0] == len(x):
+                colors = None  # use cmap, norm after collection is created
+            else:
+                colors = colorConverter.to_rgba_list(c, alpha)
         else:
             colors = colorConverter.to_rgba_list(c, alpha)
 
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -61,11 +61,6 @@ def to_rgba(self, x, alpha=1.0):
     def set_array(self, A):
         'Set the image array from numeric/numarray A'
         self._A = A
-        #from numerix import typecode, typecodes
-        #if typecode(A) in typecodes['Float']:
-        #    self._A = A.astype(nx.Float32)
-        #else:
-        #    self._A = A.astype(nx.Int16)
 
     def get_array(self):
         'Return the array'
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -214,18 +214,13 @@ def set_data(self, A, shape=None):
         """
         Set the image array
 
-        ACCEPTS: numeric/numarray/PIL Image A"""
+        ACCEPTS: numpy/PIL Image A"""
         # check if data is PIL Image without importing Image
-        if hasattr(A,'getpixel'): X = pil_to_array(A)
-        else: X = ma.asarray(A) # assume array
-
-        if (typecode(X) != UInt8
-            or len(X.shape) != 3
-            or X.shape[2] > 4
-            or X.shape[2] < 3):
-            cm.ScalarMappable.set_array(self, X)
+        if hasattr(A,'getpixel'):
+            X = pil_to_array(A)
         else:
-            self._A = X
+            X = ma.asarray(A) # assume array
+        self._A = X
 
         self._imcache =None
 
@@ -234,7 +229,9 @@ def set_array(self, A):
         retained for backwards compatibility - use set_data instead
 
         ACCEPTS: numeric/numarray/PIL Image A"""
-
+        # This also needs to be here to override the inherited
+        # cm.ScalarMappable.set_array method so it is not invoked
+        # by mistake.
 
         self.set_data(A)
 
