[GRASS-SVN] r40082 - grass/branches/develbranch_6/gui/wxpython/gui_modules

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Dec 19 16:51:38 EST 2009


Author: martinl
Date: 2009-12-19 16:51:38 -0500 (Sat, 19 Dec 2009)
New Revision: 40082

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
Log:
wxGUI: launch non-GRASS commands
       (merge r40081 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-12-19 21:47:20 UTC (rev 40081)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-12-19 21:51:38 UTC (rev 40082)
@@ -464,21 +464,13 @@
         else:
             # Send any other command to the shell. Send output to
             # console output window
+            self.cmdThread.RunCmd(GrassCmd,
+                                  onDone,
+                                  cmdlist,
+                                  self.cmd_stdout, self.cmd_stderr)                                         
+            self.btn_abort.Enable()
+            self.cmd_output_timer.Start(50)
 
-            # if command is not a GRASS command, treat it like a shell command
-            try:
-#                gcmd.Command(cmdlist,
-#                         stdout=self.cmd_stdout,
-#                         stderr=self.cmd_stderr)
-                self.cmdThread.RunCmd(GrassCmd,
-                                      onDone,
-                                      cmdlist,
-                                      self.cmd_stdout, self.cmd_stderr)
-                self.btn_abort.Enable()
-                self.cmd_output_timer.Start(50)
-            except gcmd.CmdError, e:
-                print >> sys.stderr, e
-
         # reset output window to read only
         self.cmd_output.SetReadOnly(True)
         



More information about the grass-commit mailing list