Skip to content

Commit a4cd66f

Browse files
committed
Port some more code to new API
1 parent 13f0813 commit a4cd66f

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

python/plugins/processing/algs/qgis/FieldsMapper.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,9 @@ def processAlgorithm(self, context, feedback):
153153
inFeat = QgsFeature()
154154
outFeat = QgsFeature()
155155
features = QgsProcessingUtils.getFeatures(layer, context)
156-
if len(features):
157-
total = 100.0 / QgsProcessingUtils.featureCount(layer, context)
156+
count = QgsProcessingUtils.featureCount(layer, context)
157+
if count > 0:
158+
total = 100.0 / count
158159
for current, inFeat in enumerate(features):
159160
rownum = current + 1
160161

python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
from processing.tools.vector import TableWriter
77
from collections import defaultdict
8+
from qgis.core import QgsProcessingUtils
89
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
910
from processing.tools import dataobjects
1011

@@ -20,8 +21,8 @@
2021
writer = TableWriter(Frequency, None, fields + ['FREQ'])
2122

2223
counts = {}
23-
feats = processing.features(layer)
24-
nFeats = len(feats)
24+
feats = QgsProcessingUtils.getFeatures(layer, context)
25+
nFeats = QgsProcessingUtils.featureCount(layer, context)
2526
counts = defaultdict(int)
2627
for i, feat in enumerate(feats):
2728
feedback.setProgress(int(100 * i / nFeats))

python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
##Biggest parts=output vector
66

77
from processing.tools import dataobjects
8-
from qgis.core import QgsGeometry, QgsWkbTypes
8+
from qgis.core import QgsGeometry, QgsWkbTypes, QgsProcessingUtils
99
from operator import itemgetter
1010

1111
To_keep = int(To_keep)
@@ -21,7 +21,7 @@
2121
QgsWkbTypes.MultiPolygon, polyPrder.crs())
2222

2323

24-
for n, feat in enumerate(processing.features(polyLayer)):
24+
for n, feat in enumerate(QgsProcessingUtils.getFeatures(polyLayer, context)):
2525
feedback.setProgress(int(100 * n / count))
2626
geom = feat.geometry()
2727
if geom.isMultipart():

python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
##N_unique_values=output vector
66

77
from qgis.PyQt.QtCore import QVariant
8-
from qgis.core import QgsFeature, QgsField
8+
from qgis.core import QgsFeature, QgsField, QgsProcessingUtils
99
from processing.tools.vector import VectorWriter
1010
from processing.tools import dataobjects
1111

@@ -20,8 +20,8 @@
2020

2121
outFeat = QgsFeature()
2222
classes = {}
23-
feats = processing.features(layer)
24-
nFeat = len(feats)
23+
feats = QgsProcessingUtils.getFeatures(layer, context)
24+
nFeat = QgsProcessingUtils.featureCount(layer, context)
2525
for n, inFeat in enumerate(feats):
2626
feedback.setProgress(int(100 * n / nFeat))
2727
attrs = inFeat.attributes()

0 commit comments

Comments
 (0)