mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-27 00:33:48 -05:00
output encoding
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3071 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
7abe1ad2b6
commit
793516869b
@ -415,8 +415,7 @@ void QgsGrassModule::readStdout()
|
|||||||
|
|
||||||
QString line;
|
QString line;
|
||||||
while ( mProcess.canReadLineStdout() ) {
|
while ( mProcess.canReadLineStdout() ) {
|
||||||
line = mProcess.readLineStdout ();
|
line = QString::fromLocal8Bit( mProcess.readLineStdout().ascii() );
|
||||||
//std::cerr << "stdout: " << line << std::endl;
|
|
||||||
mOutputTextBrowser->append ( line );
|
mOutputTextBrowser->append ( line );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -432,9 +431,10 @@ void QgsGrassModule::readStderr()
|
|||||||
QRegExp rxwarning ( "GRASS_INFO_WARNING\\(\\d+,\\d+\\): (.*)" );
|
QRegExp rxwarning ( "GRASS_INFO_WARNING\\(\\d+,\\d+\\): (.*)" );
|
||||||
QRegExp rxerror ( "GRASS_INFO_ERROR\\(\\d+,\\d+\\): (.*)" );
|
QRegExp rxerror ( "GRASS_INFO_ERROR\\(\\d+,\\d+\\): (.*)" );
|
||||||
QRegExp rxend ( "GRASS_INFO_END\\(\\d+,\\d+\\)" );
|
QRegExp rxend ( "GRASS_INFO_END\\(\\d+,\\d+\\)" );
|
||||||
|
|
||||||
|
|
||||||
while ( mProcess.canReadLineStderr() ) {
|
while ( mProcess.canReadLineStderr() ) {
|
||||||
line = mProcess.readLineStderr ();
|
line = QString::fromLocal8Bit( mProcess.readLineStderr().ascii() );
|
||||||
//std::cerr << "stderr: " << line << std::endl;
|
//std::cerr << "stderr: " << line << std::endl;
|
||||||
|
|
||||||
if ( rxpercent.search ( line ) != -1 ) {
|
if ( rxpercent.search ( line ) != -1 ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user