Skip to content

Commit c50ee6d

Browse files
nyalldawsonnyalldawson
committedOct 25, 2017
Update python code to new API
·
ltr-3_40final-3_0_0
1 parent 00e8690 commit c50ee6d

39 files changed

+157
-157
lines changed
 

‎python/plugins/processing/algs/qgis/EliminateSelection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def processAlgorithm(self, parameters, context, feedback):
147147
selFeat = QgsFeature()
148148

149149
# use prepared geometries for faster intersection tests
150-
engine = QgsGeometry.createGeometryEngine(geom2Eliminate.geometry())
150+
engine = QgsGeometry.createGeometryEngine(geom2Eliminate.constGet())
151151
engine.prepareGeometry()
152152

153153
while fit.nextFeature(selFeat):
@@ -156,7 +156,7 @@ def processAlgorithm(self, parameters, context, feedback):
156156

157157
selGeom = selFeat.geometry()
158158

159-
if engine.intersects(selGeom.geometry()):
159+
if engine.intersects(selGeom.constGet()):
160160
# We have a candidate
161161
iGeom = geom2Eliminate.intersection(selGeom)
162162

‎python/plugins/processing/algs/qgis/Explode.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ def processAlgorithm(self, parameters, context, feedback):
8989
def extractAsSingleSegments(self, geom):
9090
segments = []
9191
if geom.isMultipart():
92-
for part in range(geom.geometry().numGeometries()):
93-
segments.extend(self.getPolylineAsSingleSegments(geom.geometry().geometryN(part)))
92+
for part in range(geom.constGet().numGeometries()):
93+
segments.extend(self.getPolylineAsSingleSegments(geom.constGet().geometryN(part)))
9494
else:
9595
segments.extend(self.getPolylineAsSingleSegments(
96-
geom.geometry()))
96+
geom.constGet()))
9797
return segments
9898

9999
def getPolylineAsSingleSegments(self, polyline):

‎python/plugins/processing/algs/qgis/ExportGeometryInfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def processAlgorithm(self, parameters, context, feedback):
155155
def point_attributes(self, geometry):
156156
pt = None
157157
if not geometry.isMultipart():
158-
pt = geometry.geometry()
158+
pt = geometry.constGet()
159159
else:
160160
if geometry.numGeometries() > 0:
161161
pt = geometry.geometryN(0)

‎python/plugins/processing/algs/qgis/ExtractNodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def processAlgorithm(self, parameters, context, feedback):
9999
sink.addFeature(f, QgsFeatureSink.FastInsert)
100100
else:
101101
i = 0
102-
for part in input_geometry.geometry().coordinateSequence():
102+
for part in input_geometry.constGet().coordinateSequence():
103103
for ring in part:
104104
if feedback.isCanceled():
105105
break

‎python/plugins/processing/algs/qgis/ExtractSpecificNodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def processAlgorithm(self, parameters, context, feedback):
104104
if not input_geometry:
105105
sink.addFeature(f, QgsFeatureSink.FastInsert)
106106
else:
107-
total_nodes = input_geometry.geometry().nCoordinates()
107+
total_nodes = input_geometry.constGet().nCoordinates()
108108

109109
for node in indices:
110110
if node < 0:

‎python/plugins/processing/algs/qgis/FindProjection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def processAlgorithm(self, parameters, context, feedback):
9595
fields, QgsWkbTypes.NoGeometry, QgsCoordinateReferenceSystem())
9696

9797
# make intersection tests nice and fast
98-
engine = QgsGeometry.createGeometryEngine(target_geom.geometry())
98+
engine = QgsGeometry.createGeometryEngine(target_geom.constGet())
9999
engine.prepareGeometry()
100100

101101
layer_bounds = QgsGeometry.fromRect(source.sourceExtent())
@@ -121,7 +121,7 @@ def processAlgorithm(self, parameters, context, feedback):
121121
except:
122122
continue
123123

