From e2b1dbaaf0a98fa562ae482cbc39824433e59e40 Mon Sep 17 00:00:00 2001 From: vinayan Date: Sat, 11 May 2013 19:29:57 +0530 Subject: [PATCH 1/2] ftools-fix broken random selection --- python/plugins/fTools/tools/doSubsetSelect.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/plugins/fTools/tools/doSubsetSelect.py b/python/plugins/fTools/tools/doSubsetSelect.py index b227cf23e412..9ccd2a91cbe7 100644 --- 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() From 2ad5707ba2a855ae09e218c507d6bc1482a978d0 Mon Sep 17 00:00:00 2001 From: vinayan Date: Sat, 11 May 2013 20:40:57 +0530 Subject: [PATCH 2/2] fix random selections in sextante --- python/plugins/sextante/algs/ftools/RandomSelection.py | 2 +- .../sextante/algs/ftools/RandomSelectionWithinSubsets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/plugins/sextante/algs/ftools/RandomSelection.py b/python/plugins/sextante/algs/ftools/RandomSelection.py index ea5c4c3fb146..6e937aa2b460 100644 --- 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 index efba836d2c1f..40d10067ed3e 100644 --- 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)