Remove vector.features

Use QgsProcessingUtils.getFeatures instead
qgis · Apr 26, 2017 · 427c3b1 · 427c3b1
1 parent 6397386
commit 427c3b1
Show file tree

Hide file tree

Showing 106 changed files with 133 additions and 220 deletions.
diff --git a/python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py b/python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QgsVectorFileWriter, QgsSettings
+from qgis.core import QgsVectorFileWriter, QgsSettings, QgsProcessingUtils
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -113,7 +113,7 @@ def processAlgorithm(self, context, feedback):
         # selection that might exist in layer and the configuration that
         # indicates should algorithm use only selected features or all
         # of them
-        features = vector.features(vectorLayer, context)
+        features = QgsProcessingUtils.getFeatures(vectorLayer, context)
         for f in features:
             writer.addFeature(f)
 

diff --git a/python/plugins/processing/algs/qgis/AddTableField.py b/python/plugins/processing/algs/qgis/AddTableField.py
@@ -100,7 +100,7 @@ def processAlgorithm(self, context, feedback):
         writer = output.getVectorWriter(fields, layer.wkbType(),
                                         layer.crs())
         outFeat = QgsFeature()
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, feat in enumerate(features):
             feedback.setProgress(int(current * total))

diff --git a/python/plugins/processing/algs/qgis/AutoincrementalField.py b/python/plugins/processing/algs/qgis/AutoincrementalField.py
@@ -70,7 +70,7 @@ def processAlgorithm(self, context, feedback):
         writer = output.getVectorWriter(fields, vlayer.wkbType(),
                                         vlayer.crs())
         outFeat = QgsFeature()