124-
if engine.intersects(transformed_bounds.geometry()):
124+
if engine.intersects(transformed_bounds.constGet()):
125125
feedback.pushInfo(self.tr('Found candidate CRS: {}').format(candidate_crs.authid()))
126126
f = QgsFeature(fields)
127127
f.setAttributes([candidate_crs.authid()])

‎python/plugins/processing/algs/qgis/GeometryConvert.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def convertToNodes(self, geom):
151151
mp = QgsMultiPointV2()
152152
# TODO: mega inefficient - needs rework when geometry iterators land
153153
# (but at least it doesn't lose Z/M values)
154-
for g in geom.geometry().coordinateSequence():
154+
for g in geom.constGet().coordinateSequence():
155155
for r in g:
156156
for p in r:
157157
mp.addGeometry(p)
@@ -170,7 +170,7 @@ def convertToLineStrings(self, geom):
170170
else:
171171
# polygons to lines
172172
# we just use the boundary here - that consists of all rings in the (multi)polygon
173-
boundary = QgsGeometry(geom.geometry().boundary())
173+
boundary = QgsGeometry(geom.constGet().boundary())
174174
# boundary will be multipart
175175
return boundary.asGeometryCollection()
176176

@@ -184,23 +184,23 @@ def convertToMultiLineStrings(self, geom):
184184
else:
185185
# line to multiLine
186186
ml = QgsMultiLineString()
187-
ml.addGeometry(geom.geometry().clone())
187+
ml.addGeometry(geom.constGet().clone())
188188
return [QgsGeometry(ml)]
189189
else:
190190
# polygons to multilinestring
191191
# we just use the boundary here - that consists of all rings in the (multi)polygon
192-
return [QgsGeometry(geom.geometry().boundary())]
192+
return [QgsGeometry(geom.constGet().boundary())]
193193

194194
def convertToPolygon(self, geom):
195-
if QgsWkbTypes.geometryType(geom.wkbType()) == QgsWkbTypes.PointGeometry and geom.geometry().nCoordinates() < 3:
195+
if QgsWkbTypes.geometryType(geom.wkbType()) == QgsWkbTypes.PointGeometry and geom.constGet().nCoordinates() < 3:
196196
raise QgsProcessingException(
197197
self.tr('Cannot convert from Point to Polygon').format(QgsWkbTypes.displayString(geom.wkbType())))
198198
elif QgsWkbTypes.geometryType(geom.wkbType()) == QgsWkbTypes.PointGeometry:
199199
# multipoint with at least 3 points
200200
# TODO: mega inefficient - needs rework when geometry iterators land
201201
# (but at least it doesn't lose Z/M values)
202202
points = []
203-
for g in geom.geometry().coordinateSequence():
203+
for g in geom.constGet().coordinateSequence():
204204
for r in g:
205205
for p in r:
206206
points.append(p)
@@ -212,17 +212,17 @@ def convertToPolygon(self, geom):
212212
elif QgsWkbTypes.geometryType(geom.wkbType()) == QgsWkbTypes.LineGeometry:
213213
if QgsWkbTypes.isMultiType(geom):
214214
parts = []
215-
for i in range(geom.geometry().numGeometries()):
215+
for i in range(geom.constGet().numGeometries()):
216216
p = QgsPolygonV2()
217-
linestring = geom.geometry().geometryN(i).clone()
217+
linestring = geom.constGet().geometryN(i).clone()
218218
linestring.close()
219219
p.setExteriorRing(linestring)
220220
parts.append(QgsGeometry(p))
221221
return QgsGeometry.collectGeometry(parts)
222222
else:
223223
# linestring to polygon
224224
p = QgsPolygonV2()
225-
linestring = geom.geometry().clone()
225+
linestring = geom.constGet().clone()
226226
linestring.close()
227227
p.setExteriorRing(linestring)
228228
return [QgsGeometry(p)]

