Merge pull request #585 from vinayan/randomsel

[Fix #7785] - ftools-random selection broken in master
qgis · May 11, 2013 · adb2653 · adb2653
2 parents bbdeceb + 2ad5707
commit adb2653
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/python/plugins/fTools/tools/doSubsetSelect.py b/python/plugins/fTools/tools/doSubsetSelect.py
@@ -81,8 +81,9 @@ def accept(self):
 
     def compute(self, inVect, inField, value, perc, progressBar):
         mlayer = ftools_utils.getMapLayerByName(inVect)
-        mlayer.removeSelection(True)
+        mlayer.removeSelection()
         vlayer = ftools_utils.getVectorLayerByName(inVect)
+        vprovider = vlayer.dataProvider()
         index = vprovider.fieldNameIndex(inField)
         #unique = []
         #vprovider.uniqueValues(index, unique)
@@ -93,7 +94,7 @@ def compute(self, inVect, inField, value, perc, progressBar):
         nElement = 0
         self.progressBar.setValue(0)
         self.progressBar.setRange(0, nFeat)
-	fit = vprovider.getFeatures()
+        fit = vprovider.getFeatures()
         if not len(unique) == mlayer.featureCount():
             for i in unique:
                 fit.rewind()

diff --git a/python/plugins/sextante/algs/ftools/RandomSelection.py b/python/plugins/sextante/algs/ftools/RandomSelection.py
@@ -72,7 +72,7 @@ def processAlgorithm(self, progress):
         featureCount = layer.featureCount()
         value = int(self.getParameterValue(self.NUMBER))
 
-        layer.removeSelection(True)
+        layer.removeSelection()
 
         if method == 0:
             if value > featureCount:

diff --git a/python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py b/python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py
@@ -72,7 +72,7 @@ def processAlgorithm(self, progress):
         field = self.getParameterValue(self.FIELD)
         method = self.getParameterValue(self.METHOD)
 
-        layer.removeSelection(True)
+        layer.removeSelection()
         index = layer.fieldNameIndex(field)
 
         unique = utils.getUniqueValues(layer, index)