-        features = vector.features(vlayer, context)
+        features = QgsProcessingUtils.getFeatures(vlayer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(vlayer, context)
         for current, feat in enumerate(features):
             feedback.setProgress(int(current * total))

diff --git a/python/plugins/processing/algs/qgis/BasicStatistics.py b/python/plugins/processing/algs/qgis/BasicStatistics.py
@@ -130,7 +130,7 @@ def processAlgorithm(self, context, feedback):
         output_file = self.getOutputValue(self.OUTPUT_HTML_FILE)
 
         request = QgsFeatureRequest().setFlags(QgsFeatureRequest.NoGeometry).setSubsetOfAttributes([field_name], layer.fields())
-        features = vector.features(layer, context, request)
+        features = QgsProcessingUtils.getFeatures(layer, context, request)
 
         data = []
         data.append(self.tr('Analyzed layer: {}').format(layer.name()))

diff --git a/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py b/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py
@@ -124,7 +124,7 @@ def processAlgorithm(self, context, feedback):
 
         request = QgsFeatureRequest().setFlags(QgsFeatureRequest.NoGeometry).setSubsetOfAttributes([fieldName], layer.fields())
         stat = QgsStatisticalSummary()
-        features = vector.features(layer, context, request)
+        features = QgsProcessingUtils.getFeatures(layer, context, request)
         count = QgsProcessingUtils.featureCount(layer, context)
         total = 100.0 / float(count)
         for current, ft in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py b/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py
@@ -111,7 +111,7 @@ def processAlgorithm(self, context, feedback):
         request = QgsFeatureRequest().setFlags(QgsFeatureRequest.NoGeometry).setSubsetOfAttributes([fieldName],
                                                                                                    layer.fields())
         stat = QgsStringStatisticalSummary()
-        features = vector.features(layer, context, request)
+        features = QgsProcessingUtils.getFeatures(layer, context, request)
         count = QgsProcessingUtils.featureCount(layer, context)
         total = 100.0 / float(count)
         for current, ft in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/Boundary.py b/python/plugins/processing/algs/qgis/Boundary.py
@@ -83,7 +83,7 @@ def processAlgorithm(self, context, feedback):
                 output_wkb,
                 layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, input_feature in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/BoundingBox.py b/python/plugins/processing/algs/qgis/BoundingBox.py
@@ -72,7 +72,7 @@ def processAlgorithm(self, context, feedback):
                 QgsWkbTypes.Polygon,
                 layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, input_feature in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/Buffer.py b/python/plugins/processing/algs/qgis/Buffer.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QgsFeature, QgsGeometry
+from qgis.core import QgsFeature, QgsGeometry, QgsProcessingUtils
 
 from processing.tools import vector
 
@@ -39,7 +39,7 @@ def buffering(feedback, context, writer, distance, field, useField, layer, disso
     outFeat = QgsFeature()
 
     current = 0
-    features = vector.features(layer, context)
+    features = QgsProcessingUtils.getFeatures(layer, context)
     total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
     # With dissolve

diff --git a/python/plugins/processing/algs/qgis/Centroids.py b/python/plugins/processing/algs/qgis/Centroids.py
@@ -73,7 +73,7 @@ def processAlgorithm(self, context, feedback):
                 QgsWkbTypes.Point,
                 layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, input_feature in enumerate(features):
             output_feature = input_feature

diff --git a/python/plugins/processing/algs/qgis/CheckValidity.py b/python/plugins/processing/algs/qgis/CheckValidity.py
@@ -136,7 +136,7 @@ def doCheck(self, context, feedback):
             layer.crs())
         error_count = 0
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, inFeat in enumerate(features):
             geom = inFeat.geometry()

diff --git a/python/plugins/processing/algs/qgis/Clip.py b/python/plugins/processing/algs/qgis/Clip.py
@@ -78,7 +78,7 @@ def processAlgorithm(self, context, feedback):
 
         # first build up a list of clip geometries
         clip_geoms = []
-        for maskFeat in vector.features(mask_layer, context, QgsFeatureRequest().setSubsetOfAttributes([])):
+        for maskFeat in QgsProcessingUtils.getFeatures(mask_layer, context, QgsFeatureRequest().setSubsetOfAttributes([])):
             clip_geoms.append(maskFeat.geometry())
 
         # are we clipping against a single feature? if so, we can show finer progress reports
@@ -96,8 +96,8 @@ def processAlgorithm(self, context, feedback):
         tested_feature_ids = set()
 
         for i, clip_geom in enumerate(clip_geoms):
-            input_features = [f for f in vector.features(source_layer, context,
-                                                         QgsFeatureRequest().setFilterRect(clip_geom.boundingBox()))]
+            input_features = [f for f in QgsProcessingUtils.getFeatures(source_layer, context,
+                                                                        QgsFeatureRequest().setFilterRect(clip_geom.boundingBox()))]
 
             if not input_features:
                 continue

diff --git a/python/plugins/processing/algs/qgis/ConvexHull.py b/python/plugins/processing/algs/qgis/ConvexHull.py
@@ -112,15 +112,15 @@ def processAlgorithm(self, context, feedback):
 
         fid = 0
         val = None
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         if useField:
             unique = layer.uniqueValues(index)
             current = 0
             total = 100.0 / (QgsProcessingUtils.featureCount(layer, context) * len(unique))
             for i in unique:
                 first = True
                 hull = []
-                features = vector.features(layer, context)
+                features = QgsProcessingUtils.getFeatures(layer, context)
                 for f in features:
                     idVar = f[fieldName]
                     if str(idVar).strip() == str(i).strip():
@@ -149,7 +149,7 @@ def processAlgorithm(self, context, feedback):
         else:
             hull = []
             total = 100.0 / layer.featureCount()
-            features = vector.features(layer, context)
+            features = QgsProcessingUtils.getFeatures(layer, context)
             for current, f in enumerate(features):
                 inGeom = f.geometry()
                 points = vector.extractPoints(inGeom)

diff --git a/python/plugins/processing/algs/qgis/Delaunay.py b/python/plugins/processing/algs/qgis/Delaunay.py
@@ -84,7 +84,7 @@ def processAlgorithm(self, context, feedback):
         ptDict = {}
         ptNdx = -1
         c = voronoi.Context()
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, inFeat in enumerate(features):
             geom = QgsGeometry(inFeat.geometry())

diff --git a/python/plugins/processing/algs/qgis/DeleteColumn.py b/python/plugins/processing/algs/qgis/DeleteColumn.py
@@ -86,7 +86,7 @@ def processAlgorithm(self, context, feedback):
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
                                                                      layer.wkbType(), layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, f in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py b/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py
@@ -68,7 +68,7 @@ def processAlgorithm(self, context, feedback):
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
                                                                      layer.wkbType(), layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
 
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         geoms = dict()

diff --git a/python/plugins/processing/algs/qgis/DeleteHoles.py b/python/plugins/processing/algs/qgis/DeleteHoles.py
@@ -82,7 +82,7 @@ def processAlgorithm(self, context, feedback):
             layer.wkbType(),
             layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, f in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/DensifyGeometries.py b/python/plugins/processing/algs/qgis/DensifyGeometries.py
@@ -88,7 +88,7 @@ def processAlgorithm(self, context, feedback):
             self.OUTPUT).getVectorWriter(layer.fields().toList(),
                                          layer.wkbType(), layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, f in enumerate(features):
             feature = f

diff --git a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
@@ -82,7 +82,7 @@ def processAlgorithm(self, context, feedback):
             self.OUTPUT).getVectorWriter(layer.fields().toList(),
                                          layer.wkbType(), layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, f in enumerate(features):
             feature = f

diff --git a/python/plugins/processing/algs/qgis/Difference.py b/python/plugins/processing/algs/qgis/Difference.py
@@ -79,7 +79,7 @@ def processAlgorithm(self, context, feedback):
 
         outFeat = QgsFeature()
         index = vector.spatialindex(layerB)
-        selectionA = vector.features(layerA, context)
+        selectionA = QgsProcessingUtils.getFeatures(layerA, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layerA, context)
         for current, inFeatA in enumerate(selectionA):
             geom = inFeatA.geometry()

diff --git a/python/plugins/processing/algs/qgis/Dissolve.py b/python/plugins/processing/algs/qgis/Dissolve.py
@@ -86,7 +86,7 @@ def processAlgorithm(self, context, feedback):
                 vlayerA.crs())
 
         outFeat = QgsFeature()