‎python/plugins/processing/algs/qgis/Intersection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,19 @@ def processAlgorithm(self, parameters, context, feedback):
152152
engine = None
153153
if len(intersects) > 0:
154154
# use prepared geometries for faster intersection tests
155-
engine = QgsGeometry.createGeometryEngine(geom.geometry())
155+
engine = QgsGeometry.createGeometryEngine(geom.constGet())
156156
engine.prepareGeometry()
157157

158158
for featB in sourceB.getFeatures(request):
159159
if feedback.isCanceled():
160160
break
161161

162162
tmpGeom = featB.geometry()
163-
if engine.intersects(tmpGeom.geometry()):
163+
if engine.intersects(tmpGeom.constGet()):
164164
out_attributes = [featA.attributes()[i] for i in field_indices_a]
165165
out_attributes.extend([featB.attributes()[i] for i in field_indices_b])
166166
int_geom = QgsGeometry(geom.intersection(tmpGeom))
167-
if int_geom.wkbType() == QgsWkbTypes.Unknown or QgsWkbTypes.flatType(int_geom.geometry().wkbType()) == QgsWkbTypes.GeometryCollection:
167+
if int_geom.wkbType() == QgsWkbTypes.Unknown or QgsWkbTypes.flatType(int_geom.wkbType()) == QgsWkbTypes.GeometryCollection:
168168
int_com = geom.combine(tmpGeom)
169169
int_geom = QgsGeometry()
170170
if int_com:

‎python/plugins/processing/algs/qgis/LinesToPolygons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def convertWkbToPolygons(self, wkb):
101101
return multi_wkb
102102

103103
def convertToPolygons(self, geometry):
104-
surfaces = self.getSurfaces(geometry.geometry())
104+
surfaces = self.getSurfaces(geometry.constGet())
105105
output_wkb = self.convertWkbToPolygons(geometry.wkbType())
106106
out_geom = None
107107
if QgsWkbTypes.flatType(output_wkb) == QgsWkbTypes.MultiPolygon:

