Skip to content

Commit 670bb0d

Browse files
author
rblazek
committed
pre for any module output
git-svn-id: http://svn.osgeo.org/qgis/trunk@12684 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d59c7ce commit 670bb0d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/plugins/grass/qgsgrassmodule.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ void QgsGrassModule::readStdout()
14121412
{
14131413
//line = QString::fromLocal8Bit( mProcess.readLineStdout().ascii() );
14141414
QByteArray ba = mProcess.readLine();
1415-
line = QString::fromUtf8( ba );
1415+
line = QString::fromUtf8( ba ).replace('\n', "" );
14161416
//QgsDebugMsg(QString("line: '%1'").arg(line));
14171417

14181418
// GRASS_INFO_PERCENT is catched here only because of bugs in GRASS,
@@ -1447,7 +1447,7 @@ void QgsGrassModule::readStderr()
14471447
{
14481448
//line = QString::fromLocal8Bit( mProcess.readLineStderr().ascii() );
14491449
QByteArray ba = mProcess.readLine();
1450-
line = QString::fromUtf8( ba );
1450+
line = QString::fromUtf8( ba ).replace('\n', "" );
14511451
//QgsDebugMsg(QString("line: '%1'").arg(line));
14521452

14531453
if ( rxpercent.indexIn( line ) != -1 )
@@ -1477,7 +1477,7 @@ void QgsGrassModule::readStderr()
14771477
}
14781478
else
14791479
{
1480-
mOutputTextBrowser->append( line + "\n" );
1480+
mOutputTextBrowser->append( "<pre>" + line + "</pre>" );
14811481
}
14821482
}
14831483
}

0 commit comments

Comments
 (0)