Fix cancelation support for reclassify algs

nyalldawson · nyalldawson · commit 85d895d0e3c4 · 2018-06-13T14:54:40.000+10:00
diff --git a/src/analysis/processing/qgsreclassifyutils.cpp b/src/analysis/processing/qgsreclassifyutils.cpp
@@ -54,6 +54,8 @@ void QgsReclassifyUtils::reclassify( const QVector<QgsReclassifyUtils::RasterCla
   {
     if ( feedback )
       feedback->setProgress( 100 * ( ( iterTop / maxHeight * nbBlocksWidth ) + iterLeft / maxWidth ) / nbBlocks );
+    if ( feedback && feedback->isCanceled() )
+      break;
     std::unique_ptr< QgsRasterBlock > reclassifiedBlock = qgis::make_unique< QgsRasterBlock >( Qgis::Float32, iterCols, iterRows );
 
     for ( int row = 0; row < iterRows; row++ )

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ void QgsReclassifyUtils::reclassify( const QVector<QgsReclassifyUtils::RasterCla`
`54`	`54`	`{`
`55`	`55`	`if ( feedback )`
`56`	`56`	`feedback->setProgress( 100 * ( ( iterTop / maxHeight * nbBlocksWidth ) + iterLeft / maxWidth ) / nbBlocks );`
	`57`	`+ if ( feedback && feedback->isCanceled() )`
	`58`	`+ break;`
`57`	`59`	`std::unique_ptr< QgsRasterBlock > reclassifiedBlock = qgis::make_unique< QgsRasterBlock >( Qgis::Float32, iterCols, iterRows );`
`58`	`60`
`59`	`61`	`for ( int row = 0; row < iterRows; row++ )`