Browse Source

wxNviz: use goutput.GetLog
goutput - fix typo in variable name


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48456 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 13 years ago
parent
commit
966e9d27d8
2 changed files with 7 additions and 7 deletions
  1. 5 5
      gui/wxpython/gui_modules/goutput.py
  2. 2 2
      gui/wxpython/gui_modules/nviz_mapdisp.py

+ 5 - 5
gui/wxpython/gui_modules/goutput.py

@@ -232,7 +232,7 @@ class GMConsole(wx.SplitterWindow):
         
         
         # stream redirection
         # stream redirection
         self.cmdStdOut = GMStdout(self)
         self.cmdStdOut = GMStdout(self)
-        self.cmdStrErr = GMStderr(self)
+        self.cmdStdErr = GMStderr(self)
         
         
         # thread
         # thread
         self.cmdThread = CmdThread(self, self.requestQ, self.resultQ)
         self.cmdThread = CmdThread(self, self.requestQ, self.resultQ)
@@ -362,7 +362,7 @@ class GMConsole(wx.SplitterWindow):
         if Debug.GetLevel() == 0 and int(grass.gisenv().get('DEBUG', 0)) == 0:
         if Debug.GetLevel() == 0 and int(grass.gisenv().get('DEBUG', 0)) == 0:
             # don't redirect when debugging is enabled
             # don't redirect when debugging is enabled
             sys.stdout = self.cmdStdOut
             sys.stdout = self.cmdStdOut
-            sys.stderr = self.cmdStrErr
+            sys.stderr = self.cmdStdErr
         else:
         else:
             enc = locale.getdefaultlocale()[1]
             enc = locale.getdefaultlocale()[1]
             if enc:
             if enc:
@@ -557,7 +557,7 @@ class GMConsole(wx.SplitterWindow):
                         del os.environ["GRASS_REGION"]
                         del os.environ["GRASS_REGION"]
                     
                     
                 # process GRASS command with argument
                 # 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)
                                       onDone = onDone)
                 self.cmdOutputTimer.Start(50)
                 self.cmdOutputTimer.Start(50)
                 
                 
@@ -579,7 +579,7 @@ class GMConsole(wx.SplitterWindow):
                 # process GRASS command without argument
                 # process GRASS command without argument
                 menuform.GUI(parent = self).ParseCommand(command)
                 menuform.GUI(parent = self).ParseCommand(command)
             else:
             else:
-                self.cmdThread.RunCmd(command, stdout = self.cmdStdOut, stderr = self.cmdStrErr,
+                self.cmdThread.RunCmd(command, stdout = self.cmdStdOut, stderr = self.cmdStdErr,
                                       onDone = onDone)
                                       onDone = onDone)
             self.cmdOutputTimer.Start(50)
             self.cmdOutputTimer.Start(50)
         
         
@@ -602,7 +602,7 @@ class GMConsole(wx.SplitterWindow):
         @param err True to get stderr widget
         @param err True to get stderr widget
         """
         """
         if err:
         if err:
-            return self.cmdStrErr
+            return self.cmdStdErr
         
         
         return self.cmdStdOut
         return self.cmdStdOut
     
     

+ 2 - 2
gui/wxpython/gui_modules/nviz_mapdisp.py

@@ -121,8 +121,8 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
     
     
         if self.lmgr:
         if self.lmgr:
             self.log = self.lmgr.goutput
             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:
         else:
             self.log = logmsg = sys.stdout
             self.log = logmsg = sys.stdout
             logerr = sys.stderr
             logerr = sys.stderr