Use progress progress task for identify tool progress

qgis · Aug 20, 2018 · 485803d · 485803d
1 parent c7845dd
commit 485803d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp
@@ -38,6 +38,7 @@
 #include "qgsunittypes.h"
 #include "qgsstatusbar.h"
 #include "qgsactionscoperegistry.h"
+#include "qgsproxyprogresstask.h"
 
 #include "qgssettings.h"
 #include <QMouseEvent>
@@ -111,7 +112,14 @@ void QgsMapToolIdentifyAction::showAttributeTable( QgsMapLayer *layer, const QLi
 void QgsMapToolIdentifyAction::identifyFromGeometry()
 {
   resultsDialog()->clear();
-  connect( this, &QgsMapToolIdentifyAction::identifyProgress, QgisApp::instance(), &QgisApp::showProgress );
+
+  QgsProxyProgressTask *task = new QgsProxyProgressTask( tr( "Identifying features" ) );
+  QgsApplication::taskManager()->addTask( task );
+
+  connect( this, &QgsMapToolIdentifyAction::identifyProgress, task, [ = ]( int i, int n )
+  {
+    task->setProxyProgress( static_cast<double>( i ) * 100.0 / n );
+  } );
   connect( this, &QgsMapToolIdentifyAction::identifyMessage, QgisApp::instance(), &QgisApp::showStatusMessage );
 
   QgsGeometry geometry = mSelectionHandler->selectedGeometry();
@@ -131,7 +139,7 @@ void QgsMapToolIdentifyAction::identifyFromGeometry()
 
   QList<IdentifyResult> results = QgsMapToolIdentify::identify( geometry, mode, AllLayers );
 
-  disconnect( this, &QgsMapToolIdentifyAction::identifyProgress, QgisApp::instance(), &QgisApp::showProgress );
+  task->finalize( true );
   disconnect( this, &QgsMapToolIdentifyAction::identifyMessage, QgisApp::instance(), &QgisApp::showStatusMessage );
 
   if ( results.isEmpty() )