[GRASS] use monospace font for module's output

blazek · blazek · commit d64a46f43c2e · 2015-09-30T16:34:59.000+02:00
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -182,6 +182,8 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn
   QgsDebugMsg( "called" );
 
   setupUi( this );
+  // use fixed width font because module's output may be formated
+  mOutputTextBrowser->setStyleSheet( "font-family: Monospace; font-size: 9pt;" );
   lblModuleName->setText( tr( "Module: %1" ).arg( moduleName ) );
   mTools = tools;
   mIface = iface;
@@ -860,9 +862,7 @@ void QgsGrassModule::readStdout()
   while ( mProcess.canReadLine() )
   {
     QByteArray ba = mProcess.readLine();
-    //line = QString::fromUtf8( ba ).replace( '\n', "" );
     line = QString::fromLocal8Bit( ba ).replace( '\n', "" );
-    //QgsDebugMsg(QString("line: '%1'").arg(line));
 
     // GRASS_INFO_PERCENT is catched here only because of bugs in GRASS,
     // normaly it should be printed to stderr
@@ -873,7 +873,7 @@ void QgsGrassModule::readStdout()
     }
     else
     {
-      mOutputTextBrowser->append( "<pre>" + line + "</pre>" );
+      mOutputTextBrowser->append( line );
     }
   }
 }
@@ -888,9 +888,7 @@ void QgsGrassModule::readStderr()
   while ( mProcess.canReadLine() )
   {
     QByteArray ba = mProcess.readLine();
-    //line = QString::fromUtf8( ba ).replace( '\n', "" );
     line = QString::fromLocal8Bit( ba ).replace( '\n', "" );
-    //QgsDebugMsg(QString("line: '%1'").arg(line));
 
     QString text, html;
     int percent;

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,8 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn`
`182`	`182`	`QgsDebugMsg( "called" );`
`183`	`183`
`184`	`184`	`setupUi( this );`
	`185`	`+ // use fixed width font because module's output may be formated`
	`186`	`+ mOutputTextBrowser->setStyleSheet( "font-family: Monospace; font-size: 9pt;" );`
`185`	`187`	`lblModuleName->setText( tr( "Module: %1" ).arg( moduleName ) );`
`186`	`188`	`mTools = tools;`
`187`	`189`	`mIface = iface;`
`@@ -860,9 +862,7 @@ void QgsGrassModule::readStdout()`
`860`	`862`	`while ( mProcess.canReadLine() )`
`861`	`863`	`{`
`862`	`864`	`QByteArray ba = mProcess.readLine();`
`863`		`- //line = QString::fromUtf8( ba ).replace( '\n', "" );`
`864`	`865`	`line = QString::fromLocal8Bit( ba ).replace( '\n', "" );`
`865`		`- //QgsDebugMsg(QString("line: '%1'").arg(line));`
`866`	`866`
`867`	`867`	`// GRASS_INFO_PERCENT is catched here only because of bugs in GRASS,`
`868`	`868`	`// normaly it should be printed to stderr`
`@@ -873,7 +873,7 @@ void QgsGrassModule::readStdout()`
`873`	`873`	`}`
`874`	`874`	`else`
`875`	`875`	`{`
`876`		`- mOutputTextBrowser->append( "<pre>" + line + "</pre>" );`
	`876`	`+ mOutputTextBrowser->append( line );`
`877`	`877`	`}`
`878`	`878`	`}`
`879`	`879`	`}`
`@@ -888,9 +888,7 @@ void QgsGrassModule::readStderr()`
`888`	`888`	`while ( mProcess.canReadLine() )`
`889`	`889`	`{`
`890`	`890`	`QByteArray ba = mProcess.readLine();`
`891`		`- //line = QString::fromUtf8( ba ).replace( '\n', "" );`
`892`	`891`	`line = QString::fromLocal8Bit( ba ).replace( '\n', "" );`
`893`		`- //QgsDebugMsg(QString("line: '%1'").arg(line));`
`894`	`892`
`895`	`893`	`QString text, html;`
`896`	`894`	`int percent;`