-        features = vector.features(vlayerA, context)
+        features = QgsProcessingUtils.getFeatures(vlayerA, context)
         total = 100.0 / QgsProcessingUtils.featureCount(vlayerA, context)
 
         if not useField:

diff --git a/python/plugins/processing/algs/qgis/DropGeometry.py b/python/plugins/processing/algs/qgis/DropGeometry.py
@@ -76,7 +76,7 @@ def processAlgorithm(self, context, feedback):
                 QgsCoordinateReferenceSystem())
 
         request = QgsFeatureRequest().setFlags(QgsFeatureRequest.NoGeometry)
-        features = vector.features(layer, context, request)
+        features = QgsProcessingUtils.getFeatures(layer, context, request)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, input_feature in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/EquivalentNumField.py b/python/plugins/processing/algs/qgis/EquivalentNumField.py
@@ -78,7 +78,7 @@ def processAlgorithm(self, context, feedback):
         outFeat = QgsFeature()
         classes = {}
 
-        features = vector.features(vlayer, context)
+        features = QgsProcessingUtils.getFeatures(vlayer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(vlayer, context)
         for current, feature in enumerate(features):
             feedback.setProgress(int(current * total))

diff --git a/python/plugins/processing/algs/qgis/ExecuteSQL.py b/python/plugins/processing/algs/qgis/ExecuteSQL.py
@@ -152,7 +152,7 @@ def processAlgorithm(self, context, feedback):
             vLayer.wkbType() if geometry_type != 1 else 1,
             vLayer.crs())
 
