Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing] pendingFields() -> fields()
Does the same thing, but pendingFields() is ugly
  • Loading branch information
nyalldawson committed Aug 4, 2016
1 parent 06c4b07 commit c1649eb
Show file tree
Hide file tree
Showing 38 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ConvexHull.py
Expand Up @@ -78,7 +78,7 @@ def processAlgorithm(self, progress):
f = QgsField('value', QVariant.String, '', 255)
if useField:
index = layer.fieldNameIndex(fieldName)
fType = layer.pendingFields()[index].type()
fType = layer.fields()[index].type()
if fType in [QVariant.Int, QVariant.UInt, QVariant.LongLong, QVariant.ULongLong]:
f.setType(fType)
f.setLength(20)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/DeleteColumn.py
Expand Up @@ -54,7 +54,7 @@ def processAlgorithm(self, progress):
self.getParameterValue(self.INPUT))
idx = layer.fieldNameIndex(self.getParameterValue(self.COLUMN))

fields = layer.pendingFields()
fields = layer.fields()
fields.remove(idx)

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
Expand Down
Expand Up @@ -49,7 +49,7 @@ def processAlgorithm(self, progress):
layer = dataobjects.getObjectFromUri(
self.getParameterValue(self.INPUT))

fields = layer.pendingFields()
fields = layer.fields()

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
layer.wkbType(), layer.crs())
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/DeleteHoles.py
Expand Up @@ -49,7 +49,7 @@ def processAlgorithm(self, progress):
self.getParameterValue(self.INPUT))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields(),
layer.fields(),
layer.wkbType(),
layer.crs())

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/DensifyGeometries.py
Expand Up @@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
isPolygon = layer.geometryType() == QgsWkbTypes.PolygonGeometry

writer = self.getOutputFromName(
self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
self.OUTPUT).getVectorWriter(layer.fields().toList(),
layer.wkbType(), layer.crs())

features = vector.features(layer)
Expand Down
Expand Up @@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
isPolygon = layer.geometryType() == QgsWkbTypes.PolygonGeometry

writer = self.getOutputFromName(
self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
self.OUTPUT).getVectorWriter(layer.fields().toList(),
layer.wkbType(), layer.crs())

features = vector.features(layer)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/Difference.py
Expand Up @@ -70,7 +70,7 @@ def processAlgorithm(self, progress):

geomType = layerA.wkbType()
writer = self.getOutputFromName(
Difference.OUTPUT).getVectorWriter(layerA.pendingFields(),
Difference.OUTPUT).getVectorWriter(layerA.fields(),
geomType,
layerA.crs())

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ExecuteSQL.py
Expand Up @@ -131,7 +131,7 @@ def processAlgorithm(self, progress):
raise GeoAlgorithmExecutionException(vLayer.dataProvider().error().message())

writer = self.getOutputFromName(self.OUTPUT_LAYER).getVectorWriter(
vLayer.pendingFields().toList(),
vLayer.fields().toList(),
# Create a point layer (without any points) if 'no geometry' is chosen
vLayer.wkbType() if geometry_type != 1 else 1,
vLayer.crs())
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ExportGeometryInfo.py
Expand Up @@ -72,7 +72,7 @@ def processAlgorithm(self, progress):
method = self.getParameterValue(self.METHOD)

geometryType = layer.geometryType()
fields = layer.pendingFields()
fields = layer.fields()

if geometryType == QgsWkbTypes.PolygonGeometry:
areaName = vector.createUniqueFieldName('area', fields)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ExtractByAttribute.py
Expand Up @@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
operator = self.OPERATORS[self.getParameterValue(self.OPERATOR)]
value = self.getParameterValue(self.VALUE)

fields = layer.pendingFields()
fields = layer.fields()
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
layer.wkbType(), layer.crs())

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ExtractByLocation.py
Expand Up @@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
index = vector.spatialindex(layer)

output = self.getOutputFromName(self.OUTPUT)
writer = output.getVectorWriter(layer.pendingFields(),
writer = output.getVectorWriter(layer.fields(),
layer.wkbType(), layer.crs())

if 'disjoint' in predicates:
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ExtractNodes.py
Expand Up @@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
self.getParameterValue(self.INPUT))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), QgsWkbTypes.Point, layer.crs())
layer.fields().toList(), QgsWkbTypes.Point, layer.crs())

outFeat = QgsFeature()
inGeom = QgsGeometry()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/FixedDistanceBuffer.py
Expand Up @@ -75,7 +75,7 @@ def processAlgorithm(self, progress):
segments = int(self.getParameterValue(self.SEGMENTS))

