matplotlib-checkins Mailing List for matplotlib

Revision: 8220
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8220&view=rev
Author: efiring
Date: 2010年04月03日 23:22:48 +0000 (2010年4月03日)
Log Message:
-----------
Update docs, examples, for new color kwarg in hist.
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/doc/api/api_changes.rst
 trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010年04月03日 07:18:18 UTC (rev 8219)
+++ trunk/matplotlib/CHANGELOG	2010年04月03日 23:22:48 UTC (rev 8220)
@@ -1,7 +1,10 @@
-2010年03月24日 refactor colorbar code so that no cla() is necessary when 
+2010年04月03日 Added color kwarg to Axes.hist(), based on work by
+ Jeff Klukas. - EF
+
+2010年03月24日 refactor colorbar code so that no cla() is necessary when
 mappable is changed. -JJL
 
-2010年03月22日 fix incorrect rubber band during the zoom mode when mouse 
+2010年03月22日 fix incorrect rubber band during the zoom mode when mouse
 leaves the axes. -JJL
 
 2010年03月21日 x/y key during the zoom mode only changes the x/y limits. -JJL
Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst	2010年04月03日 07:18:18 UTC (rev 8219)
+++ trunk/matplotlib/doc/api/api_changes.rst	2010年04月03日 23:22:48 UTC (rev 8220)
@@ -10,6 +10,9 @@
 Changes beyond 0.99.x
 =====================
 
+* The :meth:`matplotlib.axes.Axes.hist` *color* kwarg now accepts
+ a sequence of color specs to match a sequence of datasets.
+
 * The :class:'~matplotlib.collections.EllipseCollection' has been
 changed in two ways:
 
@@ -19,7 +22,7 @@
 
 + The *height* and *width* kwargs have been changed to specify
 the height and width, again for consistency with
- :class:'~matplotlib.patches.Ellipse`, and to better match
+ :class:`~matplotlib.patches.Ellipse`, and to better match
 their names; previously they specified the half-height and
 half-width.
 
Modified: trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py	2010年04月03日 07:18:18 UTC (rev 8219)
+++ trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py	2010年04月03日 23:22:48 UTC (rev 8220)
@@ -63,13 +63,18 @@
 
 #
 # histogram has the ability to plot multiple data in parallel ...
+# Note the new color kwarg, used to override the default, which
+# uses the line color cycle.
 #
 P.figure()
 
 # create a new data-set
 x = mu + sigma*P.randn(1000,3)
 
-n, bins, patches = P.hist(x, 10, normed=1, histtype='bar')
+n, bins, patches = P.hist(x, 10, normed=1, histtype='bar',
+ color=['crimson', 'burlywood', 'chartreuse'],
+ label=['Crimson', 'Burlywood', 'Chartreuse'])
+P.legend()
 
 #
 # ... or we can stack the data
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8219
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8219&view=rev
Author: efiring
Date: 2010年04月03日 07:18:18 +0000 (2010年4月03日)
Log Message:
-----------
Axes.hist: add color kwarg.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年04月02日 21:29:38 UTC (rev 8218)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年04月03日 07:18:18 UTC (rev 8219)
@@ -7097,8 +7097,10 @@
 *patches*) will be returned.
 
 *color*:
+ Color spec or sequence of color specs, one per
+ dataset. Default (*None*) uses the standard line
+ color sequence.
 
-
 kwargs are used to update the properties of the hist
 :class:`~matplotlib.patches.Rectangle` instances:
 
@@ -7163,6 +7165,14 @@
 
 nx = len(x) # number of datasets
 
+ if color is None:
+ color = [self._get_lines.color_cycle.next()
+ for i in xrange(nx)]
+ else:
+ color = mcolors.colorConverter.to_rgba_array(color)
+ if len(color) != nx:
+ raise ValueError("color kwarg must have one color per dataset")
+
 if weights is not None:
 if isinstance(w, np.ndarray):
 w = np.array(weights)
@@ -7245,11 +7255,10 @@
 else: # orientation == 'vertical'
 _barfunc = self.bar
 
- for m in n:
- color = self._get_lines.color_cycle.next()
+ for m, c in zip(n, color):
 patch = _barfunc(bins[:-1]+boffset, m, width, bottom,
 align='center', log=log,
- color=color)
+ color=c)
 patches.append(patch)
 if stacked:
 if bottom is None:
@@ -7277,20 +7286,19 @@
 
 fill = (histtype == 'stepfilled')
 
- for m in n:
+ for m, c in zip(n, color):
 y[1:-1:2], y[2::2] = m, m
 if log:
 y[y<1e-100]=1e-100
 if orientation == 'horizontal':
 x,y = y,x
 
- color = self._get_lines.color_cycle.next()
 if fill:
 patches.append( self.fill(x, y,
- closed=False, facecolor=color) )
+ closed=False, facecolor=c) )
 else:
 patches.append( self.fill(x, y,
- closed=False, edgecolor=color, fill=False) )
+ closed=False, edgecolor=c, fill=False) )
 
 # adopted from adjust_x/ylim part of the bar method
 if orientation == 'horizontal':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.