matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.

SF.net SVN: matplotlib:[5936] trunk/matplotlib/examples/pylab_examples/ stix_fonts_demo.py

[<md...@us...>]

Revision: 5936
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5936&view=rev
Author:   mdboom
Date:     2008-07-31 14:44:07 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Don't use fancy Unicode on a narrow Python build.

Modified Paths:
--------------
    trunk/matplotlib/examples/pylab_examples/stix_fonts_demo.py

Modified: trunk/matplotlib/examples/pylab_examples/stix_fonts_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/stix_fonts_demo.py	2008-07-31 14:10:18 UTC (rev 5935)
+++ trunk/matplotlib/examples/pylab_examples/stix_fonts_demo.py	2008-07-31 14:44:07 UTC (rev 5936)
@@ -13,10 +13,13 @@
     r'$\mathrm{\mathbb{Blackboard \pi}}$',
     r'$\mathbf{\mathbb{Blackboard \pi}}$',
     r'$\mathfrak{Fraktur} \mathbf{\mathfrak{Fraktur}}$',
-    r'$\mathscr{Script}$',
-#    ur'Direct Unicode: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
-    ]
+    r'$\mathscr{Script}$']
 
+if sys.maxunicode > 0xffff:
+    stests.append(
+        ur'Direct Unicode: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
+    )
+
 from pylab import *
 
 def doall():
@@ -28,7 +31,7 @@
     axis([0, 3, -len(tests), 0])
     yticks(arange(len(tests)) * -1)
     for i, s in enumerate(tests):
-        print (i, s)
+        print (i, s.encode("ascii", "backslashreplace"))
         text(0.1, -i, s, fontsize=32)
 
     savefig('stix_fonts_example')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5935] trunk/matplotlib/lib/matplotlib/backends/ backend_wx.py

[<md...@us...>]

