Re-add the progress bar to the calculator

elpaso · elpaso · commit d3d18050a07b · 2018-11-26T15:54:02.000+01:00
Fixes #20583 - Raster calculator freezes the GUI with big rasters ... even if it is frozen while reding the raster, at least it allows to abort the process later
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5682,6 +5682,7 @@ void QgisApp::showRasterCalculator()
     QgsFeedback feedback;
     connect( &feedback, &QgsFeedback::progressChanged, &p, &QProgressDialog::setValue );
     connect( &p, &QProgressDialog::canceled, &feedback, &QgsFeedback::cancel );
+    p.show();
     QgsRasterCalculator::Result res = static_cast< QgsRasterCalculator::Result >( rc.processCalculation( &feedback ) );
     switch ( res )
     {
@@ -5728,6 +5729,7 @@ void QgisApp::showRasterCalculator()
                                    Qgis::Critical );
         break;
     }
+    p.hide();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5682,6 +5682,7 @@ void QgisApp::showRasterCalculator()`
`5682`	`5682`	`QgsFeedback feedback;`
`5683`	`5683`	`connect( &feedback, &QgsFeedback::progressChanged, &p, &QProgressDialog::setValue );`
`5684`	`5684`	`connect( &p, &QProgressDialog::canceled, &feedback, &QgsFeedback::cancel );`
	`5685`	`+ p.show();`
`5685`	`5686`	`QgsRasterCalculator::Result res = static_cast< QgsRasterCalculator::Result >( rc.processCalculation( &feedback ) );`
`5686`	`5687`	`switch ( res )`
`5687`	`5688`	`{`
`@@ -5728,6 +5729,7 @@ void QgisApp::showRasterCalculator()`
`5728`	`5729`	`Qgis::Critical );`
`5729`	`5730`	`break;`
`5730`	`5731`	`}`
	`5732`	`+ p.hide();`
`5731`	`5733`	`}`
`5732`	`5734`	`}`
`5733`	`5735`