writer = self.getOutputFromName(
self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
self.OUTPUT).getVectorWriter(layer.fields().toList(),
QgsWkbTypes.Polygon, layer.crs())

buff.buffering(progress, writer, distance, None, False, layer,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/GeometryConvert.py
Expand Up @@ -78,7 +78,7 @@ def processAlgorithm(self, progress):
newType = QgsWkbTypes.Point

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields(), newType, layer.crs())
layer.fields(), newType, layer.crs())

features = vector.features(layer)
total = 100.0 / len(features)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/Gridify.py
Expand Up @@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
self.tr('Invalid grid spacing: %s/%s' % (hSpacing, vSpacing)))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields(), layer.wkbType(), layer.crs())
layer.fields(), layer.wkbType(), layer.crs())

features = vector.features(layer)
total = 100.0 / len(features)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/HubDistance.py
Expand Up @@ -99,7 +99,7 @@ def processAlgorithm(self, progress):
if addLines:
geomType = QgsWkbTypes.LineString

fields = layerPoints.pendingFields()
fields = layerPoints.fields()
fields.append(QgsField('HubName', QVariant.String))
fields.append(QgsField('HubDist', QVariant.Double))

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/HubLines.py
Expand Up @@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
self.tr('Same layer given for both hubs and spokes'))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layerSpoke.pendingFields(), QgsWkbTypes.LineString, layerSpoke.crs())
layerSpoke.fields(), QgsWkbTypes.LineString, layerSpoke.crs())

spokes = vector.features(layerSpoke)
hubs = vector.features(layerHub)
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/qgis/LinesIntersection.py
Expand Up @@ -82,8 +82,8 @@ def processAlgorithm(self, progress):
idxA = layerA.fieldNameIndex(fieldA)
idxB = layerB.fieldNameIndex(fieldB)

fieldList = [layerA.pendingFields()[idxA],
layerB.pendingFields()[idxB]]
fieldList = [layerA.fields()[idxA],
layerB.fields()[idxB]]

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
QgsWkbTypes.Point, layerA.crs())
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/LinesToPolygons.py
Expand Up @@ -59,7 +59,7 @@ def processAlgorithm(self, progress):
layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs()
layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs()
)

outFeat = QgsFeature()
Expand Down
Expand Up @@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
geomType = self.multiToSingleGeom(layer.wkbType())

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), geomType, layer.crs())
layer.fields().toList(), geomType, layer.crs())

features = vector.features(layer)
total = 100.0 / len(features)
Expand Down
Expand Up @@ -67,7 +67,7 @@ def processAlgorithm(self, progress):

classFieldIndex = pointLayer.fieldNameIndex(classFieldName)
(idxCount, fieldList) = vector.findOrCreateField(polyLayer,
polyLayer.pendingFields(), fieldName)
polyLayer.fields(), fieldName)

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
fields.toList(), polyLayer.wkbType(), polyLayer.crs())
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/PolygonsToLines.py
Expand Up @@ -60,7 +60,7 @@ def processAlgorithm(self, progress):
layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), QgsWkbTypes.LineString, layer.crs())
layer.fields().toList(), QgsWkbTypes.LineString, layer.crs())

outFeat = QgsFeature()
inGeom = QgsGeometry()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/RandomExtract.py
Expand Up @@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
selran = random.sample(xrange(featureCount), value)

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), layer.wkbType(), layer.crs())
layer.fields().toList(), layer.wkbType(), layer.crs())

total = 100.0 / featureCount
for i, feat in enumerate(features):
Expand Down
Expand Up @@ -89,7 +89,7 @@ def processAlgorithm(self, progress):
value = value / 100.0

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), layer.wkbType(), layer.crs())
layer.fields().toList(), layer.wkbType(), layer.crs())

selran = []
current = 0
Expand Down
Expand Up @@ -30,7 +30,7 @@

from qgis.PyQt.QtGui import QIcon

from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes, QgsWkbTypes
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes

from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.ProcessingLog import ProcessingLog
Expand Down Expand Up @@ -89,7 +89,7 @@ def processAlgorithm(self, progress):

writer = self.getOutputFromName(
self.OUTPUT_LAYER).getVectorWriter(
layer.pendingFields().toList(),
layer.fields().toList(),
QgsWkbTypes.Polygon,
layer.crs())

