[GRASS-SVN] r35214 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-04 14:22:13 -0500 (Sun, 04 Jan 2009)
New Revision: 35214

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: eliminate gcmd.Command()


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py	2009-01-04 19:11:16 UTC (rev 35213)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py	2009-01-04 19:22:13 UTC (rev 35214)
@@ -991,7 +991,9 @@
         listOfDrivers = self.settings.Get(group='display', key='driver', subkey='choices', internal=True)
         # check if cairo is available
         if 'cairo' not in listOfDrivers:
-            for line in gcmd.Command(['d.mon', '-l']).ReadStdOutput():
+            for line in gcmd.RunCommand('d.mon',
+                                        flags = 'l',
+                                        read = True):
                 if 'cairo' in line:
                     listOfDrivers.append('cairo')
                     break

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2009-01-04 19:11:16 UTC (rev 35213)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2009-01-04 19:22:13 UTC (rev 35214)
@@ -133,9 +133,11 @@
         #
         if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
             os.environ["GRASS_CAIROFILE"] = self.mapfile
-            if 'cairo' not in gcmd.Command(['d.mon', '-p']).ReadStdOutput()[0]:
-                gcmd.Command(['d.mon',
-                              'start=cairo'], stderr=None)
+            if 'cairo' not in gcmd.RunCommand('d.mon',
+                                              flags='p',
+                                              read = True):
+                gcmd.RunCommand('d.mon',
+                                start = 'cairo')
         else:
             if self.mapfile:
                 os.environ["GRASS_PNGFILE"] = self.mapfile
@@ -186,8 +188,8 @@
         # stop monitor
         #
         if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
-            gcmd.Command(['d.mon',
-                          'stop=cairo'], stderr=None)
+            gcmd.RunCommand('d.mon',
+                            stop = 'cairo')
             del os.environ["GRASS_CAIROFILE"]
         elif os.environ.has_key("GRASS_PNGFILE"):
             del os.environ["GRASS_PNGFILE"]

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-01-04 19:11:16 UTC (rev 35213)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-01-04 19:22:13 UTC (rev 35214)
@@ -953,19 +953,20 @@
         gisbase = os.environ['GISBASE']
 
         # make list of xmons that are not running
-        cmdlist = ["d.mon", "-L"]
-        p = gcmd.Command(cmdlist)
+        ret = gcmd.RunCommand('d.mon',
+                              flags = 'L',
+                              read = True)
 
-        for line in p.ReadStdOutput():                
+        for line in ret.split('\n'):               
             line = line.strip()
             if line.startswith('x') and 'not running' in line:
                 xmonlist.append(line[0:2])
 
         # open available xmon
         xmon = xmonlist[0]
-        cmdlist = ["d.mon","start=%s" % xmon]
-        p = gcmd.Command(cmdlist)
-
+        gcmd.RunCommand('d.mon',
+                        start = xmon)
+        
         # run the command        
         runbat = os.path.join(gisbase,'etc','grass-run.bat')
         xtermwrapper = os.path.join(gisbase,'etc','grass-xterm-wrapper')
@@ -976,6 +977,7 @@
             cmdlist = ["cmd.exe", "/c", 'start "%s"' % runbat, command]
         else:
             cmdlist = [xtermwrapper, '-e "%s"' % grassrun, command]
+
         p = gcmd.Command(cmdlist)
 
         # reset display mode