Skip to content

Commit acdde31

Browse files
alexbruyalexbruy
committedAug 5, 2016
[processing] more cleanups (follow up 06c4b07)
·
ltr-3_40final-3_0_0
1 parent 45c8a09 commit acdde31

File tree

7 files changed

+19
-23
lines changed

7 files changed

+19
-23
lines changed
 

‎python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@ def processAlgorithm(self, progress):
9696
# directly
9797
settings = QSettings()
9898
systemEncoding = settings.value('/UI/encoding', 'System')
99-
provider = vectorLayer.dataProvider()
100-
writer = QgsVectorFileWriter(output, systemEncoding,
101-
provider.fields(),
102-
provider.wkbType(), provider.crs())
99+
writer = QgsVectorFileWriter(output,
100+
systemEncoding,
101+
vectorLayer.fields(),
102+
vectorLayer.wkbType(),
103+
vectorLayer.crs())
103104

104105
# Now we take the features from input layer and add them to the
105106
# output. Method features() returns an iterator, considering the

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
from processing.tools.vector import VectorWriter
1010

1111
layer = processing.getObject(input)
12-
provider = layer.dataProvider()
13-
fields = provider.fields()
12+
fields = layer.fields()
1413
fields.append(QgsField('UNIQ_COUNT', QVariant.Int))
15-
writer = VectorWriter(N_unique_values, None, fields, provider.wkbType(),
14+
writer = VectorWriter(N_unique_values, None, fields, layer.wkbType(),
1615
layer.crs())
1716

1817
class_field_index = layer.fieldNameIndex(class_field)

‎python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,9 @@ def convertUnsupportedFormats(self, progress):
273273
# For the case of memory layer, if the
274274
# getCompatible method has been called
275275
continue
276-
provider = layer.dataProvider()
277276
writer = out.getVectorWriter(
278-
provider.fields(),
279-
provider.wkbType(), layer.crs()
277+
layer.fields(),
278+
layer.wkbType(), layer.crs()
280279
)
281280
features = vector.features(layer)
282281
for feature in features:
@@ -312,8 +311,7 @@ def convertUnsupportedFormats(self, progress):
312311
elif isinstance(out, OutputTable):
313312
if out.compatible is not None:
314313
layer = dataobjects.getObjectFromUri(out.compatible)
315-
provider = layer.dataProvider()
316-
writer = out.getTableWriter(provider.fields())
314+
writer = out.getTableWriter(layer.fields())
317315
features = vector.features(layer)
318316
for feature in features:
319317
writer.addRecord(feature)

‎python/plugins/processing/gui/AlgorithmExecutor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,12 @@ def runalgIterating(alg, paramToIter, progress):
6464
feat = QgsFeature()
6565
filelist = []
6666
outputs = {}
67-
provider = layer.dataProvider()
6867
features = vector.features(layer)
6968
for feat in features:
7069
output = getTempFilename('shp')
7170
filelist.append(output)
7271
writer = QgsVectorFileWriter(output, systemEncoding,
73-
provider.fields(), provider.wkbType(), layer.crs())
72+
layer.fields(), layer.wkbType(), layer.crs())
7473
writer.addFeature(feat)
7574
del writer
7675

‎python/plugins/processing/gui/ParametersPanel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def getFields(self, layer, datatype):
471471
QVariant.UInt, QVariant.ULongLong]
472472

473473
fieldNames = set()
474-
for field in layer.pendingFields():
474+
for field in layer.fields():
475475
if not fieldTypes or field.type() in fieldTypes:
476476
fieldNames.add(unicode(field.name()))
477477
return sorted(list(fieldNames), cmp=locale.strcoll)

‎python/plugins/processing/tools/dataobjects.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ def exportVectorLayer(layer, supported=None):
294294
useSelection = ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED)
295295
if useSelection and layer.selectedFeatureCount() != 0:
296296
writer = QgsVectorFileWriter(output, systemEncoding,
297-
layer.pendingFields(),
298-
provider.wkbType(), layer.crs())
297+
layer.fields(),
298+
layer.wkbType(), layer.crs())
299299
selection = layer.selectedFeatures()
300300
for feat in selection:
301301
writer.addFeature(feat)
@@ -310,7 +310,7 @@ def exportVectorLayer(layer, supported=None):
310310
if not os.path.splitext(layer.source())[1].lower() in supported or not isASCII:
311311
writer = QgsVectorFileWriter(
312312
output, systemEncoding,
313-
layer.pendingFields(), provider.wkbType(),
313+
layer.fields(), layer.wkbType(),
314314
layer.crs()
315315
)
316316
for feat in layer.getFeatures():
@@ -354,7 +354,6 @@ def exportTable(table):
354354
settings = QSettings()
355355
systemEncoding = settings.value('/UI/encoding', 'System')
356356
output = getTempFilename()
357-
provider = table.dataProvider()
358357
isASCII = True
359358
try:
360359
unicode(table.source()).decode('ascii')
@@ -364,7 +363,7 @@ def exportTable(table):
364363
or unicode(table.source()).endswith('shp')
365364
if not isDbf or not isASCII:
366365
writer = QgsVectorFileWriter(output, systemEncoding,
367-
provider.fields(), QgsWkbTypes.NullGeometry,
366+
layer.fields(), QgsWkbTypes.NullGeometry,
368367
QgsCoordinateReferenceSystem('4326'))
369368
for feat in table.getFeatures():
370369
writer.addFeature(feat)

‎python/plugins/processing/tools/vector.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,10 @@ def combineVectorFields(layerA, layerB):
316316
"""Create single field map from two input field maps.
317317
"""
318318
fields = []
319-
fieldsA = layerA.pendingFields()
319+
fieldsA = layerA.fields()
320320
fields.extend(fieldsA)
321321
namesA = [unicode(f.name()).lower() for f in fieldsA]
322-
fieldsB = layerB.pendingFields()
322+
fieldsB = layerB.fields()
323323
for field in fieldsB:
324324
name = unicode(field.name()).lower()
325325
if name in namesA:
@@ -366,7 +366,7 @@ def duplicateInMemory(layer, newName='', addToRegistry=False):
366366
memProvider = memLayer.dataProvider()
367367

368368
provider = layer.dataProvider()
369-
fields = provider.fields().toList()
369+
fields = layer.fields().toList()
370370
memProvider.addAttributes(fields)
371371
memLayer.updateFields()
372372

0 commit comments

Comments
 (0)
Please sign in to comment.