matplotlib-checkins Mailing List for matplotlib

Revision: 5413
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5413&view=rev
Author: jswhit
Date: 2008年06月06日 11:19:53 -0700 (2008年6月06日)
Log Message:
-----------
fix typos
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/fcstmaps.py
Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py	2008年06月06日 16:57:06 UTC (rev 5412)
+++ trunk/toolkits/basemap/examples/fcstmaps.py	2008年06月06日 18:19:53 UTC (rev 5413)
@@ -12,8 +12,7 @@
 if len(sys.argv) > 1:
 YYYYMMDD = sys.argv[1]
 else:
- YYYYMMDD = datetime.datetime.today().strftime('%Y%m%d')
-YYYYMM = YYYYMMDD[0:6]
+ YYYYMMDD = datetime.datetime.today().strftime('%Y%m%d')
 
 # set OpenDAP server URL.
 URLbase="http://nomad3.ncep.noaa.gov:9090/dods/mrf/mrf"
@@ -24,7 +23,7 @@
 except:
 msg = """
 opendap server not providing the requested data.
-Try another date by providing YYYYMM on command line."""
+Try another date by providing YYYYMMDD on command line."""
 raise IOError, msg
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5412
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5412&view=rev
Author: mdboom
Date: 2008年06月06日 09:57:06 -0700 (2008年6月06日)
Log Message:
-----------
Fix callbacks accumulating bug by using a ScaledTranslation rather
than a callback on dpi change.
Fix ScaledTranslation.__repr__
(Thanks Stan West for tracking down and fixing these issues).
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
 trunk/matplotlib/lib/matplotlib/transforms.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008年06月06日 16:34:00 UTC (rev 5411)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008年06月06日 16:57:06 UTC (rev 5412)
@@ -827,8 +827,8 @@
 props = font_manager.FontProperties(size=rcParams['axes.titlesize'])
 
 
- self.titleOffsetTrans = mtransforms.Affine2D().translate(
- 0.0, 5.0*self.figure.dpi/72.)
+ self.titleOffsetTrans = mtransforms.ScaledTranslation(
+ 0.0, 5.0 / 72.0, self.figure.dpi_scale_trans)
 self.title = mtext.Text(
 x=0.5, y=1.0, text='',
 fontproperties=props,
@@ -859,17 +859,7 @@
 self.xaxis.set_clip_path(self.axesPatch)
 self.yaxis.set_clip_path(self.axesPatch)
 
- self.titleOffsetTrans.clear().translate(
- 0.0, 5.0*self.figure.dpi/72.)
 
- def on_dpi_change(fig):
- self.titleOffsetTrans.clear().translate(
- 0.0, 5.0*fig.dpi/72.)
-
- self.figure.callbacks.connect('dpi_changed', on_dpi_change)
-
-
-
 def clear(self):
 'clear the axes'
 self.cla()
Modified: trunk/matplotlib/lib/matplotlib/transforms.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/transforms.py	2008年06月06日 16:34:00 UTC (rev 5411)
+++ trunk/matplotlib/lib/matplotlib/transforms.py	2008年06月06日 16:57:06 UTC (rev 5412)
@@ -2043,7 +2043,7 @@
 self._inverted = None
 
 def __repr__(self):
- return "ScaledTranslation(%s)" % (self._t)
+ return "ScaledTranslation(%s)" % (self._t,)
 __str__ = __repr__
 
 def get_matrix(self):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5411
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5411&view=rev
Author: mmetz_bn
Date: 2008年06月06日 09:34:00 -0700 (2008年6月06日)
Log Message:
-----------
a further hist() update
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008年06月06日 12:57:24 UTC (rev 5410)
+++ trunk/matplotlib/CHANGELOG	2008年06月06日 16:34:00 UTC (rev 5411)
@@ -1,3 +1,9 @@
+2008年06月06日 hist() revision, applied ideas proposed by Erik Tollerud and 
+ Olle Engdegard: make histtype='step' unfilled by default
+ and introduce histtype='stepfilled'; use default color
+ cycle; introduce reverse cumulative histogram; new align
+ keyword - MM
+
 2008年06月06日 Fix closed polygon patch and also provide the option to
 not close the polygon - MGD
 
Modified: trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py	2008年06月06日 12:57:24 UTC (rev 5410)
+++ trunk/matplotlib/examples/pylab_examples/histogram_demo_extended.py	2008年06月06日 16:34:00 UTC (rev 5411)
@@ -12,7 +12,7 @@
 x = mu + sigma*P.randn(10000)
 
 # the histogram of the data with histtype='step'
-n, bins, patches = P.hist(x, 50, normed=1, histtype='step')
+n, bins, patches = P.hist(x, 50, normed=1, histtype='stepfilled')
 P.setp(patches, 'facecolor', 'g', 'alpha', 0.75)
 
 # add a line showing the expected distribution
@@ -35,7 +35,6 @@
 P.figure()
 
 n, bins, patches = P.hist(x, 50, normed=1, histtype='step', cumulative=True)
-P.setp(patches, 'facecolor', 'b', 'alpha', 0.75)
 
 # add a line showing the expected distribution
 y = P.normpdf( bins, mu, sigma).cumsum()
@@ -47,13 +46,17 @@
 x = mu + sigma2*P.randn(10000)
 
 n, bins, patches = P.hist(x, bins=bins, normed=1, histtype='step', cumulative=True)
-P.setp(patches, 'facecolor', 'r', 'alpha', 0.5)
 
 # add a line showing the expected distribution
 y = P.normpdf( bins, mu, sigma2).cumsum()
 y /= y[-1]
 l = P.plot(bins, y, 'r--', linewidth=1.5)
 
+# finally overplot a reverted cumulative histogram
+n, bins, patches = P.hist(x, bins=bins, normed=1,
+ histtype='step', cumulative=-1)
+
+
 P.grid(True)
 P.ylim(0, 1.05)
 
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008年06月06日 12:57:24 UTC (rev 5410)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008年06月06日 16:34:00 UTC (rev 5411)
@@ -5634,7 +5634,7 @@
 
 
 def hist(self, x, bins=10, normed=False, cumulative=False,
- bottom=None, histtype='bar', align='edge',
+ bottom=None, histtype='bar', align='mid',
 orientation='vertical', rwidth=None, log=False, **kwargs):
 """
 call signature::
