[GRASS] do not show 100% progress until module finished, fixes #3131

blazek · blazek · commit b952f0f177ed · 2016-02-23T08:41:15.000+01:00
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -746,7 +746,7 @@ void QgsGrassModule::finished( int exitCode, QProcess::ExitStatus exitStatus )
     if ( exitCode == 0 )
     {
       mOutputTextBrowser->append( tr( "<B>Successfully finished</B>" ) );
-      mProgressBar->setValue( 100 );
+      setProgress( 100, true );
       mSuccess = true;
       mViewButton->setEnabled( !mOutputVector.isEmpty() || !mOutputRaster.isEmpty() );
       mOptions->freezeOutput( false );
@@ -784,7 +784,7 @@ void QgsGrassModule::readStdout()
     if ( rxpercent.indexIn( line ) != -1 )
     {
       int progress = rxpercent.cap( 1 ).toInt();
-      mProgressBar->setValue( progress );
+      setProgress( progress );
     }
     else
     {
@@ -810,7 +810,7 @@ void QgsGrassModule::readStderr()
     QgsGrass::ModuleOutput type =  QgsGrass::parseModuleOutput( line, text, html, percent );
     if ( type == QgsGrass::OutputPercent )
     {
-      mProgressBar->setValue( percent );
+      setProgress( percent );
     }
     else if ( type == QgsGrass::OutputMessage || type == QgsGrass::OutputWarning || type == QgsGrass::OutputError )
     {
@@ -819,6 +819,19 @@ void QgsGrassModule::readStderr()
   }
 }
 
+void QgsGrassModule::setProgress( int percent, bool force )
+{
+  int max = 100;
+  // Do not set 100% until module finished, see #3131
+  if ( percent >= 100 && !force )
+  {
+    max = 0; // busy indicator
+    percent = 0;
+  }
+  mProgressBar->setMaximum( max );
+  mProgressBar->setValue( percent );
+}
+
 void QgsGrassModule::close()
 {
   delete this;
diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h
@@ -125,6 +125,11 @@ class QgsGrassModule : public QWidget, private  Ui::QgsGrassModuleBase
     //void mapsetChanged();
 
   private:
+    /** Set progress bar or busy indicator if percent is 100
+     * @param percent progress to show in %
+     * @param force to set progress for 100% */
+    void setProgress( int percent, bool force = false );
+
     //! Pointer to the QGIS interface object
     QgisInterface *mIface;
 

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ void QgsGrassModule::finished( int exitCode, QProcess::ExitStatus exitStatus )`
`746`	`746`	`if ( exitCode == 0 )`
`747`	`747`	`{`
`748`	`748`	`mOutputTextBrowser->append( tr( "<B>Successfully finished</B>" ) );`
`749`		`- mProgressBar->setValue( 100 );`
	`749`	`+ setProgress( 100, true );`
`750`	`750`	`mSuccess = true;`
`751`	`751`	`mViewButton->setEnabled( !mOutputVector.isEmpty() \|\| !mOutputRaster.isEmpty() );`
`752`	`752`	`mOptions->freezeOutput( false );`
`@@ -784,7 +784,7 @@ void QgsGrassModule::readStdout()`
`784`	`784`	`if ( rxpercent.indexIn( line ) != -1 )`
`785`	`785`	`{`
`786`	`786`	`int progress = rxpercent.cap( 1 ).toInt();`
`787`		`- mProgressBar->setValue( progress );`
	`787`	`+ setProgress( progress );`
`788`	`788`	`}`
`789`	`789`	`else`
`790`	`790`	`{`
`@@ -810,7 +810,7 @@ void QgsGrassModule::readStderr()`
`810`	`810`	`QgsGrass::ModuleOutput type = QgsGrass::parseModuleOutput( line, text, html, percent );`
`811`	`811`	`if ( type == QgsGrass::OutputPercent )`
`812`	`812`	`{`
`813`		`- mProgressBar->setValue( percent );`
	`813`	`+ setProgress( percent );`
`814`	`814`	`}`
`815`	`815`	`else if ( type == QgsGrass::OutputMessage \|\| type == QgsGrass::OutputWarning \|\| type == QgsGrass::OutputError )`
`816`	`816`	`{`
`@@ -819,6 +819,19 @@ void QgsGrassModule::readStderr()`
`819`	`819`	`}`
`820`	`820`	`}`
`821`	`821`
	`822`	`+void QgsGrassModule::setProgress( int percent, bool force )`
	`823`	`+{`
	`824`	`+ int max = 100;`
	`825`	`+ // Do not set 100% until module finished, see #3131`
	`826`	`+ if ( percent >= 100 && !force )`
	`827`	`+ {`
	`828`	`+ max = 0; // busy indicator`
	`829`	`+ percent = 0;`
	`830`	`+ }`
	`831`	`+ mProgressBar->setMaximum( max );`
	`832`	`+ mProgressBar->setValue( percent );`
	`833`	`+}`
	`834`	`+`
`822`	`835`	`void QgsGrassModule::close()`
`823`	`836`	`{`
`824`	`837`	`delete this;`