Revision: 5935
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5935&view=rev
Author:   mdboom
Date:     2008-07-31 14:10:18 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Warn when using Wx backend with wxPython < 2.8

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_wx.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-31 13:50:58 UTC (rev 5934)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-31 14:10:18 UTC (rev 5935)
@@ -249,6 +249,8 @@
         Initialise a wxWindows renderer instance.
         """
         DEBUG_MSG("__init__()", 1, self)
+        if wx.VERSION_STRING < "2.8":
+            raise RuntimeError("matplotlib no longer supports wxPython < 2.8 for the Wx backend.\nYou may, however, use the WxAgg backend.")
         self.width  = bitmap.GetWidth()
         self.height = bitmap.GetHeight()
         self.bitmap = bitmap


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5934] trunk/matplotlib

[<md...@us...>]

Revision: 5934
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5934&view=rev
Author:   mdboom
Date:     2008-07-31 13:50:58 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Deal with markers correctly for interpolating transformations.  (Thanks Jae-Joon Lee for finding this.)

Modified Paths:
--------------
    trunk/matplotlib/examples/api/custom_projection_example.py
    trunk/matplotlib/lib/matplotlib/lines.py
    trunk/matplotlib/lib/matplotlib/transforms.py

Modified: trunk/matplotlib/examples/api/custom_projection_example.py
===================================================================
--- trunk/matplotlib/examples/api/custom_projection_example.py	2008-07-31 11:52:10 UTC (rev 5933)
+++ trunk/matplotlib/examples/api/custom_projection_example.py	2008-07-31 13:50:58 UTC (rev 5934)
@@ -451,6 +451,7 @@
 from pylab import *
 
 subplot(111, projection="hammer")
+p = plot([-1, 1, 1], [-1, -1, 1], "o-")
 grid(True)
 
 show()

Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py	2008-07-31 11:52:10 UTC (rev 5933)
+++ trunk/matplotlib/lib/matplotlib/lines.py	2008-07-31 13:50:58 UTC (rev 5934)
@@ -432,7 +432,7 @@
             gc.set_alpha(self._alpha)
             funcname = self._markers.get(self._marker, '_draw_nothing')
             if funcname != '_draw_nothing':
-                tpath, affine = self._transformed_path.get_transformed_path_and_affine()
+                tpath, affine = self._transformed_path.get_transformed_points_and_affine()
                 markerFunc = getattr(self, funcname)
                 markerFunc(renderer, gc, tpath, affine.frozen())
 

Modified: trunk/matplotlib/lib/matplotlib/transforms.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/transforms.py	2008-07-31 11:52:10 UTC (rev 5933)
+++ trunk/matplotlib/lib/matplotlib/transforms.py	2008-07-31 13:50:58 UTC (rev 5934)
@@ -2076,18 +2076,35 @@
         self._transform = transform
         self.set_children(transform)
         self._transformed_path = None
+        self._transformed_points = None
 
+    def _revalidate(self):
+        if ((self._invalid & self.INVALID_NON_AFFINE == self.INVALID_NON_AFFINE)
+            or self._transformed_path is None):
+            self._transformed_path = \
+                self._transform.transform_path_non_affine(self._path)
+            self._transformed_points = \
+                Path(self._transform.transform_non_affine(self._path.vertices))
+        self._invalid = 0
+
+    def get_transformed_points_and_affine(self):
+        """
+        Return a copy of the child path, with the non-affine part of
+        the transform already applied, along with the affine part of
+        the path necessary to complete the transformation.  Unlike
+        get_transformed_path_and_affine, no interpolation will be
+        performed.
+        """
+        self._revalidate()
+        return self._transformed_points, self.get_affine()
+
     def get_transformed_path_and_affine(self):
         """
         Return a copy of the child path, with the non-affine part of
         the transform already applied, along with the affine part of
         the path necessary to complete the transformation.
         """
-        if ((self._invalid & self.INVALID_NON_AFFINE == self.INVALID_NON_AFFINE)
-            or self._transformed_path is None):
-            self._transformed_path = \
-                self._transform.transform_path_non_affine(self._path)
-        self._invalid = 0
+        self._revalidate()
         return self._transformed_path, self.get_affine()
 
     def get_fully_transformed_path(self):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5933] trunk/matplotlib

[<js...@us...>]

Revision: 5933
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5933&view=rev
Author:   jswhit
Date:     2008-07-31 11:52:10 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
added masked array support to griddata

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/mlab.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-07-30 17:30:19 UTC (rev 5932)
+++ trunk/matplotlib/CHANGELOG	2008-07-31 11:52:10 UTC (rev 5933)
@@ -1,3 +1,5 @@
+2008-07-31 Added masked array support to griddata. - JSW
+
 2008-07-26 Added optional C and reduce_C_function arguments to
 	   axes.hexbin().  This allows hexbin to accumulate the values
 	   of C based on the x,y coordinates and display in hexagonal

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-30 17:30:19 UTC (rev 5932)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-31 11:52:10 UTC (rev 5933)
@@ -2611,6 +2611,13 @@
         raise TypeError("inputs xi and yi must have same number of dimensions (1 or 2)")
     if xi.ndim != 1 and xi.ndim != 2:
         raise TypeError("inputs xi and yi must be 1D or 2D.")
+    if not len(x)==len(y)==len(z):
+        raise TypeError("inputs x,y,z must all be 1D arrays of the same length")
+    # remove masked points.
+    if hasattr(z,'mask'):
+        x = x.compress(z.mask == False)
+        y = y.compress(z.mask == False)
+        z = z.compressed()
     if _use_natgrid: # use natgrid toolkit if available.
         if xi.ndim == 2:
             xi = xi[0,:]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5932] trunk/matplotlib/lib/matplotlib/backends/ backend_wx.py

[<jd...@us...>]

Revision: 5932
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5932&view=rev
Author:   jdh2358
Date:     2008-07-30 17:30:19 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
another try at wx

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_wx.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-30 16:32:50 UTC (rev 5931)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-30 17:30:19 UTC (rev 5932)
@@ -698,7 +698,7 @@
 
 
         if not hasattr(self,'IsShownOnScreen'):
-            self.IsShownOnScreen = getattr(self, 'IsVisible', lambda self: True)
+            self.IsShownOnScreen = getattr(self, 'IsVisible', lambda *args: True)
 
 
         # Create the drawing bitmap


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5931] trunk/matplotlib/lib/matplotlib/mlab.py

[<js...@us...>]

Revision: 5931
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5931&view=rev
Author:   jswhit
Date:     2008-07-30 16:32:50 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
updated download instructions.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/mlab.py

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-30 16:19:40 UTC (rev 5930)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-30 16:32:50 UTC (rev 5931)
@@ -2591,10 +2591,8 @@
     this function will use the mpl_toolkits.natgrid algorithm, otherwise it
     will use the built-in matplotlib.delaunay package.
 
-    The natgrid matplotlib toolkit can be checked out through SVN with the
-    following command:
-
-    svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/toolkits/natgrid natgrid
+    The natgrid matplotlib toolkit can be downloaded from
+    http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=142792
     """
     try:
         from mpl_toolkits.natgrid import _natgrid, __version__


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5930] trunk/toolkits/natgrid

[<js...@us...>]

Revision: 5930
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5930&view=rev
Author:   jswhit
Date:     2008-07-30 16:19:40 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
add MANIFEST.in, make __version__  a string.