@@ -5667,20 +5667,26 @@
 cumulative:
 if True then a histogram is computed where each bin
 gives the counts in that bin plus all bins for smaller values.
- The last bin gives the total number of datapoints. If normed is
- also True then the histogram is normalized such that the last bin
- equals one.
+ The last bin gives the total number of datapoints. If normed
+ is also True then the histogram is normalized such that the
+ last bin equals one. If cumulative evaluates to less that one
+ (e.g. -1), the direction of accumulation is reversed. In this
+ case, If normed is also True then the histogram is normalized
+ such that the first bin equals one.
 
 histtype:
- [ 'bar' | 'barstacked' | 'step' ] The type of histogram
- to draw. 'bar' is a traditional bar-type histogram,
+ [ 'bar' | 'barstacked' | 'step' | 'stepfilled' ] The type of
+ histogram to draw. 'bar' is a traditional bar-type histogram,
 'barstacked' is a bar-type histogram where multiple data are
- stacked on top of each other, and 'step' generates a lineplot.
+ stacked on top of each other. step' generates a lineplot that
+ is by default unfilled, and 'stepfilled' generates a lineplot
+ that this by default filled.
 
 align:
- ['edge' | 'center' ] Controles how the histogram is plotted.
- If 'edge', bars are centered between the bin edges.
- If 'center', bars are centered on the left bin edges
+ ['left' | 'mid' | 'right' ] Controles how the histogram is
+ plotted. If 'left', bars are centered on the left bin edges.
+ If 'mid', bars are centered between the bin edges. If 'right',
+ bars are centered on the right bin edges.
 
 orientation:
 [ 'horizontal' | 'vertical' ] If horizontal, barh will be used
@@ -5716,7 +5722,6 @@
 warnings.warn('2D hist should be nsamples x nvariables; this looks transposed')
 
 if len(x.shape)==2:
-
 n = []
 for i in xrange(x.shape[1]):
 # this will automatically overwrite bins,
@@ -5730,13 +5735,16 @@
 n = [n,]
 
 if cumulative:
+ slc = slice(None)
+ if cbook.is_numlike(cumulative):
+ if cumulative < 0:
+ slc = slice(None,None,-1)
+
 if normed:
- n = [(m * np.diff(bins)).cumsum() for m in n]
+ n = [(m * np.diff(bins))[slc].cumsum()[slc] for m in n]
 else:
- n = [m.cumsum() for m in n]
+ n = [m[slc].cumsum()[slc] for m in n]
 
- ccount = 0
- colors = _process_plot_var_args.defaultColors[:]
 patches = []
 
 if histtype.startswith('bar'):
@@ -5763,14 +5771,16 @@
 else:
 raise ValueError, 'invalid histtype: %s' % histtype
 
- if align=='edge':
+ if align == 'mid' or align == 'edge':
 boffset += 0.5*totwidth
- elif align != 'center':
+ elif align == 'right':
+ boffset += totwidth
+ elif align != 'left' and align != 'center':
 raise ValueError, 'invalid align: %s' % align
 
 if orientation == 'horizontal':
 for m in n:
- color = colors[ccount % len(colors)]
+ color = self._get_lines._get_next_cycle_color()
 patch = self.barh(bins[:-1]+boffset, m, height=width,
 left=bottom, align='center', log=log,
 color=color)
@@ -5779,10 +5789,9 @@
 if bottom is None: bottom = 0.0
 bottom += m
 boffset += dw
- ccount += 1
 elif orientation == 'vertical':
 for m in n:
- color = colors[ccount % len(colors)]
+ color = self._get_lines._get_next_cycle_color()
 patch = self.bar(bins[:-1]+boffset, m, width=width,
 bottom=bottom, align='center', log=log,
 color=color)
@@ -5791,19 +5800,20 @@
 if bottom is None: bottom = 0.0
 bottom += m
 boffset += dw
- ccount += 1
 else:
 raise ValueError, 'invalid orientation: %s' % orientation
 
- elif histtype == 'step':
+ elif histtype.startswith('step'):
 x = np.zeros( 2*len(bins), np.float_ )
 y = np.zeros( 2*len(bins), np.float_ )
 
 x[0::2], x[1::2] = bins, bins
 
- if align == 'center':
+ if align == 'left' or align == 'center':
 x -= 0.5*(bins[1]-bins[0])
- elif align != 'edge':
+ elif align == 'right':
+ x += 0.5*(bins[1]-bins[0])
+ elif align != 'mid' and align != 'edge':
 raise ValueError, 'invalid align: %s' % align
 
 if log:
@@ -5812,6 +5822,12 @@
 self.set_xscale('log')
 elif orientation == 'vertical':
 self.set_yscale('log')
+ 
+ fill = False
+ if histtype == 'stepfilled':
+ fill = True
+ elif histtype != 'step':
+ raise ValueError, 'invalid histtype: %s' % histtype
 
 for m in n:
 y[1:-1:2], y[2::2] = m, m
@@ -5819,7 +5835,14 @@
 x,y = y,x
 elif orientation != 'vertical':
 raise ValueError, 'invalid orientation: %s' % orientation