‎python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def createFeature(self, feedback, feature_id, type, geometries, class_field=None
238238
while True:
239239
if feedback.isCanceled():
240240
break
241-
found, point = g.geometry().nextVertex(vid)
241+
found, point = g.constGet().nextVertex(vid)
242242
if found:
243243
multi_point.addGeometry(point)
244244
else:
@@ -270,8 +270,8 @@ def createFeature(self, feedback, feature_id, type, geometries, class_field=None
270270
elif type == 3:
271271
# convex hull
272272
output_geometry = geometry.convexHull()
273-
attrs.append(output_geometry.geometry().area())
274-
attrs.append(output_geometry.geometry().perimeter())
273+
attrs.append(output_geometry.constGet().area())
274+
attrs.append(output_geometry.constGet().perimeter())
275275
f = QgsFeature()
276276
f.setAttributes(attrs)
277277
f.setGeometry(output_geometry)

‎python/plugins/processing/algs/qgis/PointsAlongGeometry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def processAlgorithm(self, parameters, context, feedback):
108108
sink.addFeature(input_feature, QgsFeatureSink.FastInsert)
109109
else:
110110
if input_geometry.type == QgsWkbTypes.PolygonGeometry:
111-
length = input_geometry.geometry().perimeter()
111+
length = input_geometry.constGet().perimeter()
112112
else:
113113
length = input_geometry.length() - end_offset
114114
current_distance = start_offset

‎python/plugins/processing/algs/qgis/PointsDisplacement.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def searchRect(p):
169169
dy = radius * cosinusCurrentAngle
170170

171171
# we want to keep any existing m/z values
172-
point = f.geometry().geometry().clone()
172+
point = f.geometry().constGet().clone()
173173
point.setX(old_point.x() + dx)
174174
point.setY(old_point.y() + dy)
175175
f.setGeometry(QgsGeometry(point))

‎python/plugins/processing/algs/qgis/PointsFromPolygons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def processAlgorithm(self, parameters, context, feedback):
117117
(endRow, endColumn) = raster.mapToPixel(xMax, yMin, geoTransform)
118118

119119
# use prepared geometries for faster intersection tests
120-
engine = QgsGeometry.createGeometryEngine(geom.geometry())
120+
engine = QgsGeometry.createGeometryEngine(geom.constGet())
121121
engine.prepareGeometry()
122122

123123
for row in range(startRow, endRow + 1):

‎python/plugins/processing/algs/qgis/PointsInPolygon.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def processAlgorithm(self, parameters, context, feedback):
129129
output_feature = QgsFeature()
130130
if polygon_feature.hasGeometry():
131131
geom = polygon_feature.geometry()
132-
engine = QgsGeometry.createGeometryEngine(geom.geometry())
132+
engine = QgsGeometry.createGeometryEngine(geom.constGet())
133133
engine.prepareGeometry()
134134

135135
count = 0
@@ -143,7 +143,7 @@ def processAlgorithm(self, parameters, context, feedback):
143143
if feedback.isCanceled():
144144
break
145145

146-
if engine.contains(point_feature.geometry().geometry()):
146+
if engine.contains(point_feature.geometry().constGet()):
147147
if weight_field_index >= 0:
148148
weight = point_feature.attributes()[weight_field_index]
149149
try:

‎python/plugins/processing/algs/qgis/PointsToPaths.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def processAlgorithm(self, parameters, context, feedback):
133133
if not f.hasGeometry():
134134
continue
135135

136-
point = f.geometry().geometry().clone()
136+
point = f.geometry().constGet().clone()
137137
if group_field_index >= 0:
138138
group = f.attributes()[group_field_index]
139139
else:

‎python/plugins/processing/algs/qgis/Polygonize.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ def processAlgorithm(self, parameters, context, feedback):
104104

105105
if not polygons.isEmpty():
106106
feedback.pushInfo('Saving polygons...')
107-
total = 50.0 / polygons.geometry().numGeometries()
108-
for i in range(polygons.geometry().numGeometries()):
107+
total = 50.0 / polygons.constGet().numGeometries()
108+
for i in range(polygons.constGet().numGeometries()):
109109
if feedback.isCanceled():
110110
break
111111

112112
outFeat = QgsFeature()
113-
geom = QgsGeometry(polygons.geometry().geometryN(i).clone())
113+
geom = QgsGeometry(polygons.constGet().geometryN(i).clone())
114114
outFeat.setGeometry(geom)
115115
sink.addFeature(outFeat, QgsFeatureSink.FastInsert)
116116
feedback.setProgress(50 + int(current * total))

‎python/plugins/processing/algs/qgis/PolygonsToLines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def convertWkbToLines(self, wkb):
9292
return multi_wkb
9393

9494
def convertToLines(self, geometry):
95-
rings = self.getRings(geometry.geometry())
95+
rings = self.getRings(geometry.constGet())
9696
output_wkb = self.convertWkbToLines(geometry.wkbType())
9797
out_geom = None
9898
if QgsWkbTypes.flatType(output_wkb) == QgsWkbTypes.MultiLineString:

‎python/plugins/processing/algs/qgis/RegularPoints.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def processAlgorithm(self, parameters, context, feedback):
124124
y = extent.yMaximum() - inset
125125

126126
extent_geom = QgsGeometry.fromRect(extent)
127-
extent_engine = QgsGeometry.createGeometryEngine(extent_geom.geometry())
127+
extent_engine = QgsGeometry.createGeometryEngine(extent_geom.constGet())
128128
extent_engine.prepareGeometry()
129129

130130
while y >= extent.yMinimum():
@@ -140,7 +140,7 @@ def processAlgorithm(self, parameters, context, feedback):
140140
else:
141141
geom = QgsGeometry().fromPoint(QgsPointXY(x, y))
142142

143-
if extent_engine.intersects(geom.geometry()):
143+
if extent_engine.intersects(geom.constGet()):
144144
f.setAttribute('id', count)
145145
f.setGeometry(geom)
146146
sink.addFeature(f, QgsFeatureSink.FastInsert)

‎python/plugins/processing/algs/qgis/ReverseLineDirection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def inputLayerTypes(self):
5757
def processFeature(self, feature, feedback):
5858
if feature.geometry():
5959
inGeom = feature.geometry()
60-
reversedLine = inGeom.geometry().reversed()
60+
reversedLine = inGeom.constGet().reversed()
6161
if not reversedLine:
6262
raise QgsProcessingException(
6363
self.tr('Error reversing line'))

‎python/plugins/processing/algs/qgis/SetMValue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def prepareAlgorithm(self, parameters, context, feedback):
7474
def processFeature(self, feature, feedback):
7575
input_geometry = feature.geometry()
7676
if input_geometry:
77-
new_geom = input_geometry.geometry().clone()
77+
new_geom = input_geometry.constGet().clone()
7878
if QgsWkbTypes.hasM(new_geom.wkbType()):
7979
# addMValue won't alter existing M values, so drop them first
8080
new_geom.dropMValue()

‎python/plugins/processing/algs/qgis/SetZValue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def prepareAlgorithm(self, parameters, context, feedback):
7474
def processFeature(self, feature, feedback):
7575
input_geometry = feature.geometry()
7676
if input_geometry:
77-
new_geom = input_geometry.geometry().clone()
77+
new_geom = input_geometry.constGet().clone()
7878
if QgsWkbTypes.hasZ(new_geom.wkbType()):
7979
# addZValue won't alter existing Z values, so drop them first
8080
new_geom.dropZValue()

‎python/plugins/processing/algs/qgis/SpatialJoin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@ def processAlgorithm(self, parameters, context, feedback):
195195
join_attributes.append(f.attributes()[a])
196196

197197
if engine is None:
198-
engine = QgsGeometry.createGeometryEngine(f.geometry().geometry())
198+
engine = QgsGeometry.createGeometryEngine(f.geometry().constGet())
199199
engine.prepareGeometry()
200200

201201
for predicate in predicates:
202-
if getattr(engine, predicate)(test_feat.geometry().geometry()):
202+
if getattr(engine, predicate)(test_feat.geometry().constGet()):
203203
added_set.add(test_feat.id())
204204

205205
# join attributes and add

‎python/plugins/processing/algs/qgis/SpatialJoinSummary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ def addField(original, stat, type):
286286
join_attributes.append(test_feat.attributes()[a])
287287

288288
if engine is None:
289-
engine = QgsGeometry.createGeometryEngine(f.geometry().geometry())
289+
engine = QgsGeometry.createGeometryEngine(f.geometry().constGet())
290290
engine.prepareGeometry()
291291

292292
for predicate in predicates:
293-
if getattr(engine, predicate)(test_feat.geometry().geometry()):
293+
if getattr(engine, predicate)(test_feat.geometry().constGet()):
294294
values.append(join_attributes)
295295
break
296296

‎python/plugins/processing/algs/qgis/SumLines.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def processAlgorithm(self, parameters, context, feedback):
124124
if len(lines) > 0:
125125
has_intersections = True
126126
# use prepared geometries for faster intersection tests
127-
engine = QgsGeometry.createGeometryEngine(poly_geom.geometry())
127+
engine = QgsGeometry.createGeometryEngine(poly_geom.constGet())
128128
engine.prepareGeometry()
129129

130130
if has_intersections:
@@ -133,7 +133,7 @@ def processAlgorithm(self, parameters, context, feedback):
133133
if feedback.isCanceled():
134134
break
135135

136-
if engine.intersects(line_feature.geometry().geometry()):
136+
if engine.intersects(line_feature.geometry().constGet()):
137137
outGeom = poly_geom.intersection(line_feature.geometry())
138138
length += distArea.measureLength(outGeom)
139139
count += 1

0 commit comments

Comments
 (0)
Please sign in to comment.