Menu
▾
▴
matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(115) |
Aug
(120) |
Sep
(137) |
Oct
(170) |
Nov
(461) |
Dec
(263) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(120) |
Feb
(74) |
Mar
(35) |
Apr
(74) |
May
(245) |
Jun
(356) |
Jul
(240) |
Aug
(115) |
Sep
(78) |
Oct
(225) |
Nov
(98) |
Dec
(271) |
| 2009 |
Jan
(132) |
Feb
(84) |
Mar
(74) |
Apr
(56) |
May
(90) |
Jun
(79) |
Jul
(83) |
Aug
(296) |
Sep
(214) |
Oct
(76) |
Nov
(82) |
Dec
(66) |
| 2010 |
Jan
(46) |
Feb
(58) |
Mar
(51) |
Apr
(77) |
May
(58) |
Jun
(126) |
Jul
(128) |
Aug
(64) |
Sep
(50) |
Oct
(44) |
Nov
(48) |
Dec
(54) |
| 2011 |
Jan
(68) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <js...@us...> - 2009-08-07 00:38:24
|
Revision: 7412
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7412&view=rev
Author: jswhit
Date: 2009-08-07 00:38:17 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
make sure contour lines and filled contour intervals are consistent
Modified Paths:
--------------
trunk/toolkits/basemap/examples/contour_demo.py
Modified: trunk/toolkits/basemap/examples/contour_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/contour_demo.py 2009-08-06 20:27:58 UTC (rev 7411)
+++ trunk/toolkits/basemap/examples/contour_demo.py 2009-08-07 00:38:17 UTC (rev 7412)
@@ -19,13 +19,15 @@
ax = fig.add_axes([0.1,0.1,0.7,0.7])
# make a filled contour plot.
x, y = m(lons, lats)
-CS = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
-CS = m.contourf(x,y,hgt,15,cmap=plt.cm.jet)
+# create contour lines
+CS1 = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
+# fill between contour lines.
+CS2 = m.contourf(x,y,hgt,CS1.levels,cmap=plt.cm.jet)
# setup colorbar axes instance.
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h]) # setup colorbar axes
-plt.colorbar(drawedges=True, cax=cax) # draw colorbar
+plt.colorbar(CS2, drawedges=True, cax=cax) # draw colorbar
plt.axes(ax) # make the original axes current again
# draw coastlines and political boundaries.
m.drawcoastlines()
@@ -46,12 +48,12 @@
ax = fig.add_axes([0.1,0.1,0.7,0.7])
# make a filled contour plot.
x, y = m(lons, lats)
-CS = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
-CS = m.contourf(x,y,hgt,15,cmap=plt.cm.jet)
+CS1 = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
+CS2 = m.contourf(x,y,hgt,CS1.levels,cmap=plt.cm.jet)
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h]) # setup colorbar axes
-plt.colorbar(drawedges=True, cax=cax) # draw colorbar
+plt.colorbar(CS2, drawedges=True, cax=cax) # draw colorbar
plt.axes(ax) # make the original axes current again
# draw coastlines and political boundaries.
m.drawcoastlines()
@@ -72,12 +74,12 @@
ax = fig.add_axes([0.1,0.1,0.7,0.7])
# make a filled contour plot.
x, y = m(lons, lats)
-CS = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
-CS = m.contourf(x,y,hgt,15,cmap=plt.cm.jet)
+CS1 = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
+CS2 = m.contourf(x,y,hgt,CS1.levels,cmap=plt.cm.jet)
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h]) # setup colorbar axes
-plt.colorbar(drawedges=True, cax=cax) # draw colorbar
+plt.colorbar(CS2, drawedges=True, cax=cax) # draw colorbar
plt.axes(ax) # make the original axes current again
# draw coastlines and political boundaries.
m.drawcoastlines()
@@ -98,12 +100,12 @@
ax = fig.add_axes([0.1,0.1,0.7,0.7])
# make a filled contour plot.
x, y = m(lons, lats)
-CS = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
-CS = m.contourf(x,y,hgt,15,cmap=plt.cm.jet)
+CS1 = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
+CS2 = m.contourf(x,y,hgt,CS2.levels,cmap=plt.cm.jet)
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h]) # setup colorbar axes
-plt.colorbar(drawedges=True, cax=cax) # draw colorbar
+plt.colorbar(CS2, drawedges=True, cax=cax) # draw colorbar
plt.axes(ax) # make the original axes current again
# draw coastlines and political boundaries.
m.drawcoastlines()
@@ -125,12 +127,12 @@
ax = fig.add_axes([0.1,0.1,0.7,0.7])
# make a filled contour plot.
x, y = m(lons, lats)
-CS = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
-CS = m.contourf(x,y,hgt,15,cmap=plt.cm.jet)
+CS1 = m.contour(x,y,hgt,15,linewidths=0.5,colors='k')
+CS2 = m.contourf(x,y,hgt,CS2.levels,cmap=plt.cm.jet)
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h]) # setup colorbar axes
-plt.colorbar(drawedges=True, cax=cax) # draw colorbar
+plt.colorbar(CS2, drawedges=True, cax=cax) # draw colorbar
plt.axes(ax) # make the original axes current again
# draw coastlines and political boundaries.
m.drawcoastlines()
@@ -144,4 +146,3 @@
plt.title('Orthographic Filled Contour Demo')
print 'plotting with orthographic basemap ..'
plt.show()
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2009-08-06 20:28:04
|
Revision: 7411
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7411&view=rev
Author: jswhit
Date: 2009-08-06 20:27:58 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
thanks to Christoph Gohlke (for building windows installers)
Modified Paths:
--------------
trunk/toolkits/basemap/README
Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README 2009-08-06 20:05:41 UTC (rev 7410)
+++ trunk/toolkits/basemap/README 2009-08-06 20:27:58 UTC (rev 7411)
@@ -138,5 +138,7 @@
David Huard
Mauro Cavalcanti
Chris Murphy
+Pierre Gerard-Marchant
+Christoph Gohlke
for valuable contributions.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2009-08-06 20:05:55
|
Revision: 7410
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7410&view=rev
Author: efiring
Date: 2009-08-06 20:05:41 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Turn off contourf compound path generation; enable ContourSet as contour arg.
The former change is part of a continuing effort to make compound
paths work; in its present state, users should see no difference.
The second change is to make it easier to use line contours with
filled contours.
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/contourf_demo.py
trunk/matplotlib/lib/matplotlib/contour.py
Modified: trunk/matplotlib/examples/pylab_examples/contourf_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/contourf_demo.py 2009-08-06 19:28:16 UTC (rev 7409)
+++ trunk/matplotlib/examples/pylab_examples/contourf_demo.py 2009-08-06 20:05:41 UTC (rev 7410)
@@ -55,9 +55,10 @@
# Note that in the following, we explicitly pass in a subset of
# the contour levels used for the filled contours. Alternatively,
-# We could pass in additional levels to provide extra resolution.
+# We could pass in additional levels to provide extra resolution,
+# or leave out the levels kwarg to use all of the original levels.
-CS2 = contour(X, Y, Z, CS.levels[::2],
+CS2 = contour(CS, levels=CS.levels[::2],
colors = 'r',
origin=origin,
hold='on')
Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py 2009-08-06 19:28:16 UTC (rev 7409)
+++ trunk/matplotlib/lib/matplotlib/contour.py 2009-08-06 20:05:41 UTC (rev 7410)
@@ -539,6 +539,7 @@
"""
self.ax = ax
+ self.noslit = kwargs.get('noslit', False) # **Temporary**
self.levels = kwargs.get('levels', None)
self.filled = kwargs.get('filled', False)
self.linewidths = kwargs.get('linewidths', None)
@@ -571,12 +572,31 @@
if self.colors is not None and cmap is not None:
raise ValueError('Either colors or cmap must be None')
if self.origin == 'image': self.origin = mpl.rcParams['image.origin']
- x, y, z = self._contour_args(*args) # also sets self.levels,
- # self.layers
+
+ if isinstance(args[0], ContourSet):
+ C = args[0].Cntr
+ if self.levels is None:
+ self.levels = args[0].levels
+ else:
+ x, y, z = self._contour_args(*args)
+
+ x0 = ma.minimum(x)
+ x1 = ma.maximum(x)
+ y0 = ma.minimum(y)
+ y1 = ma.maximum(y)
+ self.ax.update_datalim([(x0,y0), (x1,y1)])
+ self.ax.autoscale_view()
+ _mask = ma.getmask(z)
+ if _mask is ma.nomask:
+ _mask = None
+ C = _cntr.Cntr(x, y, z.filled(), _mask)
+ self.Cntr = C
+ self._process_levels()
+
if self.colors is not None:
cmap = colors.ListedColormap(self.colors, N=len(self.layers))
if self.filled:
- self.collections = cbook.silent_list('collections.PolyCollection')
+ self.collections = cbook.silent_list('collections.PathCollection')
else:
self.collections = cbook.silent_list('collections.LineCollection')
self.segs = []
@@ -590,14 +610,9 @@
kw['norm'] = norm
cm.ScalarMappable.__init__(self, **kw) # sets self.cmap;
self._process_colors()
- _mask = ma.getmask(z)
- if _mask is ma.nomask:
- _mask = None
-
if self.filled:
if self.linewidths is not None:
warnings.warn('linewidths is ignored by contourf')
- C = _cntr.Cntr(x, y, z.filled(), _mask)
lowers = self._levels[:-1]
uppers = self._levels[1:]
for level, level_upper in zip(lowers, uppers):
@@ -620,7 +635,6 @@
tlinewidths = self._process_linewidths()
self.tlinewidths = tlinewidths
tlinestyles = self._process_linestyles()
- C = _cntr.Cntr(x, y, z.filled(), _mask)
for level, width, lstyle in zip(self.levels, tlinewidths, tlinestyles):
nlist = C.trace(level)
nseg = len(nlist)//2
@@ -637,24 +651,18 @@
self.segs.append(segs)
self.kinds.append(kinds)
self.changed() # set the colors
- x0 = ma.minimum(x)
- x1 = ma.maximum(x)
- y0 = ma.minimum(y)
- y1 = ma.maximum(y)
- self.ax.update_datalim([(x0,y0), (x1,y1)])
- self.ax.autoscale_view()
- @staticmethod
- def _make_paths(segs, kinds):
+ def _make_paths(self, segs, kinds):
paths = []
for seg, kind in zip(segs, kinds):
codes = np.zeros(kind.shape, dtype=mpath.Path.code_type)
codes.fill(mpath.Path.LINETO)
codes[0] = mpath.Path.MOVETO
# points that begin a slit or are in it:
- in_slit = kind[:-1] >= _cntr._slitkind
# use moveto for any point *following* such a point
- codes[1:][in_slit] = mpath.Path.MOVETO
+ if self.noslit:
+ in_slit = kind[:-1] >= _cntr._slitkind
+ codes[1:][in_slit] = mpath.Path.MOVETO
paths.append(mpath.Path(seg, codes))
return paths
@@ -813,14 +821,10 @@
"Last %s arg must give levels; see help(%s)" % (fn,fn))
if self.filled and len(lev) < 2:
raise ValueError("Filled contours require at least 2 levels.")
- # Workaround for cntr.c bug wrt masked interior regions:
- #if filled:
- # z = ma.masked_array(z.filled(-1e38))
- # It's not clear this is any better than the original bug.
self.levels = lev
- #if self._auto and self.extend in ('both', 'min', 'max'):
- # raise TypeError("Auto level selection is inconsistent "
- # + "with use of 'extend' kwarg")
+ return (x, y, z)
+
+ def _process_levels(self):
self._levels = list(self.levels)
if self.extend in ('both', 'min'):
self._levels.insert(0, min(self.levels[0],self.zmin) - 1)
@@ -841,7 +845,6 @@
if self.extend in ('both', 'max'):
self.layers[-1] = 0.5 * (self.vmax + self._levels[-2])
- return (x, y, z)
def _process_colors(self):
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ry...@us...> - 2009-08-06 19:28:22
|
Revision: 7409
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7409&view=rev
Author: ryanmay
Date: 2009-08-06 19:28:16 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Tweak solution for hiding colorbar_doc to sync with trunk.
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/pyplot.py
Modified: branches/v0_99_maint/lib/matplotlib/pyplot.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/pyplot.py 2009-08-06 19:24:40 UTC (rev 7408)
+++ branches/v0_99_maint/lib/matplotlib/pyplot.py 2009-08-06 19:28:16 UTC (rev 7409)
@@ -1358,8 +1358,7 @@
## Plotting part 1: manually generated functions and wrappers ##
-
-from matplotlib.colorbar import colorbar_doc as _colorbar_doc
+import matplotlib.colorbar
def colorbar(mappable=None, cax=None, ax=None, **kw):
if mappable is None:
mappable = gci()
@@ -1369,7 +1368,7 @@
ret = gcf().colorbar(mappable, cax = cax, ax=ax, **kw)
draw_if_interactive()
return ret
-colorbar.__doc__ = _colorbar_doc
+colorbar.__doc__ = matplotlib.colorbar.colorbar_doc
def clim(vmin=None, vmax=None):
"""
@@ -2691,5 +2690,3 @@
if im is not None:
im.set_cmap(cm.spectral)
draw_if_interactive()
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ry...@us...> - 2009-08-06 19:24:51
|
Revision: 7408
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7408&view=rev
Author: ryanmay
Date: 2009-08-06 19:24:40 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Add missing import.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/pyplot.py
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2009-08-06 18:51:58 UTC (rev 7407)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009-08-06 19:24:40 UTC (rev 7408)
@@ -1358,7 +1358,7 @@
## Plotting part 1: manually generated functions and wrappers ##
-
+import matplotlib.colorbar
def colorbar(mappable=None, cax=None, ax=None, **kw):
if mappable is None:
mappable = gci()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 18:52:10
|
Revision: 7407
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7407&view=rev
Author: jdh2358
Date: 2009-08-06 18:51:58 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
hide colorbar_doc a bit
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/indexsidebar.html
branches/v0_99_maint/doc/users/credits.rst
branches/v0_99_maint/doc/users/screenshots.rst
branches/v0_99_maint/doc/users/whats_new.rst
branches/v0_99_maint/lib/matplotlib/pyplot.py
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-06 18:49:24 UTC (rev 7406)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-06 18:51:58 UTC (rev 7407)
@@ -28,7 +28,7 @@
and join the matplotlib
mailing <a href="http://sourceforge.net/mail/?group_id=80706">lists</a>.
The <a href="{{ pathto('search') }}">search</a> tool searches all of
-the documentation, including full text search of almost 300 complete
+the documentation, including full text search of over 350 complete
examples which exercise almost every corner of matplotlib.</p>
<p>You can file bugs, patches and feature requests on the
Modified: branches/v0_99_maint/doc/users/credits.rst
===================================================================
--- branches/v0_99_maint/doc/users/credits.rst 2009-08-06 18:49:24 UTC (rev 7406)
+++ branches/v0_99_maint/doc/users/credits.rst 2009-08-06 18:51:58 UTC (rev 7407)
@@ -16,9 +16,9 @@
Jeremy O'Donoghue
wrote the wx backend
-Andrew Straw
- provided much of the log scaling architecture, the fill command, PIL
- support for imshow, and provided many examples
+Andrew Straw provided much of the log scaling architecture, the fill
+ command, PIL support for imshow, and provided many examples. He
+ also wrote the support for dropped axis spines.
Charles Twardy
provided the impetus code for the legend class and has made
@@ -28,7 +28,6 @@
made many enhancements to errorbar to support x and y
errorbar plots, and added a number of new marker types to plot.
-
John Gill
wrote the table class and examples, helped with support for
auto-legend placement, and added support for legending scatter
@@ -133,7 +132,7 @@
most aspects of matplotlib.
Daishi Harada
- added support for "Dashed Text". See ` dashpointlabel.py
+ added support for "Dashed Text". See `dashpointlabel.py
<examples/pylab_examples/dashpointlabel.py>`_ and
:class:`~matplotlib.text.TextWithDash`.
@@ -147,11 +146,10 @@
Charlie Moad
- contributed work to matplotlib's Cocoa support and does the binary
- builds and releases.
+ contributed work to matplotlib's Cocoa support and has done a lot of work on the OSX and win32 binary releases.
-Jouni K. Seppaenen
- wrote the PDF backend.
+Jouni K. Seppaenen wrote the PDF backend and contributed numerous
+ fixes to the code, to tex support and to the get_sample_data handler
Paul Kienzle
improved the picking infrastruture for interactive plots, and with
@@ -171,4 +169,7 @@
matplotlib, and Jonathon Taylor and Reinier Heeres ported it to the
refactored transform trunk.
-
+Jae-Joon Lee implemented fancy arrows and boxes, rewrote the legend
+ support to handle multiple columns and fancy text boxes, wrote the
+ axes grid toolkit, and has made numerous contributions to the code
+ and documentation
\ No newline at end of file
Modified: branches/v0_99_maint/doc/users/screenshots.rst
===================================================================
--- branches/v0_99_maint/doc/users/screenshots.rst 2009-08-06 18:49:24 UTC (rev 7406)
+++ branches/v0_99_maint/doc/users/screenshots.rst 2009-08-06 18:51:58 UTC (rev 7407)
@@ -45,8 +45,23 @@
.. plot:: mpl_examples/api/path_patch_demo.py
+.. _screenshots_mplot3d_surface:
+
+mplot3d
+=========
+
+The mplot3d toolkit (see :ref:`toolkit_mplot3d-tutorial` and
+:ref:`mplot3d-examples-index`) has support for simple 3d graphs
+including surface, wireframe, scatter, and bar charts (added in
+matlpotlib-0.99). Thanks to John Porter, Jonathon Taylor and Reinier
+Heeres for the mplot3d toolkit. The toolkit is included with all
+standard matplotlib installs.
+
+.. plot:: mpl_examples/mplot3d/surface3d_demo.py
+
.. _screenshots_ellipse_demo:
+
Ellipses
========
Modified: branches/v0_99_maint/doc/users/whats_new.rst
===================================================================
--- branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 18:49:24 UTC (rev 7406)
+++ branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 18:51:58 UTC (rev 7407)
@@ -18,8 +18,8 @@
Reinier Heeres has ported John Porter's mplot3d over to the new
matplotlib transformations framework, and it is now available as a
-toolkit mpl_toolkits.mplot3d. See the `examples
-<http://matplotlib.sourceforge.net/examples/mplot3d/index.html>`_ and
+toolkit mpl_toolkits.mplot3d (which now comes standard with all mpl
+installs). See :ref:`mplot3d-examples-index` and
:ref:`toolkit_mplot3d-tutorial`
.. plot:: pyplots/whats_new_99_mplot3d.py
@@ -29,10 +29,11 @@
axes grid toolkit
-----------------
-Jae Joon has added a new toolkit to ease displaying multiple images in
+Jae-Joon Lee has added a new toolkit to ease displaying multiple images in
matplotlib, as well as some support for curvilinear grids to support
-the world coordinate system. See :ref:`axes_grid_users-guide-index`
-and `examples <http://matplotlib.sourceforge.net/examples/axes_grid/index.html>`_
+the world coordinate system. The toolkit is included standard with all
+new mpl installs. See :ref:`axes_grid-examples-index` and
+:ref:`axes_grid_users-guide-index`.
.. plot:: pyplots/whats_new_99_axes_grid.py
Modified: branches/v0_99_maint/lib/matplotlib/pyplot.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/pyplot.py 2009-08-06 18:49:24 UTC (rev 7406)
+++ branches/v0_99_maint/lib/matplotlib/pyplot.py 2009-08-06 18:51:58 UTC (rev 7407)
@@ -1359,7 +1359,7 @@
## Plotting part 1: manually generated functions and wrappers ##
-from matplotlib.colorbar import colorbar_doc
+from matplotlib.colorbar import colorbar_doc as _colorbar_doc
def colorbar(mappable=None, cax=None, ax=None, **kw):
if mappable is None:
mappable = gci()
@@ -1369,7 +1369,7 @@
ret = gcf().colorbar(mappable, cax = cax, ax=ax, **kw)
draw_if_interactive()
return ret
-colorbar.__doc__ = colorbar_doc
+colorbar.__doc__ = _colorbar_doc
def clim(vmin=None, vmax=None):
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ry...@us...> - 2009-08-06 18:49:32
|
Revision: 7406
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7406&view=rev
Author: ryanmay
Date: 2009-08-06 18:49:24 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Don't leave colorbar_doc as part of the pyplot namespace.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/pyplot.py
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2009-08-06 17:09:25 UTC (rev 7405)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009-08-06 18:49:24 UTC (rev 7406)
@@ -1359,7 +1359,6 @@
## Plotting part 1: manually generated functions and wrappers ##
-from matplotlib.colorbar import colorbar_doc
def colorbar(mappable=None, cax=None, ax=None, **kw):
if mappable is None:
mappable = gci()
@@ -1369,7 +1368,7 @@
ret = gcf().colorbar(mappable, cax = cax, ax=ax, **kw)
draw_if_interactive()
return ret
-colorbar.__doc__ = colorbar_doc
+colorbar.__doc__ = matplotlib.colorbar.colorbar_doc
def clim(vmin=None, vmax=None):
"""
@@ -2691,5 +2690,3 @@
if im is not None:
im.set_cmap(cm.spectral)
draw_if_interactive()
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 17:09:39
|
Revision: 7405
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7405&view=rev
Author: jdh2358
Date: 2009-08-06 17:09:25 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Merged revisions 7395-7398,7400-7404 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7395 | jdh2358 | 2009-08-05 12:49:43 -0700 (Wed, 05 Aug 2009) | 1 line
fixed an alpha colormapping bug posted on sf 2832575
........
r7396 | jdh2358 | 2009-08-06 04:53:23 -0700 (Thu, 06 Aug 2009) | 1 line
removed pylab load and save
........
r7397 | jdh2358 | 2009-08-06 05:02:33 -0700 (Thu, 06 Aug 2009) | 1 line
tagging for 0.99 release
........
r7398 | jdh2358 | 2009-08-06 05:17:45 -0700 (Thu, 06 Aug 2009) | 1 line
final build of 0.99.0
........
r7400 | jdh2358 | 2009-08-06 07:55:54 -0700 (Thu, 06 Aug 2009) | 1 line
update whats new
........
r7401 | jdh2358 | 2009-08-06 07:58:37 -0700 (Thu, 06 Aug 2009) | 1 line
update whats new
........
r7402 | jdh2358 | 2009-08-06 08:10:45 -0700 (Thu, 06 Aug 2009) | 1 line
some updates for the release docs
........
r7403 | leejjoon | 2009-08-06 09:11:30 -0700 (Thu, 06 Aug 2009) | 1 line
fix legend bug ignoring CircleCollection
........
r7404 | jdh2358 | 2009-08-06 09:41:18 -0700 (Thu, 06 Aug 2009) | 1 line
some updates to site docs for release
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/api/api_changes.rst
trunk/matplotlib/doc/faq/installing_faq.rst
trunk/matplotlib/doc/users/annotations.rst
trunk/matplotlib/doc/users/plotting.rst
trunk/matplotlib/doc/users/whats_new.rst
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/colors.py
trunk/matplotlib/lib/matplotlib/pylab.py
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/README.txt
Added Paths:
-----------
trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py
trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py
trunk/matplotlib/doc/pyplots/whats_new_99_spines.py
trunk/matplotlib/release/osx/data/ReadMe.txt
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_99_maint:1-7393 /branches/v0_98_5_maint:1-7253
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7404
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/CHANGELOG 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,18 +1,54 @@
+2009-08-06 Tagging the 0.99.0 release at svn r7397 - JDH
+ * fixed an alpha colormapping bug posted on sf 2832575
+
+ * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py
+ (patch by Christoph Gohlke)
+
+ * remove dup gui event in enter/leave events in gtk
+
+ * lots of fixes for os x binaries (Thanks Russell Owen)
+
+ * attach gtk events to mpl events -- fixes sf bug 2816580
+
+ * applied sf patch 2815064 (middle button events for wx) and
+ patch 2818092 (resize events for wx)
+
+ * fixed boilerplate.py so it doesn't break the ReST docs.
+
+ * removed a couple of cases of mlab.load
+
+ * fixed rec2csv win32 file handle bug from sf patch 2831018
+
+ * added two examples from Josh Hemann: examples/pylab_examples/barchart_demo2.py
+ and examples/pylab_examples/boxplot_demo2.py
+
+ * handled sf bugs 2831556 and 2830525; better bar error messages and
+ backend driver configs
+
+ * added miktex win32 patch from sf patch 2820194
+
+ * apply sf patches 2830233 and 2823885 for osx setup and 64 bit; thanks Michiel
+
+
2009-08-04 Made cbook.get_sample_data make use of the ETag and Last-Modified
headers of mod_dav_svn. - JKS
2009-08-03 Add PathCollection; modify contourf to use complex
paths instead of simple paths with cuts. - EF
+
2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
+2009-08-03 pylab no longer provides a load and save function. These
+ are available in matplotlib.mlab, or you can use
+ numpy.loadtxt and numpy.savetxt for text files, or np.save
+ and np.load for binary numpy arrays. - JDH
+
2009-07-31 Added cbook.get_sample_data for urllib enabled fetching and
cacheing of data needed for examples. See
examples/misc/sample_data_demo.py - JDH
-======================================================================
-
2009-07-31 Tagging 0.99.0.rc1 at 7314 - MGD
2009-07-30 Add set_cmap and register_cmap, and improve get_cmap,
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/_templates/index.html 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,9 +1,9 @@
{% extends "layout.html" %}
{% set title = 'matplotlib: python plotting' %}
-
+
{% block body %}
- <h1>mpl</h1>
+ <h1>intro</h1>
<p>matplotlib is a python 2D plotting library which produces
publication quality figures in a variety of hardcopy formats and
@@ -41,7 +41,7 @@
<a href="http://scipy.org/Numpy_Example_List_With_Doc">numpy</a> and
<a href="api/mlab_api.html">matplotlib.mlab</a>.</p>
- <h3>Plotting commands</h3> <br/>
+ <h3>plotting commands</h3> <br/>
<table border="1" cellpadding="3" cellspacing="2">
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2009-08-06 17:09:25 UTC (rev 7405)
@@ -3,33 +3,26 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-
-<p>A release candidate rc2 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+
+<p>matplotlib 0.99 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+pathto('users/installing') }}">installing</a>
</p>
<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>.
</p>
-<h3>Download</h3>
-
-<p>Current version: <b>{{ version }}</b></p>
-
-
-<p>Download matplotlib from the
-sourceforge <a href="http://sourceforge.net/projects/matplotlib">project</a>
-page (but first take a look at the <a href="{{
-pathto('users/installing') }}">installing</a> page). Here's a summary
-of <a href="{{ pathto('users/whats_new') }}">what's new</a>. </p>
-
<p>There are several matplotlib addon <a href="{{
pathto('users/toolkits') }}">toolkits</a>, including the projection
and mapping toolkit
-<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>.</p>
+<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>, 3d plotting with <a href="{{
+pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, wild and wonderful axes and axis helpers in <a href="{{
+pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
+ </p>
<h3>Need help?</h3>
-<p>Check the <a href="{{ pathto('users/index') }}">user</a> guide,
+<p>Check the <a href="{{ pathto('users/index') }}">user guide</a>,
the <a href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
pathto('api/index') }}">api</a> docs,
<a href="http://www.nabble.com/matplotlib---users-f2906.html">archives</a>,
Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/api/api_changes.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -18,9 +18,14 @@
.. _configobj: http://www.voidspace.org.uk/python/configobj.html
.. _`enthought.traits`: http://code.enthought.com/projects/traits
-Changes beyond 0.98.x
-=====================
+Changes in 0.99
+======================
+* pylab no longer provides a load and save function. These are
+ available in matplotlib.mlab, or you can use numpy.loadtxt and
+ numpy.savetxt for text files, or np.save and np.load for binary
+ numpy arrays.
+
* User-generated colormaps can now be added to the set recognized
by :func:`matplotlib.cm.get_cmap`. Colormaps can be made the
default and applied to the current image using
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/faq/installing_faq.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -293,23 +293,21 @@
-----------------------
If you want to install matplotlib from one of the binary installers we
-build, you have two choices: a mpkg installer, which is a typical
+build, you have two choices: a dmg installer, which is a typical
Installer.app, or an binary OSX egg, which you can install via
setuptools easy_install.
+
+The mkpg installer will have a "dmg" extension, and will have a name
+like :file:`matplotlib-0.99.0-py2.5-macosx10.5.dmg` depending on the
+python, matplotlib, and OSX versions. Save this file and double
+click it, which will open up a folder with a file in it that has the
+mpkg extension. Double click this to run the Installer.app, which
+will prompt you for a password if you need system wide installation
+privileges, and install to a directory like
+:file:`/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages`,
+again depedending on your python version. This directory should be in
+your python path, so you can test your installation with::
-The mkpg installer will have a "zip" extension, and will have a name
-like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5_mpkg.zip` depending on
-the python, matplotlib, and OSX versions. You need to unzip this file
-using either the "unzip" command on OSX, or simply double clicking on
-it to run StuffIt Expander. When you double click on the resultant
-mpkd directory, which will have a name like
-file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.mpkg`, it will run the
-Installer.app, prompt you for a password if you need system wide
-installation privileges, and install to a directory like
-file:`/Library/Python/2.5/site-packages/`, again depedending on your
-python version. This directory may not be in your python path, so you
-can test your installation with::
-
> python -c 'import matplotlib; print matplotlib.__version__, matplotlib.__file__'
If you get an error like::
@@ -320,9 +318,9 @@
then you will need to set your PYTHONPATH, eg::
- export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH
+ export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages:$PYTHONPATH
-See also ref:`environment-variables`.
+See also :ref:`environment-variables`.
.. _easy-install-osx-egg:
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404
Copied: trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py (from rev 7404, branches/v0_99_maint/doc/pyplots/whats_new_99_axes_grid.py)
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py (rev 0)
+++ trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,47 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid.axes_rgb import RGBAxes
+
+def get_demo_image():
+ # prepare image
+ delta = 0.5
+
+ extent = (-3,4,-4,3)
+ x = np.arange(-3.0, 4.001, delta)
+ y = np.arange(-4.0, 3.001, delta)
+ X, Y = np.meshgrid(x, y)
+ import matplotlib.mlab as mlab
+ Z1 = mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
+ Z2 = mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+ Z = (Z1 - Z2) * 10
+
+ return Z, extent
+
+
+
+def get_rgb():
+ Z, extent = get_demo_image()
+
+ Z[Z<0] = 0.
+ Z = Z/Z.max()
+
+ R = Z[:13,:13]
+ G = Z[2:,2:]
+ B = Z[:13,2:]
+
+ return R, G, B
+
+
+fig = plt.figure(1)
+ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
+
+r, g, b = get_rgb()
+kwargs = dict(origin="lower", interpolation="nearest")
+ax.imshow_rgb(r, g, b, **kwargs)
+
+ax.RGB.set_xlim(0., 9.5)
+ax.RGB.set_ylim(0.9, 10.6)
+
+
+plt.draw()
+plt.show()
Copied: trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py (from rev 7404, branches/v0_99_maint/doc/pyplots/whats_new_99_mplot3d.py)
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py (rev 0)
+++ trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,17 @@
+from mpl_toolkits.mplot3d import Axes3D
+from matplotlib import cm
+import pylab
+import random
+import numpy as np
+
+fig = pylab.figure()
+ax = Axes3D(fig)
+X = np.arange(-5, 5, 0.25)
+Y = np.arange(-5, 5, 0.25)
+X, Y = np.meshgrid(X, Y)
+R = np.sqrt(X**2 + Y**2)
+Z = np.sin(R)
+ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.jet)
+
+pylab.show()
+
Copied: trunk/matplotlib/doc/pyplots/whats_new_99_spines.py (from rev 7404, branches/v0_99_maint/doc/pyplots/whats_new_99_spines.py)
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_99_spines.py (rev 0)
+++ trunk/matplotlib/doc/pyplots/whats_new_99_spines.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,47 @@
+import matplotlib.pyplot as plt
+import numpy as np
+from matplotlib.pyplot import show
+
+
+def adjust_spines(ax,spines):
+ for loc, spine in ax.spines.iteritems():
+ if loc in spines:
+ spine.set_position(('outward',10)) # outward by 10 points
+ else:
+ spine.set_color('none') # don't draw spine
+
+ # turn off ticks where there is no spine
+ if 'left' in spines:
+ ax.yaxis.set_ticks_position('left')
+ else:
+ # no yaxis ticks
+ ax.yaxis.set_ticks([])
+
+ if 'bottom' in spines:
+ ax.xaxis.set_ticks_position('bottom')
+ else:
+ # no xaxis ticks
+ ax.xaxis.set_ticks([])
+
+fig = plt.figure()
+
+x = np.linspace(0,2*np.pi,100)
+y = 2*np.sin(x)
+
+ax = fig.add_subplot(2,2,1)
+ax.plot(x,y)
+adjust_spines(ax,['left'])
+
+ax = fig.add_subplot(2,2,2)
+ax.plot(x,y)
+adjust_spines(ax,[])
+
+ax = fig.add_subplot(2,2,3)
+ax.plot(x,y)
+adjust_spines(ax,['left','bottom'])
+
+ax = fig.add_subplot(2,2,4)
+ax.plot(x,y)
+adjust_spines(ax,['bottom'])
+
+show()
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404
Modified: trunk/matplotlib/doc/users/annotations.rst
===================================================================
--- trunk/matplotlib/doc/users/annotations.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/users/annotations.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -3,6 +3,9 @@
Annotating text
===============
+For a more detailed introduction to annotations, see
+:ref:`plotting-guide-annotation`.
+
The uses of the basic :func:`~matplotlib.pyplot.text` command above
place text at an arbitrary position on the Axes. A common use case of
text is to annotate some feature of the plot, and the
Modified: trunk/matplotlib/doc/users/plotting.rst
===================================================================
--- trunk/matplotlib/doc/users/plotting.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/users/plotting.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -152,5 +152,4 @@
:ref:`plotting-guide-annotation`
-TODO; see :ref:`how-to-contribute-docs`.
Modified: trunk/matplotlib/doc/users/whats_new.rst
===================================================================
--- trunk/matplotlib/doc/users/whats_new.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/users/whats_new.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,28 +1,70 @@
.. _whats-new:
-***************************
+************************
What's new in matplotlib
-***************************
+************************
-.. _whats-new-svn:
+This page just covers the highlights -- for the full story, see the
+`CHANGELOG <http://matplotlib.sourceforge.net/_static/CHANGELOG>`_
-What new in svn
-===============
+new in matplotlib-0.99
+======================
+.. _whats-new-mplot3d:
+
+mplot3d
+--------
+
+
+Reinier Heeres has ported John Porter's mplot3d over to the new
+matplotlib transformations framework, and it is now available as a
+toolkit mpl_toolkits.mplot3d. See the `examples
+<http://matplotlib.sourceforge.net/examples/mplot3d/index.html>`_ and
+:ref:`toolkit_mplot3d-tutorial`
+
+.. plot:: pyplots/whats_new_99_mplot3d.py
+
+.. _whats-new-axes-grid:
+
+axes grid toolkit
+-----------------
+
+Jae Joon has added a new toolkit to ease displaying multiple images in
+matplotlib, as well as some support for curvilinear grids to support
+the world coordinate system. See :ref:`axes_grid_users-guide-index`
+and `examples <http://matplotlib.sourceforge.net/examples/axes_grid/index.html>`_
+
+.. plot:: pyplots/whats_new_99_axes_grid.py
+
+.. _whats-new-spine:
+
Axis spine placement
--------------------
Andrew Straw has added the ability to place "axis spines" -- the lines
-that denote the data limits -- in various arbitrary locations. See
+that denote the data limits -- in various arbitrary locations. No
+longer are your axis lines constrained to be a simple rectangle around
+the figure -- you can turn on or off left, bottom, right and top, as
+well as "detach" the spine to offset it away from the data. See
+:ref:`pylab_examples-spine_placement_demo` and
:class:`matplotlib.spines.Spine`.
+.. plot:: pyplots/whats_new_99_spines.py
+
+
+New documentation
+-----------------
+
+jae-Joon Lee has written two new guides :ref:`plotting-guide-legend`
+and :ref:`plotting-guide-annotation`.
+
.. _whats-new-0-98-4:
-What new in 0.98.4
-==============================
+new in 0.98.4
+=============
It's been four months since the last matplotlib release, and there are
-a lot of new features and bug-fixes.
+a lot of new features and bug-fixes.
Thanks to Charlie Moad for testing and preparing the source release,
including binaries for OS X and Windows for python 2.4 and 2.5 (2.6
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -3819,6 +3819,8 @@
if isinstance(c, mcoll.LineCollection)])
handles.extend([c for c in self.collections
if isinstance(c, mcoll.RegularPolyCollection)])
+ handles.extend([c for c in self.collections
+ if isinstance(c, mcoll.CircleCollection)])
return handles
Modified: trunk/matplotlib/lib/matplotlib/colors.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colors.py 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/lib/matplotlib/colors.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -488,7 +488,7 @@
if not self._isinit: self._init()
alpha = min(alpha, 1.0) # alpha must be between 0 and 1
alpha = max(alpha, 0.0)
- self._lut[:-3, -1] = alpha
+ self._lut[:,-1] = alpha
mask_bad = None
if not cbook.iterable(X):
vtype = 'scalar'
Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/lib/matplotlib/pylab.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -236,6 +236,9 @@
base_repr, binary_repr, log2, ispower2, \
rec_append_fields, rec_drop_fields, rec_join, csv2rec, rec2csv, isvector
+import matplotlib.mlab as mlab
+import matplotlib.cbook as cbook
+
from numpy import *
from numpy.fft import *
from numpy.random import *
@@ -248,3 +251,25 @@
import numpy as np
import numpy.ma as ma
+def load(*args, **kwargs):
+ raise NotImplementedError(load.__doc__)
+load.__doc__ = """\
+ pylab no longer provides a load function, though the old pylab
+ function is still available as matplotlib.mlab.load (you can refer
+ to it in pylab as "mlab.load"). However, for plain text files, we
+ recommend numpy.loadtxt, which was inspired by the old pylab.load
+ but now has more features. For loading numpy arrays, we recommend
+ numpy.load, and its analog numpy.save, which are available in
+ pylab as np.load and np.save.
+ """
+
+
+def save(*args, **kwargs):
+ raise NotImplementedError(save.__doc__)
+save.__doc__ = """\
+ pylab no longer provides a save function, though the old pylab
+ function is still available as matplotlib.mlab.save (you can still
+ refer to it in pylab as "mlab.save"). However, for plain text
+ files, we recommend numpy.savetxt. For saving numpy arrays,
+ we recommend numpy.save, and its analog numpy.load, which are
+ available in pylab as np.save and np.load."""
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404
Modified: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/release/osx/Makefile 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,10 +1,10 @@
-PYVERSION=2.5
+PYVERSION=2.6
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0.rc2
+MPLVERSION=0.99.0
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -28,7 +28,7 @@
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
matplotlib-${MPLVERSION} *~
-fetch_deps:
+fetch:
wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
@@ -77,7 +77,7 @@
cp objs/.libs/libfreetype.a . &&\
unset MACOSX_DEPLOYMENT_TARGET
-dependencies:
+deps:
make zlib png freetype
installers:
@@ -85,13 +85,12 @@
tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
cd ${MPLSRC} && \
rm -rf build && \
- cp ../data/setup.cfg . &&\
+ cp ../data/setup.cfg ../data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg &&\
- ${PYTHON} setupegg.py bdist_egg &&\
- cd dist && \
- zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
+ /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
+ hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${PYTHON} setupegg.py bdist_egg
upload:
rm -rf upload &&\
@@ -102,7 +101,7 @@
scp upload/* jd...@fr...:uploads/
all:
- make clean fetch_deps dependencies installers upload
+ make clean fetch deps installers upload
Modified: trunk/matplotlib/release/osx/README.txt
===================================================================
--- trunk/matplotlib/release/osx/README.txt 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/release/osx/README.txt 2009-08-06 17:09:25 UTC (rev 7405)
@@ -48,16 +48,16 @@
* First fetch all the dependencies and patch bdist_mpkg for OSX 10.5.
You can do this automatically in one step with::
- make fetch_deps
+ make fetch
-* install the patched bdist_mpkg, that the fetch_deps step just created::
+* install the patched bdist_mpkg, that the fetch step just created::
cd bdist_mpkg-0.4.4
sudo python setup.py install
* build the dependencies::
- make dependencies
+ make deps
* copy over the latest mpl *.tar.gz tarball to this directory, update
the MPLVERSION in the Makefile::
@@ -77,11 +77,11 @@
cd release/osx/
unset PKG_CONFIG_PATH
- make fetch_deps
+ make fetch
cd bdist_mpkg-0.4.4
sudo python setup.py install
cd ..
- make dependencies
+ make deps
Build the mpl sdist::
Copied: trunk/matplotlib/release/osx/data/ReadMe.txt (from rev 7404, branches/v0_99_maint/release/osx/data/ReadMe.txt)
===================================================================
--- trunk/matplotlib/release/osx/data/ReadMe.txt (rev 0)
+++ trunk/matplotlib/release/osx/data/ReadMe.txt 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,45 @@
+matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6
+
+matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell (ala matlab or mathematica), web
+application servers, and various graphical user interface toolkits.
+
+Home page: <http://matplotlib.sourceforge.net/>
+
+Before running matplotlib, you must install numpy. Binary installers
+for all these packages are available here:
+
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+
+*** Back Ends ***
+
+You may use TkAgg or WXAgg back ends; Qt and GTK support is not
+provided in this package. By default this matplotlib uses TkAgg
+because Tcl/Tk is included with MacOS X.
+
+If you wish to use WXAgg then:
+* Install wxPython from:
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+* Configure a matplotlibrc file, as described below.
+
+For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x
+
+*** Configuring a matplotlibrc file ***
+
+If you wish to change any matplotlib settings, create a file:
+ ~/.matplotlib/matplotlibrc
+
+
+that contains at least the following information. The values shown are
+the defaults in the internal matplotlibrc file; change them as you see
+fit:
+
+# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg
+# Agg Cairo GD GDK Paint PS PDF SVG Template
+backend : TkAgg
+interactive : False # see http://matplotlib.sourceforge.net/interactive.html
+
+See also
+<http://matplotlib.sourceforge.net/users/customizing.html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 16:41:30
|
Revision: 7404
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7404&view=rev
Author: jdh2358
Date: 2009-08-06 16:41:18 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
some updates to site docs for release
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/index.html
branches/v0_99_maint/doc/_templates/indexsidebar.html
branches/v0_99_maint/doc/faq/installing_faq.rst
branches/v0_99_maint/doc/users/annotations.rst
branches/v0_99_maint/doc/users/plotting.rst
branches/v0_99_maint/doc/users/whats_new.rst
Modified: branches/v0_99_maint/doc/_templates/index.html
===================================================================
--- branches/v0_99_maint/doc/_templates/index.html 2009-08-06 16:11:30 UTC (rev 7403)
+++ branches/v0_99_maint/doc/_templates/index.html 2009-08-06 16:41:18 UTC (rev 7404)
@@ -1,9 +1,9 @@
{% extends "layout.html" %}
{% set title = 'matplotlib: python plotting' %}
-
+
{% block body %}
- <h1>mpl</h1>
+ <h1>intro</h1>
<p>matplotlib is a python 2D plotting library which produces
publication quality figures in a variety of hardcopy formats and
@@ -41,7 +41,7 @@
<a href="http://scipy.org/Numpy_Example_List_With_Doc">numpy</a> and
<a href="api/mlab_api.html">matplotlib.mlab</a>.</p>
- <h3>Plotting commands</h3> <br/>
+ <h3>plotting commands</h3> <br/>
<table border="1" cellpadding="3" cellspacing="2">
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-06 16:11:30 UTC (rev 7403)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-06 16:41:18 UTC (rev 7404)
@@ -2,33 +2,26 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-
-<p> Download <a href="https://sourceforge.net/projects/matplotlib/">matplotlib-0.99.0</a>, see <a href="http://matplotlib.sourceforge.net/users/whats_new.html">what's
-new</a> and post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+
+<p>matplotlib 0.99 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+pathto('users/installing') }}">installing</a>
</p>
<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>.
</p>
-<h3>Download</h3>
-<p>Current version: <b>{{ version }}</b></p>
-
-
-<p>Download matplotlib from the
-sourceforge <a href="http://sourceforge.net/projects/matplotlib">project</a>
-page (but first take a look at the <a href="{{
-pathto('users/installing') }}">installing</a> page). Here's a summary
-of <a href="{{ pathto('users/whats_new') }}">what's new</a>. </p>
-
<p>There are several matplotlib addon <a href="{{
pathto('users/toolkits') }}">toolkits</a>, including the projection
and mapping toolkit
-<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>.</p>
+<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>, 3d plotting with <a href="{{
+pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, wild and wonderful axes and axis helpers in <a href="{{
+pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
+ </p>
<h3>Need help?</h3>
-<p>Check the <a href="{{ pathto('users/index') }}">user</a> guide,
+<p>Check the <a href="{{ pathto('users/index') }}">user guide</a>,
the <a href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
pathto('api/index') }}">api</a> docs,
<a href="http://www.nabble.com/matplotlib---users-f2906.html">archives</a>,
Modified: branches/v0_99_maint/doc/faq/installing_faq.rst
===================================================================
--- branches/v0_99_maint/doc/faq/installing_faq.rst 2009-08-06 16:11:30 UTC (rev 7403)
+++ branches/v0_99_maint/doc/faq/installing_faq.rst 2009-08-06 16:41:18 UTC (rev 7404)
@@ -293,23 +293,21 @@
-----------------------
If you want to install matplotlib from one of the binary installers we
-build, you have two choices: a mpkg installer, which is a typical
+build, you have two choices: a dmg installer, which is a typical
Installer.app, or an binary OSX egg, which you can install via
setuptools easy_install.
+
+The mkpg installer will have a "dmg" extension, and will have a name
+like :file:`matplotlib-0.99.0-py2.5-macosx10.5.dmg` depending on the
+python, matplotlib, and OSX versions. Save this file and double
+click it, which will open up a folder with a file in it that has the
+mpkg extension. Double click this to run the Installer.app, which
+will prompt you for a password if you need system wide installation
+privileges, and install to a directory like
+:file:`/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages`,
+again depedending on your python version. This directory should be in
+your python path, so you can test your installation with::
-The mkpg installer will have a "zip" extension, and will have a name
-like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5_mpkg.zip` depending on
-the python, matplotlib, and OSX versions. You need to unzip this file
-using either the "unzip" command on OSX, or simply double clicking on
-it to run StuffIt Expander. When you double click on the resultant
-mpkd directory, which will have a name like
-file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.mpkg`, it will run the
-Installer.app, prompt you for a password if you need system wide
-installation privileges, and install to a directory like
-file:`/Library/Python/2.5/site-packages/`, again depedending on your
-python version. This directory may not be in your python path, so you
-can test your installation with::
-
> python -c 'import matplotlib; print matplotlib.__version__, matplotlib.__file__'
If you get an error like::
@@ -320,9 +318,9 @@
then you will need to set your PYTHONPATH, eg::
- export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH
+ export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages:$PYTHONPATH
-See also ref:`environment-variables`.
+See also :ref:`environment-variables`.
.. _easy-install-osx-egg:
Modified: branches/v0_99_maint/doc/users/annotations.rst
===================================================================
--- branches/v0_99_maint/doc/users/annotations.rst 2009-08-06 16:11:30 UTC (rev 7403)
+++ branches/v0_99_maint/doc/users/annotations.rst 2009-08-06 16:41:18 UTC (rev 7404)
@@ -3,6 +3,9 @@
Annotating text
===============
+For a more detailed introduction to annotations, see
+:ref:`plotting-guide-annotation`.
+
The uses of the basic :func:`~matplotlib.pyplot.text` command above
place text at an arbitrary position on the Axes. A common use case of
text is to annotate some feature of the plot, and the
Modified: branches/v0_99_maint/doc/users/plotting.rst
===================================================================
--- branches/v0_99_maint/doc/users/plotting.rst 2009-08-06 16:11:30 UTC (rev 7403)
+++ branches/v0_99_maint/doc/users/plotting.rst 2009-08-06 16:41:18 UTC (rev 7404)
@@ -152,5 +152,4 @@
:ref:`plotting-guide-annotation`
-TODO; see :ref:`how-to-contribute-docs`.
Modified: branches/v0_99_maint/doc/users/whats_new.rst
===================================================================
--- branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 16:11:30 UTC (rev 7403)
+++ branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 16:41:18 UTC (rev 7404)
@@ -1,13 +1,14 @@
.. _whats-new:
-***************************
+************************
What's new in matplotlib
-***************************
+************************
-.. _whats-new-svn:
+This page just covers the highlights -- for the full story, see the
+`CHANGELOG <http://matplotlib.sourceforge.net/_static/CHANGELOG>`_
-What new in matplotlib-0.99
-=============================
+new in matplotlib-0.99
+======================
.. _whats-new-mplot3d:
@@ -50,10 +51,17 @@
.. plot:: pyplots/whats_new_99_spines.py
+
+New documentation
+-----------------
+
+jae-Joon Lee has written two new guides :ref:`plotting-guide-legend`
+and :ref:`plotting-guide-annotation`.
+
.. _whats-new-0-98-4:
-What new in 0.98.4
-==============================
+new in 0.98.4
+=============
It's been four months since the last matplotlib release, and there are
a lot of new features and bug-fixes.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-08-06 16:11:49
|
Revision: 7403
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7403&view=rev
Author: leejjoon
Date: 2009-08-06 16:11:30 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
fix legend bug ignoring CircleCollection
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/axes.py
Modified: branches/v0_99_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/axes.py 2009-08-06 15:10:45 UTC (rev 7402)
+++ branches/v0_99_maint/lib/matplotlib/axes.py 2009-08-06 16:11:30 UTC (rev 7403)
@@ -3819,6 +3819,8 @@
if isinstance(c, mcoll.LineCollection)])
handles.extend([c for c in self.collections
if isinstance(c, mcoll.RegularPolyCollection)])
+ handles.extend([c for c in self.collections
+ if isinstance(c, mcoll.CircleCollection)])
return handles
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 15:11:10
|
Revision: 7402
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7402&view=rev
Author: jdh2358
Date: 2009-08-06 15:10:45 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
some updates for the release docs
Modified Paths:
--------------
branches/v0_99_maint/doc/users/whats_new.rst
Modified: branches/v0_99_maint/doc/users/whats_new.rst
===================================================================
--- branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 14:58:37 UTC (rev 7401)
+++ branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 15:10:45 UTC (rev 7402)
@@ -21,7 +21,7 @@
<http://matplotlib.sourceforge.net/examples/mplot3d/index.html>`_ and
:ref:`toolkit_mplot3d-tutorial`
-.. plot:: pyplots/whats_new_mplot3d.py
+.. plot:: pyplots/whats_new_99_mplot3d.py
.. _whats-new-axes-grid:
@@ -33,7 +33,7 @@
the world coordinate system. See :ref:`axes_grid_users-guide-index`
and `examples <http://matplotlib.sourceforge.net/examples/axes_grid/index.html>`_
-.. plot:: pyplots/whats_new_axes_grid.py
+.. plot:: pyplots/whats_new_99_axes_grid.py
.. _whats-new-spine:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 14:58:43
|
Revision: 7401
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7401&view=rev
Author: jdh2358
Date: 2009-08-06 14:58:37 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
update whats new
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/indexsidebar.html
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-06 14:55:54 UTC (rev 7400)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-06 14:58:37 UTC (rev 7401)
@@ -3,7 +3,8 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-<p>A release candidate rc2 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+<p> Download <a href="https://sourceforge.net/projects/matplotlib/">matplotlib-0.99.0</a>, see <a href="http://matplotlib.sourceforge.net/users/whats_new.html">what's
+new</a> and post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
</p>
<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 14:56:02
|
Revision: 7400
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7400&view=rev
Author: jdh2358
Date: 2009-08-06 14:55:54 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
update whats new
Modified Paths:
--------------
branches/v0_99_maint/doc/users/whats_new.rst
Added Paths:
-----------
branches/v0_99_maint/doc/pyplots/whats_new_99_axes_grid.py
branches/v0_99_maint/doc/pyplots/whats_new_99_mplot3d.py
branches/v0_99_maint/doc/pyplots/whats_new_99_spines.py
Added: branches/v0_99_maint/doc/pyplots/whats_new_99_axes_grid.py
===================================================================
--- branches/v0_99_maint/doc/pyplots/whats_new_99_axes_grid.py (rev 0)
+++ branches/v0_99_maint/doc/pyplots/whats_new_99_axes_grid.py 2009-08-06 14:55:54 UTC (rev 7400)
@@ -0,0 +1,47 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid.axes_rgb import RGBAxes
+
+def get_demo_image():
+ # prepare image
+ delta = 0.5
+
+ extent = (-3,4,-4,3)
+ x = np.arange(-3.0, 4.001, delta)
+ y = np.arange(-4.0, 3.001, delta)
+ X, Y = np.meshgrid(x, y)
+ import matplotlib.mlab as mlab
+ Z1 = mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
+ Z2 = mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+ Z = (Z1 - Z2) * 10
+
+ return Z, extent
+
+
+
+def get_rgb():
+ Z, extent = get_demo_image()
+
+ Z[Z<0] = 0.
+ Z = Z/Z.max()
+
+ R = Z[:13,:13]
+ G = Z[2:,2:]
+ B = Z[:13,2:]
+
+ return R, G, B
+
+
+fig = plt.figure(1)
+ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
+
+r, g, b = get_rgb()
+kwargs = dict(origin="lower", interpolation="nearest")
+ax.imshow_rgb(r, g, b, **kwargs)
+
+ax.RGB.set_xlim(0., 9.5)
+ax.RGB.set_ylim(0.9, 10.6)
+
+
+plt.draw()
+plt.show()
Added: branches/v0_99_maint/doc/pyplots/whats_new_99_mplot3d.py
===================================================================
--- branches/v0_99_maint/doc/pyplots/whats_new_99_mplot3d.py (rev 0)
+++ branches/v0_99_maint/doc/pyplots/whats_new_99_mplot3d.py 2009-08-06 14:55:54 UTC (rev 7400)
@@ -0,0 +1,17 @@
+from mpl_toolkits.mplot3d import Axes3D
+from matplotlib import cm
+import pylab
+import random
+import numpy as np
+
+fig = pylab.figure()
+ax = Axes3D(fig)
+X = np.arange(-5, 5, 0.25)
+Y = np.arange(-5, 5, 0.25)
+X, Y = np.meshgrid(X, Y)
+R = np.sqrt(X**2 + Y**2)
+Z = np.sin(R)
+ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.jet)
+
+pylab.show()
+
Added: branches/v0_99_maint/doc/pyplots/whats_new_99_spines.py
===================================================================
--- branches/v0_99_maint/doc/pyplots/whats_new_99_spines.py (rev 0)
+++ branches/v0_99_maint/doc/pyplots/whats_new_99_spines.py 2009-08-06 14:55:54 UTC (rev 7400)
@@ -0,0 +1,47 @@
+import matplotlib.pyplot as plt
+import numpy as np
+from matplotlib.pyplot import show
+
+
+def adjust_spines(ax,spines):
+ for loc, spine in ax.spines.iteritems():
+ if loc in spines:
+ spine.set_position(('outward',10)) # outward by 10 points
+ else:
+ spine.set_color('none') # don't draw spine
+
+ # turn off ticks where there is no spine
+ if 'left' in spines:
+ ax.yaxis.set_ticks_position('left')
+ else:
+ # no yaxis ticks
+ ax.yaxis.set_ticks([])
+
+ if 'bottom' in spines:
+ ax.xaxis.set_ticks_position('bottom')
+ else:
+ # no xaxis ticks
+ ax.xaxis.set_ticks([])
+
+fig = plt.figure()
+
+x = np.linspace(0,2*np.pi,100)
+y = 2*np.sin(x)
+
+ax = fig.add_subplot(2,2,1)
+ax.plot(x,y)
+adjust_spines(ax,['left'])
+
+ax = fig.add_subplot(2,2,2)
+ax.plot(x,y)
+adjust_spines(ax,[])
+
+ax = fig.add_subplot(2,2,3)
+ax.plot(x,y)
+adjust_spines(ax,['left','bottom'])
+
+ax = fig.add_subplot(2,2,4)
+ax.plot(x,y)
+adjust_spines(ax,['bottom'])
+
+show()
Modified: branches/v0_99_maint/doc/users/whats_new.rst
===================================================================
--- branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 12:29:07 UTC (rev 7399)
+++ branches/v0_99_maint/doc/users/whats_new.rst 2009-08-06 14:55:54 UTC (rev 7400)
@@ -6,23 +6,57 @@
.. _whats-new-svn:
-What new in svn
-===============
+What new in matplotlib-0.99
+=============================
+.. _whats-new-mplot3d:
+
+mplot3d
+--------
+
+
+Reinier Heeres has ported John Porter's mplot3d over to the new
+matplotlib transformations framework, and it is now available as a
+toolkit mpl_toolkits.mplot3d. See the `examples
+<http://matplotlib.sourceforge.net/examples/mplot3d/index.html>`_ and
+:ref:`toolkit_mplot3d-tutorial`
+
+.. plot:: pyplots/whats_new_mplot3d.py
+
+.. _whats-new-axes-grid:
+
+axes grid toolkit
+-----------------
+
+Jae Joon has added a new toolkit to ease displaying multiple images in
+matplotlib, as well as some support for curvilinear grids to support
+the world coordinate system. See :ref:`axes_grid_users-guide-index`
+and `examples <http://matplotlib.sourceforge.net/examples/axes_grid/index.html>`_
+
+.. plot:: pyplots/whats_new_axes_grid.py
+
+.. _whats-new-spine:
+
Axis spine placement
--------------------
Andrew Straw has added the ability to place "axis spines" -- the lines
-that denote the data limits -- in various arbitrary locations. See
+that denote the data limits -- in various arbitrary locations. No
+longer are your axis lines constrained to be a simple rectangle around
+the figure -- you can turn on or off left, bottom, right and top, as
+well as "detach" the spine to offset it away from the data. See
+:ref:`pylab_examples-spine_placement_demo` and
:class:`matplotlib.spines.Spine`.
+.. plot:: pyplots/whats_new_99_spines.py
+
.. _whats-new-0-98-4:
What new in 0.98.4
==============================
It's been four months since the last matplotlib release, and there are
-a lot of new features and bug-fixes.
+a lot of new features and bug-fixes.
Thanks to Charlie Moad for testing and preparing the source release,
including binaries for OS X and Windows for python 2.4 and 2.5 (2.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-08-06 12:29:14
|
Revision: 7399
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7399&view=rev
Author: mdboom
Date: 2009-08-06 12:29:07 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Tagging 0.99 release.
Added Paths:
-----------
tags/v0_99_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 12:17:54
|
Revision: 7398
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7398&view=rev
Author: jdh2358
Date: 2009-08-06 12:17:45 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
final build of 0.99.0
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/release/osx/data/ReadMe.txt
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-08-06 12:02:33 UTC (rev 7397)
+++ branches/v0_99_maint/CHANGELOG 2009-08-06 12:17:45 UTC (rev 7398)
@@ -1,8 +1,9 @@
-2009-08-06 Tagging the 0.99.0 release at svn r7395 - JDH
+2009-08-06 Tagging the 0.99.0 release at svn r7397 - JDH
* fixed an alpha colormapping bug posted on sf 2832575
- * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch by Christoph Gohlke)
+ * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py
+ (patch by Christoph Gohlke)
* remove dup gui event in enter/leave events in gtk
@@ -10,7 +11,8 @@
* attach gtk events to mpl events -- fixes sf bug 2816580
- * applied sf patch 2815064 (middle button events for wx) and patch 2818092 (resize events for wx)
+ * applied sf patch 2815064 (middle button events for wx) and
+ patch 2818092 (resize events for wx)
* fixed boilerplate.py so it doesn't break the ReST docs.
@@ -18,10 +20,11 @@
* fixed rec2csv win32 file handle bug from sf patch 2831018
- * added two examples from Josh Hemann: examples/pylab_examples/barchart_demo2.py and
- examples/pylab_examples/boxplot_demo2.py
+ * added two examples from Josh Hemann: examples/pylab_examples/barchart_demo2.py
+ and examples/pylab_examples/boxplot_demo2.py
- * handled sf bugs 2831556 and 2830525; better bar error messages and backend driver configs
+ * handled sf bugs 2831556 and 2830525; better bar error messages and
+ backend driver configs
* added miktex win32 patch from sf patch 2820194
@@ -29,7 +32,6 @@
2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
-
2009-08-03 pylab no longer provides a load and save function. These
are available in matplotlib.mlab, or you can use
numpy.loadtxt and numpy.savetxt for text files, or np.save
Modified: branches/v0_99_maint/release/osx/data/ReadMe.txt
===================================================================
--- branches/v0_99_maint/release/osx/data/ReadMe.txt 2009-08-06 12:02:33 UTC (rev 7397)
+++ branches/v0_99_maint/release/osx/data/ReadMe.txt 2009-08-06 12:17:45 UTC (rev 7398)
@@ -1 +1,45 @@
-Find file: ~/Desktop/
\ No newline at end of file
+matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6
+
+matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell (ala matlab or mathematica), web
+application servers, and various graphical user interface toolkits.
+
+Home page: <http://matplotlib.sourceforge.net/>
+
+Before running matplotlib, you must install numpy. Binary installers
+for all these packages are available here:
+
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+
+*** Back Ends ***
+
+You may use TkAgg or WXAgg back ends; Qt and GTK support is not
+provided in this package. By default this matplotlib uses TkAgg
+because Tcl/Tk is included with MacOS X.
+
+If you wish to use WXAgg then:
+* Install wxPython from:
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+* Configure a matplotlibrc file, as described below.
+
+For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x
+
+*** Configuring a matplotlibrc file ***
+
+If you wish to change any matplotlib settings, create a file:
+ ~/.matplotlib/matplotlibrc
+
+
+that contains at least the following information. The values shown are
+the defaults in the internal matplotlibrc file; change them as you see
+fit:
+
+# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg
+# Agg Cairo GD GDK Paint PS PDF SVG Template
+backend : TkAgg
+interactive : False # see http://matplotlib.sourceforge.net/interactive.html
+
+See also
+<http://matplotlib.sourceforge.net/users/customizing.html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 12:02:43
|
Revision: 7397
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7397&view=rev
Author: jdh2358
Date: 2009-08-06 12:02:33 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
tagging for 0.99 release
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/release/osx/Makefile
branches/v0_99_maint/release/osx/README.txt
Added Paths:
-----------
branches/v0_99_maint/release/osx/data/ReadMe.txt
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-08-06 11:53:23 UTC (rev 7396)
+++ branches/v0_99_maint/CHANGELOG 2009-08-06 12:02:33 UTC (rev 7397)
@@ -1,4 +1,32 @@
+2009-08-06 Tagging the 0.99.0 release at svn r7395 - JDH
+ * fixed an alpha colormapping bug posted on sf 2832575
+
+ * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch by Christoph Gohlke)
+
+ * remove dup gui event in enter/leave events in gtk
+
+ * lots of fixes for os x binaries (Thanks Russell Owen)
+
+ * attach gtk events to mpl events -- fixes sf bug 2816580
+
+ * applied sf patch 2815064 (middle button events for wx) and patch 2818092 (resize events for wx)
+
+ * fixed boilerplate.py so it doesn't break the ReST docs.
+
+ * removed a couple of cases of mlab.load
+
+ * fixed rec2csv win32 file handle bug from sf patch 2831018
+
+ * added two examples from Josh Hemann: examples/pylab_examples/barchart_demo2.py and
+ examples/pylab_examples/boxplot_demo2.py
+
+ * handled sf bugs 2831556 and 2830525; better bar error messages and backend driver configs
+
+ * added miktex win32 patch from sf patch 2820194
+
+ * apply sf patches 2830233 and 2823885 for osx setup and 64 bit; thanks Michiel
+
2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2009-08-06 11:53:23 UTC (rev 7396)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2009-08-06 12:02:33 UTC (rev 7397)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.0.rc2'
+__version__ = '0.99.0'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2009-08-06 11:53:23 UTC (rev 7396)
+++ branches/v0_99_maint/release/osx/Makefile 2009-08-06 12:02:33 UTC (rev 7397)
@@ -1,10 +1,10 @@
-PYVERSION=2.5
+PYVERSION=2.6
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0.rc2
+MPLVERSION=0.99.0
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -28,7 +28,7 @@
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
matplotlib-${MPLVERSION} *~
-fetch_deps:
+fetch:
wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
@@ -77,7 +77,7 @@
cp objs/.libs/libfreetype.a . &&\
unset MACOSX_DEPLOYMENT_TARGET
-dependencies:
+deps:
make zlib png freetype
installers:
@@ -85,13 +85,12 @@
tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
cd ${MPLSRC} && \
rm -rf build && \
- cp ../data/setup.cfg . &&\
+ cp ../data/setup.cfg ../data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg &&\
- ${PYTHON} setupegg.py bdist_egg &&\
- cd dist && \
- zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
+ /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
+ hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${PYTHON} setupegg.py bdist_egg
upload:
rm -rf upload &&\
@@ -102,7 +101,7 @@
scp upload/* jd...@fr...:uploads/
all:
- make clean fetch_deps dependencies installers upload
+ make clean fetch deps installers upload
Modified: branches/v0_99_maint/release/osx/README.txt
===================================================================
--- branches/v0_99_maint/release/osx/README.txt 2009-08-06 11:53:23 UTC (rev 7396)
+++ branches/v0_99_maint/release/osx/README.txt 2009-08-06 12:02:33 UTC (rev 7397)
@@ -48,16 +48,16 @@
* First fetch all the dependencies and patch bdist_mpkg for OSX 10.5.
You can do this automatically in one step with::
- make fetch_deps
+ make fetch
-* install the patched bdist_mpkg, that the fetch_deps step just created::
+* install the patched bdist_mpkg, that the fetch step just created::
cd bdist_mpkg-0.4.4
sudo python setup.py install
* build the dependencies::
- make dependencies
+ make deps
* copy over the latest mpl *.tar.gz tarball to this directory, update
the MPLVERSION in the Makefile::
@@ -77,11 +77,11 @@
cd release/osx/
unset PKG_CONFIG_PATH
- make fetch_deps
+ make fetch
cd bdist_mpkg-0.4.4
sudo python setup.py install
cd ..
- make dependencies
+ make deps
Build the mpl sdist::
Added: branches/v0_99_maint/release/osx/data/ReadMe.txt
===================================================================
--- branches/v0_99_maint/release/osx/data/ReadMe.txt (rev 0)
+++ branches/v0_99_maint/release/osx/data/ReadMe.txt 2009-08-06 12:02:33 UTC (rev 7397)
@@ -0,0 +1 @@
+Find file: ~/Desktop/
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-06 11:53:39
|
Revision: 7396
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7396&view=rev
Author: jdh2358
Date: 2009-08-06 11:53:23 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
removed pylab load and save
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/doc/api/api_changes.rst
branches/v0_99_maint/lib/matplotlib/pylab.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-08-05 19:49:43 UTC (rev 7395)
+++ branches/v0_99_maint/CHANGELOG 2009-08-06 11:53:23 UTC (rev 7396)
@@ -1,7 +1,12 @@
+
2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
-======================================================================
+2009-08-03 pylab no longer provides a load and save function. These
+ are available in matplotlib.mlab, or you can use
+ numpy.loadtxt and numpy.savetxt for text files, or np.save
+ and np.load for binary numpy arrays. - JDH
+
2009-07-31 Tagging 0.99.0.rc1 at 7314 - MGD
2009-07-30 Add set_cmap and register_cmap, and improve get_cmap,
Modified: branches/v0_99_maint/doc/api/api_changes.rst
===================================================================
--- branches/v0_99_maint/doc/api/api_changes.rst 2009-08-05 19:49:43 UTC (rev 7395)
+++ branches/v0_99_maint/doc/api/api_changes.rst 2009-08-06 11:53:23 UTC (rev 7396)
@@ -18,9 +18,14 @@
.. _configobj: http://www.voidspace.org.uk/python/configobj.html
.. _`enthought.traits`: http://code.enthought.com/projects/traits
-Changes beyond 0.98.x
-=====================
+Changes in 0.99
+======================
+* pylab no longer provides a load and save function. These are
+ available in matplotlib.mlab, or you can use numpy.loadtxt and
+ numpy.savetxt for text files, or np.save and np.load for binary
+ numpy arrays.
+
* User-generated colormaps can now be added to the set recognized
by :func:`matplotlib.cm.get_cmap`. Colormaps can be made the
default and applied to the current image using
Modified: branches/v0_99_maint/lib/matplotlib/pylab.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/pylab.py 2009-08-05 19:49:43 UTC (rev 7395)
+++ branches/v0_99_maint/lib/matplotlib/pylab.py 2009-08-06 11:53:23 UTC (rev 7396)
@@ -236,6 +236,9 @@
base_repr, binary_repr, log2, ispower2, \
rec_append_fields, rec_drop_fields, rec_join, csv2rec, rec2csv, isvector
+import matplotlib.mlab as mlab
+import matplotlib.cbook as cbook
+
from numpy import *
from numpy.fft import *
from numpy.random import *
@@ -248,3 +251,25 @@
import numpy as np
import numpy.ma as ma
+def load(*args, **kwargs):
+ raise NotImplementedError(load.__doc__)
+load.__doc__ = """\
+ pylab no longer provides a load function, though the old pylab
+ function is still available as matplotlib.mlab.load (you can refer
+ to it in pylab as "mlab.load"). However, for plain text files, we
+ recommend numpy.loadtxt, which was inspired by the old pylab.load
+ but now has more features. For loading numpy arrays, we recommend
+ numpy.load, and its analog numpy.save, which are available in
+ pylab as np.load and np.save.
+ """
+
+
+def save(*args, **kwargs):
+ raise NotImplementedError(save.__doc__)
+save.__doc__ = """\
+ pylab no longer provides a save function, though the old pylab
+ function is still available as matplotlib.mlab.save (you can still
+ refer to it in pylab as "mlab.save"). However, for plain text
+ files, we recommend numpy.savetxt. For saving numpy arrays,
+ we recommend numpy.save, and its analog numpy.load, which are
+ available in pylab as np.save and np.load."""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-05 19:49:51
|
Revision: 7395
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7395&view=rev
Author: jdh2358
Date: 2009-08-05 19:49:43 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
fixed an alpha colormapping bug posted on sf 2832575
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/colors.py
Modified: branches/v0_99_maint/lib/matplotlib/colors.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/colors.py 2009-08-05 19:18:26 UTC (rev 7394)
+++ branches/v0_99_maint/lib/matplotlib/colors.py 2009-08-05 19:49:43 UTC (rev 7395)
@@ -488,7 +488,7 @@
if not self._isinit: self._init()
alpha = min(alpha, 1.0) # alpha must be between 0 and 1
alpha = max(alpha, 0.0)
- self._lut[:-3, -1] = alpha
+ self._lut[:,-1] = alpha
mask_bad = None
if not cbook.iterable(X):
vtype = 'scalar'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-08-05 19:18:35
|
Revision: 7394
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7394&view=rev
Author: leejjoon
Date: 2009-08-05 19:18:26 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
Merged revisions 7393 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7393 | leejjoon | 2009-08-05 15:12:38 -0400 (Wed, 05 Aug 2009) | 1 line
fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch by Christoph Gohlke)
........
Modified Paths:
--------------
trunk/matplotlib/lib/mpl_toolkits/axes_grid/angle_helper.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7362
+ /branches/mathtex:1-7263 /branches/v0_99_maint:1-7393 /branches/v0_98_5_maint:1-7253
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/angle_helper.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/angle_helper.py 2009-08-05 19:12:38 UTC (rev 7393)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/angle_helper.py 2009-08-05 19:18:26 UTC (rev 7394)
@@ -293,14 +293,14 @@
# iron out jumps, but algorithm should be improved.
# Tis is just naive way of doing and my fail for some cases.
if self.lon_cycle is not None:
- lon0 = lon.min()
+ lon0 = np.nanmin(lon)
lon -= 360. * ((lon - lon0) > 180.)
if self.lat_cycle is not None:
- lat0 = lat.min()
+ lat0 = np.nanmin(lat)
lat -= 360. * ((lat - lat0) > 180.)
- lon_min, lon_max = lon.min(), lon.max()
- lat_min, lat_max = lat.min(), lat.max()
+ lon_min, lon_max = np.nanmin(lon), np.nanmax(lon)
+ lat_min, lat_max = np.nanmin(lat), np.nanmax(lat)
lon_min, lon_max, lat_min, lat_max = \
self._adjust_extremes(lon_min, lon_max, lat_min, lat_max)
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2009-08-05 19:12:38 UTC (rev 7393)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2009-08-05 19:18:26 UTC (rev 7394)
@@ -544,7 +544,7 @@
def apply_aspect(self, position=None):
if self.get_axes_locator() is None:
- self._axes_class.apply_apsect(self, position)
+ self._axes_class.apply_aspect(self, position)
else:
pos = self.get_axes_locator()(self, self._locator_renderer)
self._axes_class.apply_aspect(self, position=pos)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-08-05 19:12:46
|
Revision: 7393
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7393&view=rev
Author: leejjoon
Date: 2009-08-05 19:12:38 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch by Christoph Gohlke)
Modified Paths:
--------------
branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py
branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py
Modified: branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py
===================================================================
--- branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py 2009-08-05 17:59:12 UTC (rev 7392)
+++ branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py 2009-08-05 19:12:38 UTC (rev 7393)
@@ -293,14 +293,14 @@
# iron out jumps, but algorithm should be improved.
# Tis is just naive way of doing and my fail for some cases.
if self.lon_cycle is not None:
- lon0 = lon.min()
+ lon0 = np.nanmin(lon)
lon -= 360. * ((lon - lon0) > 180.)
if self.lat_cycle is not None:
- lat0 = lat.min()
+ lat0 = np.nanmin(lat)
lat -= 360. * ((lat - lat0) > 180.)
- lon_min, lon_max = lon.min(), lon.max()
- lat_min, lat_max = lat.min(), lat.max()
+ lon_min, lon_max = np.nanmin(lon), np.nanmax(lon)
+ lat_min, lat_max = np.nanmin(lat), np.nanmax(lat)
lon_min, lon_max, lat_min, lat_max = \
self._adjust_extremes(lon_min, lon_max, lat_min, lat_max)
Modified: branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py
===================================================================
--- branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py 2009-08-05 17:59:12 UTC (rev 7392)
+++ branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py 2009-08-05 19:12:38 UTC (rev 7393)
@@ -544,7 +544,7 @@
def apply_aspect(self, position=None):
if self.get_axes_locator() is None:
- self._axes_class.apply_apsect(self, position)
+ self._axes_class.apply_aspect(self, position)
else:
pos = self.get_axes_locator()(self, self._locator_renderer)
self._axes_class.apply_aspect(self, position=pos)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-05 17:59:20
|
Revision: 7392
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7392&view=rev
Author: jdh2358
Date: 2009-08-05 17:59:12 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
fixed some svn doc bugs;
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
trunk/matplotlib/lib/matplotlib/cbook.py
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:36:27 UTC (rev 7391)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:59:12 UTC (rev 7392)
@@ -579,7 +579,7 @@
accessed using :func:`matplotlib.cbook.get_sample_data`. First get a
copy of the repository and svn add your data::
- svn co http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+ svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
cp ~/path/to/mydata.dat sample_data/
cd sample_data
svn add mydata.dat
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py 2009-08-05 17:36:27 UTC (rev 7391)
+++ trunk/matplotlib/lib/matplotlib/cbook.py 2009-08-05 17:59:12 UTC (rev 7392)
@@ -521,7 +521,7 @@
To add a datafile to this directory, you need to check out
sample_data from matplotlib svn::
- svn co http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+ svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
and svn add the data file you want to support. This is primarily
intended for use in mpl examples that need custom data
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-05 17:36:48
|
Revision: 7391
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7391&view=rev
Author: jdh2358
Date: 2009-08-05 17:36:27 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
updated devel doc with sample_data instructions
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:21:09 UTC (rev 7390)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:36:27 UTC (rev 7391)
@@ -563,6 +563,45 @@
.. _license-discussion:
+
+Writing examples
+================
+
+We have hundreds of examples in subdirectories of
+file:`matplotlib/examples` in the trunk, and these are automatically
+generated when the website it built to show up both in the `examples
+<http://matplotlib.sourceforge.net/examples/index.html>`_ and `gallery
+<http://matplotlib.sourceforge.net/gallery.html>`_ sections of the
+website. Many people find these examples from the website, and do not
+have ready access to the file:`examples` directory in which they
+reside. Thus any example data that is required for the example should
+be provided through the sample_data svn directory, which can then be
+accessed using :func:`matplotlib.cbook.get_sample_data`. First get a
+copy of the repository and svn add your data::
+
+ svn co http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+ cp ~/path/to/mydata.dat sample_data/
+ cd sample_data
+ svn add mydata.dat
+ svn commit -m 'added my data'
+
+and then in your example code you can load it into a file handle with::
+
+ import matplotlib.cbook as cbook
+ fh = cbook.get_sample_data('mydata.dat')
+
+The file will be fetched from the svn repo using urllib and updated
+when the revision number changes.
+
+
+If you prefer just to get the full path to the file instead of an file
+object::
+
+ import matplotlib.cbook as cbook
+ datafile = cbook.get_sample_data('mydata.dat', asfileobj=False)
+ print 'datafile', datafile
+
+
Licenses
========
@@ -630,3 +669,4 @@
extensions for scientific computing: ipython, numpy, scipy, the
enthought tool suite and python itself are all distributed under BSD
compatible licenses.
+>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-05 17:21:17
|
Revision: 7390
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7390&view=rev
Author: jdh2358
Date: 2009-08-05 17:21:09 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
fixed another example to use sample data
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/mri_demo.py
Modified: trunk/matplotlib/examples/pylab_examples/mri_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mri_demo.py 2009-08-05 17:20:12 UTC (rev 7389)
+++ trunk/matplotlib/examples/pylab_examples/mri_demo.py 2009-08-05 17:21:09 UTC (rev 7390)
@@ -1,9 +1,10 @@
#!/usr/bin/env python
from pylab import *
-
+import matplotlib.cbook as cbook
# data are 256x256 16 bit integers
-dfile = '../data/s1045.ima'
-im = fromstring(file(dfile, 'rb').read(), uint16).astype(float)
+dfile = cbook.get_sample_data('s1045.ima', asfileobj=False)
+print 'loading image', dfile
+im = np.fromstring(file(dfile, 'rb').read(), np.uint16).astype(float)
im.shape = 256, 256
#imshow(im, ColormapJet(256))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-05 17:20:18
|
Revision: 7389
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7389&view=rev
Author: jdh2358
Date: 2009-08-05 17:20:12 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
fixed another example to use sample data
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/data_helper.py
Modified: trunk/matplotlib/examples/pylab_examples/data_helper.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/data_helper.py 2009-08-05 17:16:50 UTC (rev 7388)
+++ trunk/matplotlib/examples/pylab_examples/data_helper.py 2009-08-05 17:20:12 UTC (rev 7389)
@@ -2,7 +2,7 @@
# Some functions to load a return data for the plot demos
from numpy import fromstring, argsort, take, array, resize
-
+import matplotlib.cbook as cbook
def get_two_stock_data():
"""
load stock time and price data for two stocks The return values
@@ -10,11 +10,14 @@
and 2 (intc and aapl)
"""
ticker1, ticker2 = 'INTC', 'AAPL'
- M1 = fromstring( file('../data/%s.dat' % ticker1, 'rb').read(), '<d')
+ file1 = cbook.get_sample_data('INTC.dat', asfileobj=False)
+ file2 = cbook.get_sample_data('AAPL.dat', asfileobj=False)
+ M1 = fromstring( file(file1, 'rb').read(), '<d')
+
M1 = resize(M1, (M1.shape[0]/2,2) )
- M2 = fromstring( file('../data/%s.dat' % ticker2, 'rb').read(), '<d')
+ M2 = fromstring( file(file2, 'rb').read(), '<d')
M2 = resize(M2, (M2.shape[0]/2,2) )
d1, p1 = M1[:,0], M1[:,1]
@@ -35,7 +38,10 @@
def get_ticker(ticker):
vals = []
- lines = file( '../data/%s.csv' % ticker ).readlines()
+
+ datafile = cbook.get_sample_data('%s.csv'%ticker, asfileobj=False)
+
+ lines = file(datafile).readlines()
for line in lines[1:]:
vals.append([float(val) for val in line.split(',')[1:]])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-08-05 17:16:56
|
Revision: 7388
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7388&view=rev
Author: jdh2358
Date: 2009-08-05 17:16:50 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
added AAPL sample data
Added Paths:
-----------
trunk/sample_data/AAPL.dat
Added: trunk/sample_data/AAPL.dat
===================================================================
(Binary files differ)
Property changes on: trunk/sample_data/AAPL.dat
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
