[GRASS-SVN] r48456 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-09-25 02:56:36 -0700 (Sun, 25 Sep 2011)
New Revision: 48456

Modified:
   grass/trunk/gui/wxpython/gui_modules/goutput.py
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
Log:
wxNviz: use goutput.GetLog
	goutput - fix typo in variable name


Modified: grass/trunk/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/goutput.py	2011-09-25 09:46:14 UTC (rev 48455)
+++ grass/trunk/gui/wxpython/gui_modules/goutput.py	2011-09-25 09:56:36 UTC (rev 48456)
@@ -232,7 +232,7 @@
         
         # stream redirection
         self.cmdStdOut = GMStdout(self)
-        self.cmdStrErr = GMStderr(self)
+        self.cmdStdErr = GMStderr(self)
         
         # thread
         self.cmdThread = CmdThread(self, self.requestQ, self.resultQ)
@@ -362,7 +362,7 @@
         if Debug.GetLevel() == 0 and int(grass.gisenv().get('DEBUG', 0)) == 0:
             # don't redirect when debugging is enabled
             sys.stdout = self.cmdStdOut
-            sys.stderr = self.cmdStrErr
+            sys.stderr = self.cmdStdErr
         else:
             enc = locale.getdefaultlocale()[1]
             if enc:
@@ -557,7 +557,7 @@
                         del os.environ["GRASS_REGION"]
                     
                 # process GRASS command with argument
-                self.cmdThread.RunCmd(command, stdout = self.cmdStdOut, stderr = self.cmdStrErr,
+                self.cmdThread.RunCmd(command, stdout = self.cmdStdOut, stderr = self.cmdStdErr,
                                       onDone = onDone)
                 self.cmdOutputTimer.Start(50)
                 
@@ -579,7 +579,7 @@
                 # process GRASS command without argument
                 menuform.GUI(parent = self).ParseCommand(command)
             else:
-                self.cmdThread.RunCmd(command, stdout = self.cmdStdOut, stderr = self.cmdStrErr,
+                self.cmdThread.RunCmd(command, stdout = self.cmdStdOut, stderr = self.cmdStdErr,
                                       onDone = onDone)
             self.cmdOutputTimer.Start(50)
         
@@ -602,7 +602,7 @@
         @param err True to get stderr widget
         """
         if err:
-            return self.cmdStrErr
+            return self.cmdStdErr
         
         return self.cmdStdOut
     

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2011-09-25 09:46:14 UTC (rev 48455)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2011-09-25 09:56:36 UTC (rev 48456)
@@ -121,8 +121,8 @@
     
         if self.lmgr:
             self.log = self.lmgr.goutput
-            logerr = self.lmgr.goutput.cmdStrErr
-            logmsg = self.lmgr.goutput.cmdOutput
+            logerr = self.lmgr.goutput.GetLog(err = True)
+            logmsg = self.lmgr.goutput.GetLog()
         else:
             self.log = logmsg = sys.stdout
             logerr = sys.stderr