Modified Paths:
--------------
    trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py

Added Paths:
-----------
    trunk/toolkits/natgrid/MANIFEST.in

Added: trunk/toolkits/natgrid/MANIFEST.in
===================================================================
--- trunk/toolkits/natgrid/MANIFEST.in	                        (rev 0)
+++ trunk/toolkits/natgrid/MANIFEST.in	2008-07-30 16:19:40 UTC (rev 5930)
@@ -0,0 +1,5 @@
+include MANIFEST.in
+include Copyright.txt
+include setupegg.py
+include test.py
+include src/*.h

Modified: trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py
===================================================================
--- trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py	2008-07-30 16:13:35 UTC (rev 5929)
+++ trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py	2008-07-30 16:19:40 UTC (rev 5930)
@@ -1,4 +1,4 @@
-__version__ = 0.1
+__version__ = '0.1'
 __doc__ = """
 Python interface to NCAR natgrid library.  If installed, used
-by matplotlib griddata function."""
+by matplotlib griddata function. Not intended to be accessed directly by users."""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5929] trunk/htdocs

[<js...@us...>]

Revision: 5929
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5929&view=rev
Author:   jswhit
Date:     2008-07-30 16:13:35 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
add natgrid toolkit to docs, make basemap docs link to new online sphinx-generated version.

Modified Paths:
--------------
    trunk/htdocs/hthelpers.py
    trunk/htdocs/toolkits.html.template

Modified: trunk/htdocs/hthelpers.py
===================================================================
--- trunk/htdocs/hthelpers.py	2008-07-30 15:20:48 UTC (rev 5928)
+++ trunk/htdocs/hthelpers.py	2008-07-30 16:13:35 UTC (rev 5929)
@@ -49,9 +49,10 @@
     'matplotlib.texmanager',
     'matplotlib.text',
     'matplotlib.ticker',
-    'mpl_toolkits.basemap.basemap',
+    'mpl_toolkits.basemap',
     'mpl_toolkits.exceltools',
     'mpl_toolkits.gtktools',        
+    'mpl_toolkits.natgrid',
     'matplotlib.transforms',
     'matplotlib.type1font',
     'matplotlib.units',

Modified: trunk/htdocs/toolkits.html.template
===================================================================
--- trunk/htdocs/toolkits.html.template	2008-07-30 15:20:48 UTC (rev 5928)
+++ trunk/htdocs/toolkits.html.template	2008-07-30 16:13:35 UTC (rev 5929)
@@ -1,7 +1,8 @@
 modfiles = (
-    ('basemap.basemap', 'Plots data on map projections (with continental and political boundaries)'), 
-    ('gtktools', 'some gtk utilities'), 
-    ('exceltools', 'some Excel utilities'), 
+    ('basemap', 'Plots data on map projections (with continental and political boundaries)','http://matplotlib.sf.net/basemap/doc/html/'), 
+    ('gtktools', 'some gtk utilities', 'mpl_toolkits.gtktools.html'), 
+    ('exceltools', 'some Excel utilities', 'mpl_toolkits.exceltools.html'), 
+    ('natgrid', 'interface to natgrid C library for gridding irregularly spaced data', 'mpl_toolkits.natgrid.html'), 
     )
 
 @header@
@@ -16,10 +17,10 @@
         <h4>The following toolkits are available for matplotlib </h4>
     </caption>
     <tr><th>toolkit</th><th>Description</th></tr>
-    + for toolkit,desc in modfiles:
+    + for toolkit,desc,url in modfiles:
         <tr>
             <th align=left>
-            <a href=mpl_toolkits.@toolkit@.html>mpl_toolkits.@toolkit@</a>
+            <a href=@url@>mpl_toolkits.@toolkit@</a>
             </th>
             <td>
             @desc@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5928] trunk/toolkits/basemap

[<js...@us...>]

Revision: 5928
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5928&view=rev
Author:   jswhit
Date:     2008-07-30 15:20:48 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
include link to new API docs.

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/README

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2008-07-30 12:41:04 UTC (rev 5927)
+++ trunk/toolkits/basemap/Changelog	2008-07-30 15:20:48 UTC (rev 5928)
@@ -6,7 +6,9 @@
            * fixed processing of coastlines for gnomonic projection.
            * don't try to use PyNIO in NetCDFFile (it was causing
              too many suprises).
-           * improved documentation using Sphinx/docutils.
+           * start of improved documentation using Sphinx/docutils.
+             Can be viewed at
+             http://matplotlib.sf.net/basemap/doc/html
            * change default behaviour of num2date and date2num to be
              the same as matplotlib counterparts.
 version 0.99 (svn revision 5344)

Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README	2008-07-30 12:41:04 UTC (rev 5927)
+++ trunk/toolkits/basemap/README	2008-07-30 15:20:48 UTC (rev 5928)
@@ -60,7 +60,7 @@
 
 **Documentation** 
 
-see basemap.py docstrings.
+see docstrings and http://matplotlib.sf.net/basemap/doc/html/.
 
 see scripts in 'examples' directory for example usage.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5927] trunk/matplotlib/lib/matplotlib/axes.py

[<mme...@us...>]

Revision: 5927
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5927&view=rev
Author:   mmetz_bn
Date:     2008-07-30 12:41:04 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
use xrange instead of range in hexbin

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-07-29 21:42:37 UTC (rev 5926)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-07-30 12:41:04 UTC (rev 5927)
@@ -5120,7 +5120,7 @@
             lattice1.shape = (nx1,ny1)
             lattice2.shape = (nx2,ny2)
 
-            for i in range(len(x)):
+            for i in xrange(len(x)):
                 if bdist[i]:
                     lattice1[ix1[i], iy1[i]]+=1
                 else:
@@ -5128,29 +5128,29 @@
         else:
             # create accumulation arrays
             lattice1 = np.empty((nx1,ny1),dtype=object)
-            for i in range(nx1):
-                for j in range(ny1):
+            for i in xrange(nx1):
+                for j in xrange(ny1):
                     lattice1[i,j] = []
             lattice2 = np.empty((nx2,ny2),dtype=object)
-            for i in range(nx2):
-                for j in range(ny2):
+            for i in xrange(nx2):
+                for j in xrange(ny2):
                     lattice2[i,j] = []
 
-            for i in range(len(x)):
+            for i in xrange(len(x)):
                 if bdist[i]:
                     lattice1[ix1[i], iy1[i]].append( C[i] )
                 else:
                     lattice2[ix2[i], iy2[i]].append( C[i] )
 
-            for i in range(nx1):
-                for j in range(ny1):
+            for i in xrange(nx1):
+                for j in xrange(ny1):
                     vals = lattice1[i,j]
                     if len(vals):
                         lattice1[i,j] = reduce_C_function( vals )
                     else:
                         lattice1[i,j] = np.nan
-            for i in range(nx2):
-                for j in range(ny2):
+            for i in xrange(nx2):
+                for j in xrange(ny2):
                     vals = lattice2[i,j]
                     if len(vals):
                         lattice2[i,j] = reduce_C_function( vals )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5926] trunk/matplotlib/lib/matplotlib/backends/ backend_wx.py

[<jd...@us...>]

Revision: 5926
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5926&view=rev
Author:   jdh2358
Date:     2008-07-29 21:42:37 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
another attempt at portable isvisible for wx

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_wx.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-29 19:59:43 UTC (rev 5925)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-29 21:42:37 UTC (rev 5926)
@@ -698,8 +698,9 @@
 
 
         if not hasattr(self,'IsShownOnScreen'):
-            self.IsShownOnScreen = self.IsVisible
+            self.IsShownOnScreen = getattr(self, 'IsVisible', lambda self: True)
 
+
         # Create the drawing bitmap
         self.bitmap =wx.EmptyBitmap(w, h)
         DEBUG_MSG("__init__() - bitmap w:%d h:%d" % (w,h), 2, self)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5925] trunk/toolkits/basemap

[<js...@us...>]

Revision: 5925
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5925&view=rev
Author:   jswhit
Date:     2008-07-29 19:59:43 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
gcc4.3 compatibility patch for geos-2.2.3 from David Huard.

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/README
    trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp
    trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp
    trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp
    trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/Changelog	2008-07-29 19:59:43 UTC (rev 5925)
@@ -1,4 +1,5 @@
 version 0.99.1 (not yet released)
+           * geos-2.2.3 patched for compatibility with gcc 4.3.
            * added "barbs" method to draw wind barbs on the map.
            * added "tissot" method for generating Tissot's indicatrix
              (see example plot_tissot.py).

Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/README	2008-07-29 19:59:43 UTC (rev 5925)
@@ -125,5 +125,7 @@
 Erik Andersen
 Michael Hearne
 Jesper Larsen
+Ryan May
+David Huard
 
 for valuable contributions.

Modified: trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -18,6 +18,7 @@
 #include <stdio.h>
 
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <fstream>

Modified: trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -15,6 +15,7 @@
 
 #include <geos/indexQuadtree.h>
 #include <geos/util.h>
+#include <cstring>
 
 namespace geos {
 

Modified: trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -16,6 +16,7 @@
 
 #include <geos/io.h>
 #include <geos/util.h>
+#include <cstring>
 
 namespace geos {
 

Modified: trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -36,7 +36,9 @@
 
 
 #include <geos/io.h>
+#include <cstring>
 
+
 namespace geos {
 
 StringTokenizer::StringTokenizer(){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5924] trunk/matplotlib/lib/matplotlib

[<jd...@us...>]

Revision: 5924
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5924&view=rev
Author:   jdh2358
Date:     2008-07-29 18:34:11 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
trying in vein to get rid of acorr indent warning on doc build

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008-07-29 18:01:16 UTC (rev 5923)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008-07-29 18:34:11 UTC (rev 5924)
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.98.3rc1'
+__version__  = '0.98.3rc2'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-07-29 18:01:16 UTC (rev 5923)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-07-29 18:34:11 UTC (rev 5924)
@@ -3317,7 +3317,7 @@
         """
         call signature::
 
-          acorr(x, normed=False, detrend=mlab.detrend_none, usevlines=False,
+            acorr(x, normed=False, detrend=mlab.detrend_none, usevlines=False,
                 maxlags=None, **kwargs)
 
         Plot the autocorrelation of *x*.  If *normed* = *True*,
@@ -3328,32 +3328,30 @@
 
         Return value is a tuple (*lags*, *c*, *line*) where:
 
-          - *lags* are a length 2*maxlags+1 lag vector
+        - *lags* are a length 2*maxlags+1 lag vector
 
-          - *c* is the 2*maxlags+1 auto correlation vector
+        - *c* is the 2*maxlags+1 auto correlation vector
 
-          - *line* is a :class:`~matplotlib.lines.Line2D` instance
-            returned by :meth:`plot`
+        - *line* is a :class:`~matplotlib.lines.Line2D` instance
+           returned by :meth:`plot`
 
         The default *linestyle* is None and the default *marker* is
         ``'o'``, though these can be overridden with keyword args.
         The cross correlation is performed with :func:`numpy.correlate` with
         *mode* = 2.
 
-        If *usevlines* is *True*:
+        If *usevlines* is *True*, :meth:`~matplotlib.axes.Axes.vlines`
+        rather than :meth:`~matplotlib.axes.Axes.plot` is used to draw
+        vertical lines from the origin to the acorr.  Otherwise, the
+        plot style is determined by the kwargs, which are
+        :class:`~matplotlib.lines.Line2D` properties.  The return
+        value is a tuple (*lags*, *c*, *linecol*, *b*) where
 
-            :meth:`~matplotlib.axes.Axes.vlines` rather than
-            :meth:`~matplotlib.axes.Axes.plot` is used to draw
-            vertical lines from the origin to the acorr.  Otherwise,
-            the plot style is determined by the kwargs, which are
-            :class:`~matplotlib.lines.Line2D` properties.  The return
-            value is a tuple (*lags*, *c*, *linecol*, *b*) where
+        - *linecol* is the
+          :class:`~matplotlib.collections.LineCollection`
 
-              - *linecol* is the
-                :class:`~matplotlib.collections.LineCollection`
+        - *b* is the *x*-axis.
 
-              - *b* is the *x*-axis.
-
         *maxlags* is a positive integer detailing the number of lags
         to show.  The default value of *None* will return all
         ``(2*len(x)-1)`` lags.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5923] trunk/matplotlib/lib/matplotlib/backends/ backend_wx.py

[<jd...@us...>]

Revision: 5923
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5923&view=rev
Author:   jdh2358
Date:     2008-07-29 18:01:16 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
special case contains test for degenerate rectangle

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_wx.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-29 17:47:50 UTC (rev 5922)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-07-29 18:01:16 UTC (rev 5923)
@@ -696,6 +696,10 @@
         except AttributeError:
             self.SetInitialSize = getattr(self, 'SetBestFittingSize', do_nothing)
 
+
+        if not hasattr(self,'IsShownOnScreen'):
+            self.IsShownOnScreen = self.IsVisible
+
         # Create the drawing bitmap
         self.bitmap =wx.EmptyBitmap(w, h)
         DEBUG_MSG("__init__() - bitmap w:%d h:%d" % (w,h), 2, self)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5922] trunk/matplotlib/lib/matplotlib/patches.py

[<jd...@us...>]

Revision: 5922
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5922&view=rev
Author:   jdh2358
Date:     2008-07-29 17:47:50 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
special case contains test for degenerate rectangle

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/patches.py

Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py	2008-07-29 16:02:00 UTC (rev 5921)
+++ trunk/matplotlib/lib/matplotlib/patches.py	2008-07-29 17:47:50 UTC (rev 5922)
@@ -401,6 +401,10 @@
         return self._rect_transform
 
     def contains(self, mouseevent):
+        # special case the degernate rectangle
+        if self._width==0 or self._height==0:
+            return False, {}
+
         x, y = self.get_transform().inverted().transform_point(
             (mouseevent.x, mouseevent.y))
         return (x >= 0.0 and x <= 1.0 and y >= 0.0 and y <= 1.0), {}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5921] trunk/toolkits/basemap/doc/conf.py

[<js...@us...>]

Revision: 5921
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5921&view=rev
Author:   jswhit
Date:     2008-07-29 16:02:00 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
change version numbers

Modified Paths:
--------------
    trunk/toolkits/basemap/doc/conf.py

Modified: trunk/toolkits/basemap/doc/conf.py
===================================================================
--- trunk/toolkits/basemap/doc/conf.py	2008-07-29 16:00:35 UTC (rev 5920)
+++ trunk/toolkits/basemap/doc/conf.py	2008-07-29 16:02:00 UTC (rev 5921)
@@ -46,9 +46,9 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '0.99'
+version = '0.99.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.99'
+release = '0.99.1'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5920] trunk/toolkits/basemap/doc/users

[<js...@us...>]

Revision: 5920
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5920&view=rev
Author:   jswhit
Date:     2008-07-29 16:00:35 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
add another section to users guide.

Modified Paths:
--------------
    trunk/toolkits/basemap/doc/users/index.rst

Added Paths:
-----------
    trunk/toolkits/basemap/doc/users/geography.rst

Added: trunk/toolkits/basemap/doc/users/geography.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/geography.rst	                        (rev 0)
+++ trunk/toolkits/basemap/doc/users/geography.rst	2008-07-29 16:00:35 UTC (rev 5920)
@@ -0,0 +1,23 @@
+.. _geography:
+
+Drawing Coastlines, Rivers and Political Boundaries
+===================================================
+
+Basemap includes the 
+`GSSH <http://www.soest.hawaii.edu/wessel/gshhs/gshhs.html>`_
+coastline dataset, as well as datasets for rivers, state and
+country boundaries from 
+`GMT <http://gmt.soest.hawaii.edu>`_.
+These datasets can be used to draw coastlines, rivers and political
+boundaries on maps at several different resolutions.  The relevant Basemap 
+methods are:
+
+* :func:`~mpl_toolkits.basemap.Basemap.drawcoastlines`: draw coastlines.
+* :func:`~mpl_toolkits.basemap.Basemap.fillcontinents`: color the interior
+  of continents (by filling the coastline polygons).
+* :func:`~mpl_toolkits.basemap.Basemap.drawcountries`: draw country boundaries.
+* :func:`~mpl_toolkits.basemap.Basemap.drawstates`: draw state boundaries
+  in North America.
+* :func:`~mpl_toolkits.basemap.Basemap.drawrivers`: draw rivers.
+
+.. toctree::

Modified: trunk/toolkits/basemap/doc/users/index.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/index.rst	2008-07-29 12:23:43 UTC (rev 5919)
+++ trunk/toolkits/basemap/doc/users/index.rst	2008-07-29 16:00:35 UTC (rev 5920)
@@ -11,4 +11,5 @@
 
     intro.rst
     mapsetup.rst
+    geography.rst
     graticule.rst


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5919] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/__init__.py

[<js...@us...>]

Revision: 5919
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5919&view=rev
Author:   jswhit
Date:     2008-07-29 12:23:43 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
fix docstring markup

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-07-29 12:20:11 UTC (rev 5918)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-07-29 12:23:43 UTC (rev 5919)
@@ -298,7 +298,7 @@
  Variable Name    Description
  ================ ====================================================
  projection       map projection. Print the module variable
-                  "supported_projections" to see a list of allowed
+                  ``supported_projections`` to see a list of allowed
                   values.
  aspect           map aspect ratio 
                   (size of y dimension / size of x dimension).


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5918] trunk/toolkits/basemap/doc/users/mapsetup.rst

[<js...@us...>]

Revision: 5918
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5918&view=rev
Author:   jswhit
Date:     2008-07-29 12:20:11 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
add link to API docs

Modified Paths:
--------------
    trunk/toolkits/basemap/doc/users/mapsetup.rst

Modified: trunk/toolkits/basemap/doc/users/mapsetup.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/mapsetup.rst	2008-07-29 12:17:01 UTC (rev 5917)
+++ trunk/toolkits/basemap/doc/users/mapsetup.rst	2008-07-29 12:20:11 UTC (rev 5918)
@@ -8,7 +8,8 @@
 distortion, there are many map projections, each with it's own advantages
 and disadvantages. Basemap provides 19 different map projections.
 Some are global, some can only represent a portion of the globe. When
-a Basemap class instance is created, the desired map projection must
+a :class:`~mpl_toolkits.basemap.Basemap` class instance is
+created, the desired map projection must
 be specified, along with information about the portion of the earth's
 surface that the map projection will describe. There are two basic
 ways of doing this. One is to provide the latitude and longitude values


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5917] trunk/toolkits/basemap/doc/users

[<js...@us...>]

Revision: 5917
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5917&view=rev
Author:   jswhit
Date:     2008-07-29 12:17:01 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
new section for users guide

Modified Paths:
--------------
    trunk/toolkits/basemap/doc/users/index.rst

Added Paths:
-----------
    trunk/toolkits/basemap/doc/users/graticule.rst

Added: trunk/toolkits/basemap/doc/users/graticule.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/graticule.rst	                        (rev 0)
+++ trunk/toolkits/basemap/doc/users/graticule.rst	2008-07-29 12:17:01 UTC (rev 5917)
@@ -0,0 +1,13 @@
+.. _graticule:
+
+Drawing and Labelling Parallels and Meridians
+=============================================
+
+Most maps include a graticule grid, a reference network of labelled
+latitude and longitude lines. Basemap does this with the 
+:func:`~mpl_toolkits.basemap.Basemap.drawparallels` and
+:func:`~mpl_toolkits.basemap.Basemap.drawmeridians` instance methods.
+The longitude and latitude lines can be labelled where they
+the map projection boundary.
+
+.. toctree::

Modified: trunk/toolkits/basemap/doc/users/index.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/index.rst	2008-07-29 10:53:45 UTC (rev 5916)
+++ trunk/toolkits/basemap/doc/users/index.rst	2008-07-29 12:17:01 UTC (rev 5917)
@@ -11,3 +11,4 @@
 
     intro.rst
     mapsetup.rst
+    graticule.rst


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5916] trunk/matplotlib/lib/matplotlib/axes.py

[<mme...@us...>]

Revision: 5916
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5916&view=rev
Author:   mmetz_bn
Date:     2008-07-29 10:53:45 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
Minor hist-doc updates

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-07-28 19:59:19 UTC (rev 5915)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-07-29 10:53:45 UTC (rev 5916)
@@ -6127,10 +6127,12 @@
             is an integer input argument=numbins, *bins* + 1 bin edges
             will be returned, compatible with the semantics of
             :func:`numpy.histogram` with the *new* = True argument.
+            Unequally spaced bins are supported if *bins* is a sequence.
 
           *range*:
             The lower and upper range of the bins. Lower and upper outliers
             are ignored. If not provided, *range* is (x.min(), x.max()).
+            Range has no effect if *bins* is a sequence.
 
           *normed*:
             If *True*, the first element of the return tuple will
@@ -6147,7 +6149,7 @@
             gives the counts in that bin plus all bins for smaller values.
             The last bin gives the total number of datapoints.  If *normed*
             is also *True* then the histogram is normalized such that the
-            last bin equals one. If *cumulative* evaluates to less that 1
+            last bin equals one. If *cumulative* evaluates to less than 0
             (e.g. -1), the direction of accumulation is reversed.  In this
             case, if *normed* is also *True*, then the histogram is normalized
             such that the first bin equals 1.
@@ -6167,8 +6169,7 @@
                 filled.
 
           *align*: ['left' | 'mid' | 'right' ]
-            Controls how the histogram is
-            plotted.
+            Controls how the histogram is plotted.
 
               - 'left': bars are centered on the left bin edges
 
@@ -6178,7 +6179,8 @@
 
           *orientation*: [ 'horizontal' | 'vertical' ]
             If 'horizontal', :func:`~matplotlib.pyplot.barh` will be
-            used and the *bottom* kwarg will be the left edges.
+            used for bar-type histograms and the *bottom* kwarg will be
+            the left edges.
 
           *rwidth*:
             the relative width of the bars as a fraction of the bin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5915] trunk/matplotlib

[<jd...@us...>]

Revision: 5915
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5915&view=rev
Author:   jdh2358
Date:     2008-07-28 19:59:19 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
commented out seterr in npy -- ma looks broken here

Modified Paths:
--------------
    trunk/matplotlib/examples/pylab_examples/geo_demo.py
    trunk/matplotlib/unit/memleak_hawaii3.py

Modified: trunk/matplotlib/examples/pylab_examples/geo_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/geo_demo.py	2008-07-28 17:29:57 UTC (rev 5914)
+++ trunk/matplotlib/examples/pylab_examples/geo_demo.py	2008-07-28 19:59:19 UTC (rev 5915)
@@ -1,5 +1,5 @@
 import numpy as np
-np.seterr("raise")
+#np.seterr("raise")
 
 from pylab import *
 

Modified: trunk/matplotlib/unit/memleak_hawaii3.py
===================================================================
--- trunk/matplotlib/unit/memleak_hawaii3.py	2008-07-28 17:29:57 UTC (rev 5914)
+++ trunk/matplotlib/unit/memleak_hawaii3.py	2008-07-28 19:59:19 UTC (rev 5915)
@@ -2,7 +2,7 @@
 
 import os, sys, time, gc
 import matplotlib
-matplotlib.use('Agg')
+matplotlib.use('PDF')
 
 from matplotlib.cbook import report_memory
 import numpy as np


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5914] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/__init__.py

[<js...@us...>]

Revision: 5914
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5914&view=rev
Author:   jswhit
Date:     2008-07-28 17:29:57 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
don't touch axesPatch or frame default zorder.

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-07-28 16:58:16 UTC (rev 5913)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-07-28 17:29:57 UTC (rev 5914)
@@ -1214,22 +1214,19 @@
             # use axesPatch for fill_color, frame for border line props.
             ax.frame.set_linewidth(linewidth)
             if self.projection not in ['geos','ortho']:
-                if fill_color is None:
-                    ax.axesPatch.set_facecolor(ax.get_axis_bgcolor())
-                else:
+                if fill_color is not None:
                     ax.axesPatch.set_facecolor(fill_color)
-                    ax.axesPatch.set_zorder(0)
-                    ax.frame.set_zorder(0)
                 ax.frame.set_edgecolor(color)
                 ax.set_frame_on(True)
+                # FIXME?  should zorder be set separately for edge and background?
                 if zorder is not None:
                     ax.axesPatch.set_zorder(zorder)
                     ax.frame.set_zorder(zorder)
             else:
                 # use axesPatch for fill_color, frame for border line props.
-                ax.axesPatch.set_edgecolor(color)
                 ax.frame.set_edgecolor(color)
                 ax.set_frame_on(True)
+                # FIXME?  should zorder be set separately for edge and background?
                 if zorder is not None:
                     ax.axesPatch.set_zorder(zorder)
                     ax.frame.set_zorder(zorder)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5913] trunk/matplotlib/lib/matplotlib/mlab.py

[<js...@us...>]

Revision: 5913
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5913&view=rev
Author:   jswhit
Date:     2008-07-28 16:58:16 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
make sure griddata issues verbose report only the first time it is called.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/mlab.py

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-28 16:42:10 UTC (rev 5912)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-28 16:58:16 UTC (rev 5913)
@@ -2603,10 +2603,12 @@
         import matplotlib.delaunay as delaunay
         from matplotlib.delaunay import  __version__
         _use_natgrid = False
-    if _use_natgrid:
-        verbose.report('using natgrid version %s' % __version__)
-    else:
-        verbose.report('using delaunay version %s' % __version__)
+    if not griddata._reported:
+        if _use_natgrid:
+            verbose.report('using natgrid version %s' % __version__)
+        else:
+            verbose.report('using delaunay version %s' % __version__)
+        griddata._reported = True
     if xi.ndim != yi.ndim:
         raise TypeError("inputs xi and yi must have same number of dimensions (1 or 2)")
     if xi.ndim != 1 and xi.ndim != 2:
@@ -2645,3 +2647,4 @@
     if np.any(np.isnan(zo)):
         zo = np.ma.masked_where(np.isnan(zo),zo)
     return zo
+griddata._reported = False


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[5912] trunk/matplotlib/lib/matplotlib/axes.py

[<jd...@us...>]

Revision: 5912
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5912&view=rev
Author:   jdh2358
Date:     2008-07-28 16:42:10 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
added some additional comments to axes to clarify the patch/frame relationship

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-07-28 16:37:00 UTC (rev 5911)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-07-28 16:42:10 UTC (rev 5912)
@@ -1451,6 +1451,8 @@
 
         self.apply_aspect(self.get_position(True))
 
+        # the patch draws the background rectangle -- the frame below
+        # will draw the edges
         if self.axison and self._frameon:
             self.patch.draw(renderer)
 
@@ -1506,6 +1508,9 @@
         if self.legend_ is not None:
             artists.append(self.legend_)
 
+        # the frame draws the edges around the axes patch -- we
+        # decouple these so the patch can be in the background and the
+        # frame in the foreground.
         if self.axison and self._frameon:
             artists.append(self.frame)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.