Expand Down
Expand Up @@ -30,7 +30,7 @@

from qgis.PyQt.QtGui import QIcon

from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint

from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.ProcessingLog import ProcessingLog
Expand Down Expand Up @@ -97,8 +97,8 @@ def processAlgorithm(self, progress):

writer = self.getOutputFromName(
self.OUTPUT_LAYER).getVectorWriter(
layer.pendingFields().toList(),
QgsWkbTypes.Polygon,
layer.fields().toList(),
Qgis.WKBPolygon,
layer.crs())

outFeat = QgsFeature()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ReprojectLayer.py
Expand Up @@ -57,7 +57,7 @@ def processAlgorithm(self, progress):
targetCrs.createFromUserInput(crsId)

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), layer.wkbType(), targetCrs)
layer.fields().toList(), layer.wkbType(), targetCrs)

layerCrs = layer.crs()
crsTransform = QgsCoordinateTransform(layerCrs, targetCrs)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/SelectByAttribute.py
Expand Up @@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
operator = self.OPERATORS[self.getParameterValue(self.OPERATOR)]
value = self.getParameterValue(self.VALUE)

fields = layer.pendingFields()
fields = layer.fields()

idx = layer.fieldNameIndex(fieldName)
fieldType = fields[idx].type()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/SimplifyGeometries.py
Expand Up @@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
pointsAfter = 0

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), layer.wkbType(), layer.crs())
layer.fields().toList(), layer.wkbType(), layer.crs())

features = vector.features(layer)
total = 100.0 / len(features)
Expand Down
Expand Up @@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
geomType = self.singleToMultiGeom(layer.wkbType())

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), geomType, layer.crs())
layer.fields().toList(), geomType, layer.crs())

inFeat = QgsFeature()
outFeat = QgsFeature()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/SplitLinesWithLines.py
Expand Up @@ -57,7 +57,7 @@ def processAlgorithm(self, progress):
layerB = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT_B))

sameLayer = self.getParameterValue(self.INPUT_A) == self.getParameterValue(self.INPUT_B)
fieldList = layerA.pendingFields()
fieldList = layerA.fields()

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
QgsWkbTypes.LineString, layerA.crs())
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/TextToFloat.py
Expand Up @@ -55,7 +55,7 @@ def processAlgorithm(self, progress):
fieldName = self.getParameterValue(self.FIELD)
idx = layer.fieldNameIndex(fieldName)

fields = layer.pendingFields()
fields = layer.fields()
fields[idx] = QgsField(fieldName, QVariant.Double, '', 24, 15)

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
Expand Down
Expand Up @@ -76,7 +76,7 @@ def processAlgorithm(self, progress):
segments = int(self.getParameterValue(self.SEGMENTS))

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs())
layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs())

buff.buffering(progress, writer, 0, field, True, layer, dissolve,
segments)
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/VectorSplit.py
Expand Up @@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
uniqueValues = vector.uniqueValues(layer, fieldIndex)
baseName = os.path.join(directory, '{0}_{1}'.format(layer.name(), fieldName))

fields = layer.pendingFields()
fields = layer.fields()
crs = layer.crs()
geomType = layer.wkbType()

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/VoronoiPolygons.py
Expand Up @@ -69,7 +69,7 @@ def processAlgorithm(self, progress):
buf = self.getParameterValue(self.BUFFER)

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs())
layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs())

outFeat = QgsFeature()
extent = layer.extent()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ZonalStatistics.py
Expand Up @@ -132,7 +132,7 @@ def processAlgorithm(self, progress):
memVectorDriver = ogr.GetDriverByName('Memory')
memRasterDriver = gdal.GetDriverByName('MEM')

fields = layer.pendingFields()
fields = layer.fields()
(idxMin, fields) = vector.findOrCreateField(layer, fields,
columnPrefix + 'min', 21, 6)
(idxMax, fields) = vector.findOrCreateField(layer, fields,
Expand Down
Expand Up @@ -8,7 +8,7 @@
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException

layer = processing.getObject(Input)
inputFields = layer.pendingFields()
inputFields = layer.fields()
fieldIdxs = []
fields = Fields.split(',')
for f in fields:
Expand Down
Expand Up @@ -172,7 +172,7 @@ def populateFields(self):
if self.layer is None:
return

fields = self.layer.pendingFields()
fields = self.layer.fields()
for f in fields:
self.mExistingFieldComboBox.addItem(f.name())

Expand Down

0 comments on commit c1649eb

Please sign in to comment.