-        features = vector.features(vLayer, context)
+        features = QgsProcessingUtils.getFeatures(vLayer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(vLayer, context)
         outFeat = QgsFeature()
         for current, inFeat in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/Explode.py b/python/plugins/processing/algs/qgis/Explode.py
@@ -71,7 +71,7 @@ def processAlgorithm(self, context, feedback):
         writer = output.getVectorWriter(fields, QgsWkbTypes.LineString,
                                         vlayer.crs())
         outFeat = QgsFeature()
-        features = vector.features(vlayer, context)
+        features = QgsProcessingUtils.getFeatures(vlayer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(vlayer, context)
         for current, feature in enumerate(features):
             feedback.setProgress(int(current * total))

diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
@@ -132,7 +132,7 @@ def processAlgorithm(self, context, feedback):
         outFeat.initAttributes(len(fields))
         outFeat.setFields(fields)
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, f in enumerate(features):
             inGeom = f.geometry()

diff --git a/python/plugins/processing/algs/qgis/ExtendLines.py b/python/plugins/processing/algs/qgis/ExtendLines.py
@@ -79,7 +79,7 @@ def processAlgorithm(self, context, feedback):
         start_distance = self.getParameterValue(self.START_DISTANCE)
         end_distance = self.getParameterValue(self.END_DISTANCE)
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, input_feature in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/ExtentFromLayer.py b/python/plugins/processing/algs/qgis/ExtentFromLayer.py
@@ -133,7 +133,7 @@ def layerExtent(self, layer, writer, feedback):
         writer.addFeature(feat)
 
     def featureExtent(self, layer, context, writer, feedback):
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         feat = QgsFeature()
         for current, f in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/ExtractByLocation.py b/python/plugins/processing/algs/qgis/ExtractByLocation.py
@@ -102,11 +102,11 @@ def processAlgorithm(self, context, feedback):
 
         if 'disjoint' in predicates:
             disjoinSet = []
-            for feat in vector.features(layer, context):
+            for feat in QgsProcessingUtils.getFeatures(layer, context):
                 disjoinSet.append(feat.id())
 
         selectedSet = []
-        features = vector.features(selectLayer, context)
+        features = QgsProcessingUtils.getFeatures(selectLayer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(selectLayer, context)
         for current, f in enumerate(features):
             geom = vector.snapToPrecision(f.geometry(), precision)
@@ -134,7 +134,7 @@ def processAlgorithm(self, context, feedback):
         if 'disjoint' in predicates:
             selectedSet = selectedSet + disjoinSet
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, f in enumerate(features):
             if f.id() in selectedSet:

diff --git a/python/plugins/processing/algs/qgis/ExtractNodes.py b/python/plugins/processing/algs/qgis/ExtractNodes.py
@@ -78,7 +78,7 @@ def processAlgorithm(self, context, feedback):
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             fields, QgsWkbTypes.Point, layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, f in enumerate(features):
             input_geometry = f.geometry()

diff --git a/python/plugins/processing/algs/qgis/ExtractSpecificNodes.py b/python/plugins/processing/algs/qgis/ExtractSpecificNodes.py
@@ -94,7 +94,7 @@ def processAlgorithm(self, context, feedback):
                 raise GeoAlgorithmExecutionException(
                     self.tr('\'{}\' is not a valid node index').format(node))
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, f in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/FieldPyculator.py b/python/plugins/processing/algs/qgis/FieldPyculator.py
@@ -145,7 +145,7 @@ def processAlgorithm(self, context, feedback):
                 self.tr("FieldPyculator code execute error. Field code block can't be executed!\n{0}\n{1}").format(str(sys.exc_info()[0].__name__), str(sys.exc_info()[1])))
 
         # Run
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, feat in enumerate(features):
             feedback.setProgress(int(current * total))

diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py
@@ -138,7 +138,7 @@ def processAlgorithm(self, context, feedback):
         error = ''
         calculationSuccess = True
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         rownum = 1

diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py
@@ -152,7 +152,7 @@ def processAlgorithm(self, context, feedback):
         error_exp = None
         inFeat = QgsFeature()
         outFeat = QgsFeature()
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         if len(features):
             total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
             for current, inFeat in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/FixGeometry.py b/python/plugins/processing/algs/qgis/FixGeometry.py
@@ -78,7 +78,7 @@ def processAlgorithm(self, context, feedback):
                 QgsWkbTypes.multiType(layer.wkbType()),
                 layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         if len(features) == 0:
             raise GeoAlgorithmExecutionException(self.tr('There are no features in the input layer'))
 

diff --git a/python/plugins/processing/algs/qgis/GeometryByExpression.py b/python/plugins/processing/algs/qgis/GeometryByExpression.py
@@ -118,7 +118,7 @@ def processAlgorithm(self, context, feedback):
             raise GeoAlgorithmExecutionException(
                 self.tr('Evaluation error: {0}').format(expression.evalErrorString()))
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
         for current, input_feature in enumerate(features):
             output_feature = input_feature

diff --git a/python/plugins/processing/algs/qgis/GeometryConvert.py b/python/plugins/processing/algs/qgis/GeometryConvert.py
@@ -96,7 +96,7 @@ def processAlgorithm(self, context, feedback):
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             layer.fields(), newType, layer.crs())
 
-        features = vector.features(layer, context)
+        features = QgsProcessingUtils.getFeatures(layer, context)
         total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
 
         for current, f in enumerate(features):