[processing] remove debug line and fix spatial index creation

alexbruy · alexbruy · commit 700441eec983 · 2016-10-18T16:55:19.000+03:00
diff --git a/python/plugins/processing/gui/AlgorithmDialog.py b/python/plugins/processing/gui/AlgorithmDialog.py
@@ -127,13 +127,11 @@ def checkExtentCRS(self):
                                 unmatchingCRS = True
             if isinstance(param, ParameterExtent):
                 value = self.mainWidget.valueItems[param.name].leText.text().strip()
-                print value
                 if value:
                     hasExtent = True
 
         return hasExtent and unmatchingCRS
 
-
     def accept(self):
         self.settings.setValue("/Processing/dialogBase", self.saveGeometry())
 
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
@@ -221,7 +221,13 @@ def testForUniqueness(fieldList1, fieldList2):
 def spatialindex(layer):
     """Creates a spatial index for the passed vector layer.
     """
-    idx = QgsSpatialIndex(features(layer))
+    request = QgsFeatureRequest()
+    request.setSubsetOfAttributes([])
+    if ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED) \
+            and layer.selectedFeatureCount() > 0:
+        idx = layer.selectedFeaturesIterator(request)
+    else:
+        idx = QgsSpatialIndex(layer.getFeatures(request))
     return idx
 
 

-Original file line number
+Diff line change
 def spatialindex(layer):
     """Creates a spatial index for the passed vector layer.
     """
 -    idx = QgsSpatialIndex(features(layer))
 +    request = QgsFeatureRequest()
 +    request.setSubsetOfAttributes([])
 +    if ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED) \
 +            and layer.selectedFeatureCount() > 0:
 +        idx = layer.selectedFeaturesIterator(request)Collapse commentComment on line R228
nyalldawson commented on Oct 18, 2016 
nyalldawson
on Oct 18, 2016
Collaborator
@alexbruy shouldn't this be idx = QgsSpatialIndex( layer.selectedFeaturesIterator(request) )?
alexbruy replied on Oct 19, 2016 
alexbruy
on Oct 19, 2016
ContributorAuthor
Oops, my bad. Fixed now
Code has comments. Press enter to view.
 +    else:
 +        idx = QgsSpatialIndex(layer.getFeatures(request))
     return idx