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

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

Revision: 5815
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5815&view=rev
Author:   jswhit
Date:     2008-07-23 01:15:22 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
implement some of JDH's suggestions for griddata.

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

Modified: trunk/matplotlib/lib/matplotlib/delaunay/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/delaunay/__init__.py	2008-07-23 00:24:55 UTC (rev 5814)
+++ trunk/matplotlib/lib/matplotlib/delaunay/__init__.py	2008-07-23 01:15:22 UTC (rev 5815)
@@ -8,3 +8,4 @@
 from matplotlib._delaunay import delaunay
 from triangulate import *
 from interpolate import *
+__version__ = "0.1"

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-23 00:24:55 UTC (rev 5814)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008-07-23 01:15:22 UTC (rev 5815)
@@ -89,6 +89,7 @@
 
 import numpy as np
 
+from matplotlib import verbose
 
 import matplotlib.nxutils as nxutils
 import matplotlib.cbook as cbook
@@ -2715,13 +2716,23 @@
     that is not redistributable under a BSD-compatible license.  When installed,
     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
     """
     try:
-        from mpl_toolkits.natgrid import _natgrid
+        from mpl_toolkits.natgrid import _natgrid, __version__
         _use_natgrid = True
     except ImportError:
         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 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:


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