[QGIS Commit] r12684 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: rblazek
Date: 2010-01-07 02:29:17 -0500 (Thu, 07 Jan 2010)
New Revision: 12684

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
Log:
pre for any module output

Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2010-01-07 02:35:24 UTC (rev 12683)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2010-01-07 07:29:17 UTC (rev 12684)
@@ -1412,7 +1412,7 @@
   {
     //line = QString::fromLocal8Bit( mProcess.readLineStdout().ascii() );
     QByteArray ba = mProcess.readLine();
-    line = QString::fromUtf8( ba );
+    line = QString::fromUtf8( ba ).replace('\n', "" );
     //QgsDebugMsg(QString("line: '%1'").arg(line));
 
     // GRASS_INFO_PERCENT is catched here only because of bugs in GRASS,
@@ -1447,7 +1447,7 @@
   {
     //line = QString::fromLocal8Bit( mProcess.readLineStderr().ascii() );
     QByteArray ba = mProcess.readLine();
-    line = QString::fromUtf8( ba );
+    line = QString::fromUtf8( ba ).replace('\n', "" );
     //QgsDebugMsg(QString("line: '%1'").arg(line));
 
     if ( rxpercent.indexIn( line ) != -1 )
@@ -1477,7 +1477,7 @@
     }
     else
     {
-      mOutputTextBrowser->append( line + "\n" );
+      mOutputTextBrowser->append( "<pre>" + line + "</pre>" );
     }
   }
 }