slight update to scatter

efiring · efiring · commit c5b1878b0434 · 2007-04-06T20:59:04.000Z
svn path=/trunk/matplotlib/; revision=3164
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3770,16 +3770,12 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
 
         x, y, s, c = delete_masked_points(x, y, s, c)
 
-        # Strange kwarg override: kwargs['color'] overrides
-        # defaulted kw 'c':
-        if kwargs.has_key('color'):
-            c = kwargs['color']
-            kwargs.pop('color')
+        # 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
+            colors = None  # use cmap, norm after collection is created
         else:
-            colors = ( colorConverter.to_rgba(c, alpha), )
-
+            colors = colorConverter.to_rgba_list(c, alpha)
 
         if not iterable(s):
             scales = (s,)
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -141,7 +141,7 @@ def __init__(self,
         #self._offsets = offsets
         self._offsets = offsets
         self._transOffset = transOffset
-        self._verts = []        
+        self._verts = []
 
     __init__.__doc__ = dedent(__init__.__doc__) % kwdocd
 
@@ -153,13 +153,13 @@ def pick(self, mouseevent):
         if not self.pickable(): return
         ind = []
         x, y = mouseevent.x, mouseevent.y
-        for i, thispoly in enumerate(self.get_transformed_patches()):            
+        for i, thispoly in enumerate(self.get_transformed_patches()):
             inside = nxutils.pnpoly(x, y, thispoly)
             if inside: ind.append(i)
         if len(ind):
             self.figure.canvas.pick_event(mouseevent, self, ind=ind)
-        
-        
+
+
     def get_transformed_patches(self):
         """
         get a sequence of the polygons in the collection in display (transformed) space
@@ -348,7 +348,7 @@ def draw(self, renderer):
         transform = self.get_transform()
         transoffset = self.get_transoffset()
 
-        
+
         transform.freeze()
         transoffset.freeze()
         self.update_scalarmappable()
@@ -364,14 +364,14 @@ def draw(self, renderer):
         transoffset.thaw()
         renderer.close_group('polycollection')
 
-        
+
     def get_verts(self, dataTrans=None):
         '''Return vertices in data coordinates.
         The calculation is incomplete in general; it is based
         on the vertices or the offsets, whichever is using
         dataTrans as its transformation, so it does not take
         into account the combined effect of segments and offsets.
-        '''        
+        '''
         verts = []
         if self._offsets is None:
             for seg in self._verts:
@@ -451,7 +451,7 @@ def __init__(self,
     __init__.__doc__ = dedent(__init__.__doc__) % kwdocd
 
     def get_transformed_patches(self):
-        
+
         xverts, yverts = zip(*self._verts)
         xverts = asarray(xverts)
         yverts = asarray(yverts)
@@ -486,7 +486,7 @@ def draw(self, renderer):
         self._update_verts()
         scales = sqrt(asarray(self._sizes)*self._dpi.get()/72.0)
 
-        
+
         offsets = self._offsets
         if self._offsets is not None:
             xs, ys = zip(*offsets)
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -26,7 +26,7 @@
 #### CONFIGURATION BEGINS HERE
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
 #     Agg Cairo GD GDK Paint PS PDF SVG Template
-backend      : TkAgg
+backend      : WXAgg
 numerix      : numpy  # numpy, Numeric or numarray
 units        : True
 #interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
