simplified features method in vector tools

volaya · volaya · commit e43b8a53117b · 2013-11-06T19:27:34.000+01:00
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
@@ -43,34 +43,16 @@ class Features:
 
         def __init__(self, layer):
             self.layer = layer
-            self.iter = layer.getFeatures()
             self.selection = False
+            self.iter = layer.getFeatures()            
             if ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED):
-                self.selected = layer.selectedFeatures()
-                if len(self.selected) > 0:
+                selected = layer.selectedFeatures()
+                if len(selected) > 0:
                     self.selection = True
-                    self.idx = 0
+                    self.iter = iter(selected)
 
         def __iter__(self):
-            return self
-
-        def next(self):
-            if self.selection:
-                if self.idx < len(self.selected):
-                    feature = self.selected[self.idx]
-                    self.idx += 1
-                    return feature
-                else:
-                    raise StopIteration()
-            else:
-                if self.iter.isClosed():
-                    raise StopIteration()
-                f = QgsFeature()
-                if self.iter.nextFeature(f):
-                    return f
-                else:
-                    self.iter.close()
-                    raise StopIteration()
+            return self.iter
 
         def __len__(self):
             if self.selection:
