Fixed console display hook (works only for single input)

git-svn-id: http://svn.osgeo.org/qgis/trunk@12125 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 15, 2009 · 5de2b25 · 5de2b25
1 parent 4e182fc
commit 5de2b25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/python/utils.py b/python/utils.py
@@ -60,6 +60,7 @@ def initInterface(pointer):
 # hook for python console so all output will be redirected
 # and then shown in console
 def console_displayhook(obj):
+  global console_output
   console_output = obj
 
 class QgisOutputCatcher:

diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -301,7 +301,11 @@ bool QgsPythonUtilsImpl::getError( QString& errorClassName, QString& errorText )
 
 QString QgsPythonUtilsImpl::getResult()
 {
-  return getVariableFromMain( "qgis.utils.console_output" );
+  QString res;
+  evalString( "qgis.utils.console_output", res );
+  // clear output
+  runString("qgis.utils.console_output = None");
+  return res;
 }
 
 QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )