[Geometry snapper] Fix progress bar not working

manisandro · manisandro · commit b00950b9d63c · 2016-01-21T18:47:08.000+01:00
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp
@@ -49,11 +49,13 @@ QgsGeometrySnapper::QgsGeometrySnapper( QgsVectorLayer *adjustLayer, QgsVectorLa
 
 QFuture<void> QgsGeometrySnapper::processFeatures()
 {
+  emit progressRangeChanged( 0, mFeatures.size() );
   return QtConcurrent::map( mFeatures, ProcessFeatureWrapper( this ) );
 }
 
 void QgsGeometrySnapper::processFeature( QgsFeatureId id )
 {
+  emit progressStep();
   // Get current feature
   QgsFeature feature;
   if ( !getFeature( mAdjustLayer, mAdjustLayerMutex, id, feature ) )
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapper.h b/src/plugins/geometry_snapper/qgsgeometrysnapper.h
@@ -35,6 +35,10 @@ class QgsGeometrySnapper : public QObject
     QFuture<void> processFeatures();
     const QStringList& getErrors() const { return mErrors; }
 
+  signals:
+    void progressRangeChanged( int min, int max );
+    void progressStep();
+
   private:
     struct ProcessFeatureWrapper
     {
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp
@@ -280,8 +280,6 @@ void QgsGeometrySnapperDialog::run()
   /** Run **/
   QEventLoop evLoop;
   QFutureWatcher<void> futureWatcher;
-  connect( &futureWatcher, SIGNAL( progressRangeChanged( int, int ) ), progressBar, SLOT( setRange( int, int ) ) );
-  connect( &futureWatcher, SIGNAL( progressValueChanged( int ) ), progressBar, SLOT( setValue( int ) ) );
   connect( &futureWatcher, SIGNAL( finished() ), &evLoop, SLOT( quit() ) );
   connect( buttonBox->button( QDialogButtonBox::Abort ), SIGNAL( clicked() ), &futureWatcher, SLOT( cancel() ) );
 
@@ -294,6 +292,8 @@ void QgsGeometrySnapperDialog::run()
   widgetInputs->setEnabled( false );
 
   QgsGeometrySnapper snapper( layer, referenceLayer, selectedOnly, doubleSpinBoxMaxDistance->value(), &mIface->mapCanvas()->mapSettings() );
+  connect( &snapper, SIGNAL( progressRangeChanged( int, int ) ), progressBar, SLOT( setRange( int, int ) ) );
+  connect( &snapper, SIGNAL( progressStep() ), this, SLOT( progressStep() ) );
   futureWatcher.setFuture( snapper.processFeatures() );
   evLoop.exec();
 
@@ -317,3 +317,8 @@ void QgsGeometrySnapperDialog::run()
   hide() ;
 }
 
+void QgsGeometrySnapperDialog::progressStep()
+{
+  progressBar->setValue( progressBar->value() + 1 );
+}
+
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.h b/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.h
@@ -46,6 +46,7 @@ class QgsGeometrySnapperDialog: public QDialog, private Ui::QgsGeometrySnapperDi
     void updateLayers();
     void validateInput();
     void selectOutputFile();
+    void progressStep();
 };
 
 #endif // QGS_GEOMETRY_SNAPPER_DIALOG_H

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,13 @@ QgsGeometrySnapper::QgsGeometrySnapper( QgsVectorLayer *adjustLayer, QgsVectorLa`
`49`	`49`
`50`	`50`	`QFuture<void> QgsGeometrySnapper::processFeatures()`
`51`	`51`	`{`
	`52`	`+ emit progressRangeChanged( 0, mFeatures.size() );`
`52`	`53`	`return QtConcurrent::map( mFeatures, ProcessFeatureWrapper( this ) );`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`void QgsGeometrySnapper::processFeature( QgsFeatureId id )`
`56`	`57`	`{`
	`58`	`+ emit progressStep();`
`57`	`59`	`// Get current feature`
`58`	`60`	`QgsFeature feature;`
`59`	`61`	`if ( !getFeature( mAdjustLayer, mAdjustLayerMutex, id, feature ) )`