Make sure heatmap is cancellable

nyalldawson · nyalldawson · commit 0bf17b5bd12e · 2013-05-07T13:12:12.000+10:00
diff --git a/src/plugins/heatmap/heatmap.cpp b/src/plugins/heatmap/heatmap.cpp
@@ -204,7 +204,7 @@ void Heatmap::run()
     int counter = 0;
 
     QProgressDialog p( tr( "Creating heatmap" ), tr( "Abort" ), 0, totalFeatures, mQGisIface->mainWindow() );
-    p.setWindowModality( Qt::WindowModal );
+    p.setWindowModality( Qt::ApplicationModal );
     p.show();
 
     QgsFeature myFeature;
@@ -213,6 +213,7 @@ void Heatmap::run()
     {
       counter++;
       p.setValue( counter );
+      QApplication::processEvents();
       if ( p.wasCanceled() )
       {
         QMessageBox::information( 0, tr( "Heatmap generation aborted" ), tr( "QGIS will now load the partially-computed raster." ) );

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ void Heatmap::run()`
`204`	`204`	`int counter = 0;`
`205`	`205`
`206`	`206`	`QProgressDialog p( tr( "Creating heatmap" ), tr( "Abort" ), 0, totalFeatures, mQGisIface->mainWindow() );`
`207`		`- p.setWindowModality( Qt::WindowModal );`
	`207`	`+ p.setWindowModality( Qt::ApplicationModal );`
`208`	`208`	`p.show();`
`209`	`209`
`210`	`210`	`QgsFeature myFeature;`
`@@ -213,6 +213,7 @@ void Heatmap::run()`
`213`	`213`	`{`
`214`	`214`	`counter++;`
`215`	`215`	`p.setValue( counter );`
	`216`	`+ QApplication::processEvents();`
`216`	`217`	`if ( p.wasCanceled() )`
`217`	`218`	`{`
`218`	`219`	`QMessageBox::information( 0, tr( "Heatmap generation aborted" ), tr( "QGIS will now load the partially-computed raster." ) );`