- patches.append( self.fill(x,y,closed=False) )
+ 
+ color = self._get_lines._get_next_cycle_color()
+ if fill:
+ patches.append( self.fill(x, y, 
+ closed=False, facecolor=color) )
+ else:
+ patches.append( self.fill(x, y,
+ closed=False, edgecolor=color, 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.

Revision: 5410
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5410&view=rev
Author: mdboom
Date: 2008年06月06日 05:57:24 -0700 (2008年6月06日)
Log Message:
-----------
Fix polygon closing and provide option not to close (used by hist(histtype="step"))
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/axes.py
 trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008年06月06日 12:07:53 UTC (rev 5409)
+++ trunk/matplotlib/CHANGELOG	2008年06月06日 12:57:24 UTC (rev 5410)
@@ -1,3 +1,6 @@
+2008年06月06日 Fix closed polygon patch and also provide the option to
+ not close the polygon - MGD
+
 2008年06月05日 Fix some dpi-changing-related problems with PolyCollection,
 as called by Axes.scatter() - MGD
 
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008年06月06日 12:07:53 UTC (rev 5409)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008年06月06日 12:57:24 UTC (rev 5410)
@@ -345,12 +345,16 @@
 seg = mpatches.Polygon(zip(x, y),
 facecolor = facecolor,
 fill=True,
+ closed=closed
 )
 self.set_patchprops(seg, **kwargs)
 ret.append(seg)
 
- if self.command == 'plot': func = makeline
- else: func = makefill
+ if self.command == 'plot':
+ func = makeline
+ else:
+ closed = kwargs.pop("closed")
+ func = makefill
 if multicol:
 for j in range(y.shape[1]):
 func(x[:,j], y[:,j])
@@ -387,12 +391,16 @@
 seg = mpatches.Polygon(zip(x, y),
 facecolor = facecolor,
 fill=True,
+ closed=closed
 )
 self.set_patchprops(seg, **kwargs)
 ret.append(seg)
 
- if self.command == 'plot': func = makeline
- else: func = makefill
+ if self.command == 'plot':
+ func = makeline
+ else:
+ closed = kwargs.pop('closed')
+ func = makefill
 
 if multicol:
 for j in range(y.shape[1]):
@@ -4934,6 +4942,8 @@
 
 See examples/fill_between.py for more examples.
 
+ The closed kwarg will close the polygon when True (default).
+
 kwargs control the Polygon properties:
 %(Polygon)s
 """
@@ -5809,7 +5819,7 @@
 x,y = y,x
 elif orientation != 'vertical':
 raise ValueError, 'invalid orientation: %s' % orientation
- patches.append( self.fill(x,y) )
+ patches.append( self.fill(x,y,closed=False) )
 
 # adopted from adjust_x/ylim part of the bar method
 if orientation == 'horizontal':
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py	2008年06月06日 12:07:53 UTC (rev 5409)
+++ trunk/matplotlib/lib/matplotlib/patches.py	2008年06月06日 12:57:24 UTC (rev 5410)
@@ -531,7 +531,7 @@
 def __str__(self):
 return "Poly((%g, %g) ...)" % tuple(self._path.vertices[0])
 
- def __init__(self, xy, **kwargs):
+ def __init__(self, xy, closed=True, **kwargs):
 """
 xy is a numpy array with shape Nx2
 
@@ -541,7 +541,7 @@
 """
 Patch.__init__(self, **kwargs)
 xy = np.asarray(xy, np.float_)
- if len(xy) and xy[0] != xy[-1]:
+ if closed and len(xy) and (xy[0] != xy[-1]).any():
 xy = np.concatenate([xy, [xy[0]]])
 self._path = Path(xy)
 __init__.__doc__ = cbook.dedent(__init__.__doc__) % artist.kwdocd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5409
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5409&view=rev
Author: mdboom
Date: 2008年06月06日 05:07:53 -0700 (2008年6月06日)
Log Message:
-----------
Fix bug in recent PolyCollection sizing change.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/collections.py
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py	2008年06月06日 03:45:57 UTC (rev 5408)
+++ trunk/matplotlib/lib/matplotlib/collections.py	2008年06月06日 12:07:53 UTC (rev 5409)
@@ -492,7 +492,7 @@
 renderer.close_group(self.__class__.__name__)
 
 class PolyCollection(Collection):
- def __init__(self, verts, sizes = (1, ), **kwargs):
+ def __init__(self, verts, sizes = None, **kwargs):
 """
 verts is a sequence of ( verts0, verts1, ...) where verts_i is
 a sequence of xy tuples of vertices, or an equivalent
@@ -518,10 +518,11 @@
 def draw(self, renderer):
 # sizes is the area of the circle circumscribing the polygon
 # in points^2
- self._transforms = [
- transforms.Affine2D().scale(
- (np.sqrt(x) * renderer.dpi / 72.0))
- for x in self._sizes]
+ if self._sizes is not None:
+ self._transforms = [
+ transforms.Affine2D().scale(
+ (np.sqrt(x) * renderer.dpi / 72.0))
+ for x in self._sizes]
 return Collection.draw(self, renderer)
 
 class BrokenBarHCollection(PolyCollection):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5408
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5408&view=rev
Author: jdh2358
Date: 2008年06月05日 20:45:57 -0700 (2008年6月05日)
Log Message:
-----------
added draft outline
Modified Paths:
--------------
 trunk/matplotlib/doc/devel/index.rst
Added Paths:
-----------
 trunk/matplotlib/doc/devel/outline.rst
Modified: trunk/matplotlib/doc/devel/index.rst
===================================================================
--- trunk/matplotlib/doc/devel/index.rst	2008年06月05日 22:23:50 UTC (rev 5407)
+++ trunk/matplotlib/doc/devel/index.rst	2008年06月06日 03:45:57 UTC (rev 5408)
@@ -13,4 +13,4 @@
 documenting_mpl.rst
 transformations.rst
 add_new_projection.rst
-
+ outline.rst
Added: trunk/matplotlib/doc/devel/outline.rst
===================================================================
--- trunk/matplotlib/doc/devel/outline.rst	 (rev 0)
+++ trunk/matplotlib/doc/devel/outline.rst	2008年06月06日 03:45:57 UTC (rev 5408)
@@ -0,0 +1,99 @@
+.. _outline:
+
+************
+Docs outline
+************
+
+Proposed chapters for the docs, who has responsibility for them, and
+who reviews them. The "unit" doesn't have to be a full chapter
+(though in some cases it will be), it may be a chapter or a section in
+a chapter.
+
+=============================== ==================== =========== ===================
+User's guide unit Author Status Reviewer
+=============================== ==================== =========== ===================
+contouring Eric ? no author Perry ?
+quiver plots Eric ? no author ?
+quadmesh ? no author ?
+images ? no author ?
+histograms Manuel ? no author Erik Tollerud ?
+bar / errorbar ? no author ?
+x-y plots ? no author ?
+time series plots ? no author ?
+date plots John has author ?
+working with data John has author ?
+custom ticking ? no author ?
+masked data Eric ? no author ?
+text ? no author ?
+patches ? no author ?
+legends ? no author ?
+animation John has author ?
+collections ? no author ?
+mathtext Michael ? submitted John
+fonts et al Michael ? no author ?
+pyplot tut John submitted Eric ?
+usetex Darren ? no author ?
+configuration Darren ? preliminary ?
+colormapping Perry ? no author Eric ?
+win32 install Charlie ? no author ?
+os x install Charlie ? no author ?
+linux install ? no author ?
+artist api John submitted ?
+event handling John submitted ?
+navigation John submitted ?
+interactive usage ? no author ?
+widgets ? no author ?
+ui - gtk ? no author ?
+ui - wx ? no author ?
+ui - tk ? no author ?
+ui - qt Darren ? no author ?
+backend - pdf Jouni ? no author ?
+backend - ps Darren ? no author ?
+backend - svg ? no author ?
+backend - agg ? no author ?
+backend - cairo ? no author ?
+=============================== ==================== =========== ===================
+
+Here is the ouline for the dev guide, much less fleshed out
+
+=============================== ==================== =========== ===================
+Developer's guide unit Author Status Reviewer
+=============================== ==================== =========== ===================
+the renderer John has author Michael ?
+the canvas John has author ?
+the artist John has author ?
+transforms Michael submitted John
+documenting mpl Darren submitted ?
+coding guide John submitted ?
+and_much_more ? ? ?
+=============================== ==================== =========== ===================
+
+And we might want to do a similar table for the FAQ, but that may also be overkill...
+
+If you agree to author a unit, remove the question mark by your name
+(or add your name if there is no candidate), and change the status to
+"has author". Once you have completed draft and checked it in, you
+can change the status to "submitted" and try to find a reviewer if you
+don't have one. The reviewer should read your chapter, test it for
+correctness (eg try your examples) and change the status to "complete"
+when done.
+
+You are free to lift and convert as much material from the web site or
+the existing latex user's guide as you see fit. The more the better.
+
+The UI chapters should give an example or two of using mpl with your
+GUI and any relevant info, such as version, installation, config,
+etc... The backend chapters should cover backend specific
+configuration (eg PS only options), what features are missing, etc...
+
+Please feel free to add units, volunteer to review or author a
+chapter, etc...
+
+It is probably easiest to be an editor. Once you have signed up to be
+an editor, if you have an author pester the author for a submission
+every so often. If you don't have an author, find one, and then pester
+them! Your only two responsibilities are getting your author to
+produce and checking their work, so don't be shy. You *do not* need
+to be an expert in the subject you are editing -- you should know
+something about it and be willing to read, test, give feedback and
+pester!
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.