[GRASS-SVN] r53673 - in grass/trunk: gui/wxpython/lmgr lib/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-03 04:30:34 -0700 (Sat, 03 Nov 2012)
New Revision: 53673

Modified:
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/lib/python/core.py
Log:
pythonlib: version() prints also info about additional libraries
           update wxGUI's OnSystemInfo()


Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2012-11-03 11:24:45 UTC (rev 53672)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2012-11-03 11:30:34 UTC (rev 53673)
@@ -813,20 +813,6 @@
         """!Print system information"""
         vInfo = grass.version()
         
-        # GDAL/OGR
-        try:
-            from osgeo import gdal
-            gdalVersion = gdal.__version__
-        except:
-            try:
-                gdalVersion = grass.Popen(['gdalinfo', '--version'], stdout = grass.PIPE).communicate()[0].rstrip('\n')
-            except:
-                gdalVersion = _("unknown")
-        # PROJ4
-        try:
-            projVersion = RunCommand('proj', getErrorMsg = True)[1].splitlines()[0]
-        except:
-            projVersion = _("unknown")
         # check also OSGeo4W on MS Windows
         if sys.platform == 'win32' and \
                 not os.path.exists(os.path.join(os.getenv("GISBASE"), "WinGRASS-README.url")):
@@ -839,13 +825,14 @@
                               "%s: %s\n"
                               "%s: %s (%s)\n"
                               "GDAL/OGR: %s\n"
-                              "PROJ4: %s\n"
+                              "PROJ.4: %s\n"
+                              "GEOS: %s\n"
                               "Python: %s\n"
                               "wxPython: %s\n"
                               "%s: %s%s\n"% (_("GRASS version"), vInfo['version'],
                                            _("GRASS SVN Revision"), vInfo['revision'],
                                            _("GIS Library Revision"), vInfo['libgis_revision'], vInfo['libgis_date'].split(' ', 1)[0],
-                                           gdalVersion, projVersion,
+                                           vInfo['gdal'], vInfo['proj4'], vInfo['geos'],
                                            platform.python_version(),
                                            wx.__version__,
                                            _("Platform"), platform.platform(), osgeo4w),

Modified: grass/trunk/lib/python/core.py
===================================================================
--- grass/trunk/lib/python/core.py	2012-11-03 11:24:45 UTC (rev 53672)
+++ grass/trunk/lib/python/core.py	2012-11-03 11:30:34 UTC (rev 53673)
@@ -1325,15 +1325,16 @@
     @code
     print version()
 
-    {'date': '2011', 'libgis_date': '2011-08-13 01:14:30 +0200 (Sat, 13 Aug 2011)',
-    'version': '7.0.svn', 'libgis_revision': '47604', 'revision': '47963'}
+    {'proj4': '4.8.0', 'geos': '3.3.5', 'libgis_revision': '52468',
+     'libgis_date': '2012-07-27 22:53:30 +0200 (Fri, 27 Jul 2012)',
+     'version': '7.0.svn', 'date': '2012', 'gdal': '2.0dev', 'revision': '53670'}
     @endcode
     """
     data = parse_command('g.version',
-                         flags = 'rg')
+                         flags = 'rge')
     for k, v in data.iteritems():
         data[k.strip()] = v.replace('"', '').strip()
-        
+    
     return data
 
 # get debug_level