[raster calculator] use feedback when reprojecting raster block

qgis · Feb 9, 2018 · 5fa5b86 · 5fa5b86
1 parent e27847d
commit 5fa5b86
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp
@@ -88,7 +88,16 @@ int QgsRasterCalculator::processCalculation( QgsFeedback *feedback )
       proj.setInput( it->raster->dataProvider() );
       proj.setPrecision( QgsRasterProjector::Exact );
 
-      block = proj.block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );
+      QgsRasterBlockFeedback *rasterBlockFeedback = new QgsRasterBlockFeedback();
+      QObject::connect( feedback, &QgsFeedback::canceled, rasterBlockFeedback, &QgsRasterBlockFeedback::cancel );
+      block = proj.block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows, rasterBlockFeedback );
+      if ( rasterBlockFeedback->isCanceled() )
+      {
+        delete block;
+        delete calcNode;
+        qDeleteAll( inputBlocks );
+        return static_cast< int >( Canceled );
+      }
     }
     else
     {