Merge remote branch 'origin/v1.0.x'

efiring · efiring · commit 4b4cdf61d036 · 2011-03-06T21:59:35.000-10:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2011-03-06 Set edgecolor to 'face' for scatter asterisk-type
+           symbols; this fixes a bug in which these symbols were
+           not responding to the c kwarg.  The symbols have no
+           face area, so only the edgecolor is visible. - EF
+
 2011-02-27 Support libpng version 1.5.x; suggestion by Michael
            Albert. Changed installation specification to a
            minimum of libpng version 1.2.  - EF
diff --git a/examples/pylab_examples/scatter_star_poly.py b/examples/pylab_examples/scatter_star_poly.py
@@ -1,27 +1,30 @@
-import pylab
+import numpy as np
+import matplotlib.pyplot as plt
 
-x = pylab.rand(10)
-y = pylab.rand(10)
 
-pylab.subplot(321)
-pylab.scatter(x,y,s=80,marker=">")
+x = np.random.rand(10)
+y = np.random.rand(10)
+z = np.sqrt(x**2 + y**2)
 
-pylab.subplot(322)
-pylab.scatter(x,y,s=80,marker=(5,0))
+plt.subplot(321)
+plt.scatter(x,y,s=80, c=z, marker=">")
+
+plt.subplot(322)
+plt.scatter(x,y,s=80, c=z, marker=(5,0))
 
 verts = zip([-1.,1.,1.,-1.],[-1.,-1.,1.,-1.])
-pylab.subplot(323)
-pylab.scatter(x,y,s=80,marker=(verts,0))
+plt.subplot(323)
+plt.scatter(x,y,s=80, c=z, marker=(verts,0))
 # equivalent:
-#pylab.scatter(x,y,s=80,marker=None, verts=verts)
+#plt.scatter(x,y,s=80, c=z, marker=None, verts=verts)
 
-pylab.subplot(324)
-pylab.scatter(x,y,s=80,marker=(5,1))
+plt.subplot(324)
+plt.scatter(x,y,s=80, c=z, marker=(5,1))
 
-pylab.subplot(325)
-pylab.scatter(x,y,s=80,marker='+')
+plt.subplot(325)
+plt.scatter(x,y,s=80, c=z, marker='+')
 
-pylab.subplot(326)
-pylab.scatter(x,y,s=80,marker=(5,2), edgecolor='g')
+plt.subplot(326)
+plt.scatter(x,y,s=80, c=z, marker=(5,2))
 
-pylab.show()
+plt.show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -5791,7 +5791,7 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
                 collection = mcoll.AsteriskPolygonCollection(
                     numsides, rotation, scales,
                     facecolors = colors,
-                    edgecolors = edgecolors,
+                    edgecolors = 'face',
                     linewidths = linewidths,
                     offsets = zip(x,y),
                     transOffset = self.transData,
