[PROCESSING] Fix Progress bar in Dissolve

Bernhard Ströbl · Bernhard Ströbl · commit 1f81109b4a3f · 2015-08-19T16:02:10.000+02:00
diff --git a/python/plugins/processing/algs/qgis/Dissolve.py b/python/plugins/processing/algs/qgis/Dissolve.py
@@ -61,13 +61,17 @@ def processAlgorithm(self, progress):
                                              vproviderA.crs())
         outFeat = QgsFeature()
         nElement = 0
-        nFeat = vproviderA.featureCount()
+        nFeat = vlayerA.selectedFeatureCount()
+
+        if nFeat == 0:
+            nFeat = vlayerA.featureCount()
+
         if not useField:
             first = True
             features = vector.features(vlayerA)
             for inFeat in features:
                 nElement += 1
-                progress.setPercentage(int(nElement / nFeat * 100))
+                progress.setPercentage(int(nElement * 100/ nFeat))
                 if first:
                     attrs = inFeat.attributes()
                     tmpInGeom = QgsGeometry(inFeat.geometry())
@@ -93,7 +97,7 @@ def processAlgorithm(self, progress):
                 features = vector.features(vlayerA)
                 for inFeat in features:
                     nElement += 1
-                    progress.setPercentage(int(nElement / nFeat * 100))
+                    progress.setPercentage(int(nElement * 100/ nFeat))
                     atMap = inFeat.attributes()
                     tempItem = atMap[field]
                     if unicode(tempItem).strip() == unicode(item).strip():
