Update algorithms for new API

This commit is contained in:
Nyall Dawson 2017-11-27 07:55:01 +10:00
parent 86958937ad
commit d1a71f0971
59 changed files with 60 additions and 69 deletions

View File

@ -90,7 +90,7 @@ class AddTableField(QgisFeatureBasedAlgorithm):
inputFields.append(self.field) inputFields.append(self.field)
return inputFields return inputFields
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
attributes = feature.attributes() attributes = feature.attributes()
attributes.append(None) attributes.append(None)
feature.setAttributes(attributes) feature.setAttributes(attributes)

View File

@ -80,7 +80,7 @@ class DeleteColumn(QgisFeatureBasedAlgorithm):
input_fields.remove(index) input_fields.remove(index)
return input_fields return input_fields
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
attributes = feature.attributes() attributes = feature.attributes()
for index in self.field_indices: for index in self.field_indices:
del attributes[index] del attributes[index]

View File

@ -66,7 +66,7 @@ class DeleteHoles(QgisFeatureBasedAlgorithm):
self.min_area = -1.0 self.min_area = -1.0
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
if feature.hasGeometry(): if feature.hasGeometry():
feature.setGeometry(feature.geometry().removeInteriorRings(self.min_area)) feature.setGeometry(feature.geometry().removeInteriorRings(self.min_area))
return feature return feature

View File

@ -68,7 +68,7 @@ class DensifyGeometries(QgisFeatureBasedAlgorithm):
self.vertices = self.parameterAsInt(parameters, self.VERTICES, context) self.vertices = self.parameterAsInt(parameters, self.VERTICES, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
if feature.hasGeometry(): if feature.hasGeometry():
new_geometry = feature.geometry().densifyByCount(self.vertices) new_geometry = feature.geometry().densifyByCount(self.vertices)
feature.setGeometry(new_geometry) feature.setGeometry(new_geometry)

View File

@ -64,7 +64,7 @@ class DensifyGeometriesInterval(QgisFeatureBasedAlgorithm):
interval = self.parameterAsDouble(parameters, self.INTERVAL, context) interval = self.parameterAsDouble(parameters, self.INTERVAL, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
if feature.hasGeometry(): if feature.hasGeometry():
new_geometry = feature.geometry().densifyByDistance(float(interval)) new_geometry = feature.geometry().densifyByDistance(float(interval))
feature.setGeometry(new_geometry) feature.setGeometry(new_geometry)

View File

@ -67,7 +67,7 @@ class ExtendLines(QgisFeatureBasedAlgorithm):
self.end_distance = self.parameterAsDouble(parameters, self.END_DISTANCE, context) self.end_distance = self.parameterAsDouble(parameters, self.END_DISTANCE, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
output_geometry = input_geometry.extendLine(self.start_distance, self.end_distance) output_geometry = input_geometry.extendLine(self.start_distance, self.end_distance)

View File

@ -151,7 +151,7 @@ class FieldsMapper(QgisFeatureBasedAlgorithm):
self._row_number = 0 self._row_number = 0
return super().processAlgorithm(parameters, context, feeback) return super().processAlgorithm(parameters, context, feeback)
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
attributes = [] attributes = []
for expression in self.expressions: for expression in self.expressions:
self.expr_context.setFeature(feature) self.expr_context.setFeature(feature)

View File

@ -101,7 +101,7 @@ class GeometryByExpression(QgisFeatureBasedAlgorithm):
def outputWkbType(self, input_wkb_type): def outputWkbType(self, input_wkb_type):
return self.wkb_type return self.wkb_type
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
self.expression_context.setFeature(feature) self.expression_context.setFeature(feature)
value = self.expression.evaluate(self.expression_context) value = self.expression.evaluate(self.expression_context)
if self.expression.hasEvalError(): if self.expression.hasEvalError():

View File

@ -80,7 +80,7 @@ class LinesToPolygons(QgisFeatureBasedAlgorithm):
def outputWkbType(self, input_wkb_type): def outputWkbType(self, input_wkb_type):
return self.convertWkbToPolygons(input_wkb_type) return self.convertWkbToPolygons(input_wkb_type)
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
if feature.hasGeometry(): if feature.hasGeometry():
feature.setGeometry(QgsGeometry(self.convertToPolygons(feature.geometry()))) feature.setGeometry(QgsGeometry(self.convertToPolygons(feature.geometry())))
if feature.geometry().isEmpty(): if feature.geometry().isEmpty():

View File

@ -100,7 +100,7 @@ class OffsetLine(QgisFeatureBasedAlgorithm):
self.miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context) self.miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
output_geometry = input_geometry.offsetCurve(self.distance, self.segments, self.join_style, self.miter_limit) output_geometry = input_geometry.offsetCurve(self.distance, self.segments, self.join_style, self.miter_limit)

View File

@ -79,7 +79,7 @@ class Orthogonalize(QgisFeatureBasedAlgorithm):
self.angle_tolerance = self.parameterAsDouble(parameters, self.ANGLE_TOLERANCE, context) self.angle_tolerance = self.parameterAsDouble(parameters, self.ANGLE_TOLERANCE, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
output_geometry = input_geometry.orthogonalize(1.0e-8, self.max_iterations, self.angle_tolerance) output_geometry = input_geometry.orthogonalize(1.0e-8, self.max_iterations, self.angle_tolerance)

View File

@ -64,7 +64,7 @@ class PointOnSurface(QgisFeatureBasedAlgorithm):
def outputWkbType(self, input_wkb_type): def outputWkbType(self, input_wkb_type):
return QgsWkbTypes.Point return QgsWkbTypes.Point
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
output_geometry = input_geometry.pointOnSurface() output_geometry = input_geometry.pointOnSurface()

View File

@ -73,7 +73,7 @@ class PolygonsToLines(QgisFeatureBasedAlgorithm):
def outputWkbType(self, input_wkb_type): def outputWkbType(self, input_wkb_type):
return self.convertWkbToLines(input_wkb_type) return self.convertWkbToLines(input_wkb_type)
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
if feature.hasGeometry(): if feature.hasGeometry():
feature.setGeometry(QgsGeometry(self.convertToLines(feature.geometry()))) feature.setGeometry(QgsGeometry(self.convertToLines(feature.geometry())))
return feature return feature

View File

@ -54,7 +54,7 @@ class ReverseLineDirection(QgisFeatureBasedAlgorithm):
def inputLayerTypes(self): def inputLayerTypes(self):
return [QgsProcessing.TypeVectorLine] return [QgsProcessing.TypeVectorLine]
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
if feature.geometry(): if feature.geometry():
inGeom = feature.geometry() inGeom = feature.geometry()
reversedLine = inGeom.constGet().reversed() reversedLine = inGeom.constGet().reversed()

View File

@ -71,7 +71,7 @@ class SetMValue(QgisFeatureBasedAlgorithm):
self.m_value = self.parameterAsDouble(parameters, self.M_VALUE, context) self.m_value = self.parameterAsDouble(parameters, self.M_VALUE, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
new_geom = input_geometry.constGet().clone() new_geom = input_geometry.constGet().clone()

View File

@ -52,7 +52,6 @@ class SetZValue(QgisFeatureBasedAlgorithm):
self.z_value = 0 self.z_value = 0
self.dynamic_z = False self.dynamic_z = False
self.z_property = None self.z_property = None
self.expression_context = None
def name(self): def name(self):
return 'setzvalue' return 'setzvalue'
@ -82,14 +81,9 @@ class SetZValue(QgisFeatureBasedAlgorithm):
self.dynamic_z = QgsProcessingParameters.isDynamic(parameters, self.Z_VALUE) self.dynamic_z = QgsProcessingParameters.isDynamic(parameters, self.Z_VALUE)
if self.dynamic_z: if self.dynamic_z:
self.z_property = parameters[self.Z_VALUE] self.z_property = parameters[self.Z_VALUE]
source = self.parameterAsSource(parameters, 'INPUT', context)
if not isinstance(source, QgsProcessingFeatureSource):
source = None
self.expression_context = self.createExpressionContext(parameters, context, source)
self.z_property.prepare(self.expression_context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
new_geom = input_geometry.constGet().clone() new_geom = input_geometry.constGet().clone()
@ -99,8 +93,7 @@ class SetZValue(QgisFeatureBasedAlgorithm):
z = self.z_value z = self.z_value
if self.dynamic_z: if self.dynamic_z:
self.expression_context.setFeature(feature) z, ok = self.z_property.valueAsDouble(context.expressionContext(), z)
z, ok = self.z_property.valueAsDouble(self.expression_context, z)
new_geom.addZValue(z) new_geom.addZValue(z)
feature.setGeometry(QgsGeometry(new_geom)) feature.setGeometry(QgsGeometry(new_geom))

View File

@ -108,7 +108,7 @@ class SingleSidedBuffer(QgisFeatureBasedAlgorithm):
self.miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context) self.miter_limit = self.parameterAsDouble(parameters, self.MITER_LIMIT, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
input_geometry = feature.geometry() input_geometry = feature.geometry()
if input_geometry: if input_geometry:
output_geometry = input_geometry.singleSidedBuffer(self.distance, self.segments, output_geometry = input_geometry.singleSidedBuffer(self.distance, self.segments,

View File

@ -73,7 +73,7 @@ class TextToFloat(QgisFeatureBasedAlgorithm):
self.field_name = self.parameterAsString(parameters, self.FIELD, context) self.field_name = self.parameterAsString(parameters, self.FIELD, context)
return True return True
def processFeature(self, feature, feedback): def processFeature(self, feature, context, feedback):
value = feature[self.field_idx] value = feature[self.field_idx]
try: try:
if '%' in value: if '%' in value:

View File

@ -74,7 +74,7 @@ QgsTessellateAlgorithm *QgsTessellateAlgorithm::createInstance() const
return new QgsTessellateAlgorithm(); return new QgsTessellateAlgorithm();
} }
QgsFeature QgsTessellateAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsTessellateAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -47,7 +47,7 @@ class QgsTessellateAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QgsProcessing::SourceType outputLayerType() const override; QgsProcessing::SourceType outputLayerType() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -90,7 +90,7 @@ bool QgsAddIncrementalFieldAlgorithm::prepareAlgorithm( const QVariantMap &param
return true; return true;
} }
QgsFeature QgsAddIncrementalFieldAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsAddIncrementalFieldAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
if ( !mGroupedFieldNames.empty() && mGroupedFields.empty() ) if ( !mGroupedFieldNames.empty() && mGroupedFields.empty() )
{ {

View File

@ -49,7 +49,7 @@ class QgsAddIncrementalFieldAlgorithm : public QgsProcessingFeatureBasedAlgorith
QgsFields outputFields( const QgsFields &inputFields ) const override; QgsFields outputFields( const QgsFields &inputFields ) const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:

View File

@ -68,7 +68,7 @@ bool QgsAssignProjectionAlgorithm::prepareAlgorithm( const QVariantMap &paramete
return true; return true;
} }
QgsFeature QgsAssignProjectionAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsAssignProjectionAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
return feature; return feature;
} }

View File

@ -48,7 +48,7 @@ class QgsAssignProjectionAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:

View File

@ -90,7 +90,7 @@ QgsWkbTypes::Type QgsBoundaryAlgorithm::outputWkbType( QgsWkbTypes::Type inputWk
return outputWkb; return outputWkb;
} }
QgsFeature QgsBoundaryAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) QgsFeature QgsBoundaryAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
QgsFeature outFeature = feature; QgsFeature outFeature = feature;

View File

@ -46,7 +46,7 @@ class QgsBoundaryAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };
///@endcond PRIVATE ///@endcond PRIVATE

View File

@ -66,7 +66,7 @@ QgsFields QgsBoundingBoxAlgorithm::outputFields( const QgsFields &inputFields )
return fields; return fields;
} }
QgsFeature QgsBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -45,7 +45,7 @@ class QgsBoundingBoxAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override { return QgsWkbTypes::Polygon; } QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override { return QgsWkbTypes::Polygon; }
QgsFields outputFields( const QgsFields &inputFields ) const override; QgsFields outputFields( const QgsFields &inputFields ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -91,13 +91,11 @@ QVariantMap QgsBufferAlgorithm::processAlgorithm( const QVariantMap &parameters,
double miterLimit = parameterAsDouble( parameters, QStringLiteral( "MITER_LIMIT" ), context ); double miterLimit = parameterAsDouble( parameters, QStringLiteral( "MITER_LIMIT" ), context );
double bufferDistance = parameterAsDouble( parameters, QStringLiteral( "DISTANCE" ), context ); double bufferDistance = parameterAsDouble( parameters, QStringLiteral( "DISTANCE" ), context );
bool dynamicBuffer = QgsProcessingParameters::isDynamic( parameters, QStringLiteral( "DISTANCE" ) ); bool dynamicBuffer = QgsProcessingParameters::isDynamic( parameters, QStringLiteral( "DISTANCE" ) );
QgsExpressionContext expressionContext; QgsExpressionContext expressionContext = createExpressionContext( parameters, context, dynamic_cast< QgsProcessingFeatureSource * >( source.get() ) );
QgsProperty bufferProperty; QgsProperty bufferProperty;
if ( dynamicBuffer ) if ( dynamicBuffer )
{ {
bufferProperty = parameters.value( QStringLiteral( "DISTANCE" ) ).value< QgsProperty >(); bufferProperty = parameters.value( QStringLiteral( "DISTANCE" ) ).value< QgsProperty >();
expressionContext = createExpressionContext( parameters, context, dynamic_cast< QgsProcessingFeatureSource * >( source.get() ) );
bufferProperty.prepare( expressionContext );
} }
long count = source->featureCount(); long count = source->featureCount();

View File

@ -61,7 +61,7 @@ QgsCentroidAlgorithm *QgsCentroidAlgorithm::createInstance() const
return new QgsCentroidAlgorithm(); return new QgsCentroidAlgorithm();
} }
QgsFeature QgsCentroidAlgorithm::processFeature( const QgsFeature &f, QgsProcessingFeedback *feedback ) QgsFeature QgsCentroidAlgorithm::processFeature( const QgsFeature &f, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
QgsFeature feature = f; QgsFeature feature = f;
if ( feature.hasGeometry() ) if ( feature.hasGeometry() )

View File

@ -48,7 +48,7 @@ class QgsCentroidAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QgsProcessing::SourceType outputLayerType() const override { return QgsProcessing::TypeVectorPoint; } QgsProcessing::SourceType outputLayerType() const override { return QgsProcessing::TypeVectorPoint; }
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override { Q_UNUSED( inputWkbType ); return QgsWkbTypes::Point; } QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override { Q_UNUSED( inputWkbType ); return QgsWkbTypes::Point; }
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };
///@endcond PRIVATE ///@endcond PRIVATE

View File

@ -64,7 +64,7 @@ QgsFields QgsConvexHullAlgorithm::outputFields( const QgsFields &inputFields ) c
return fields; return fields;
} }
QgsFeature QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) QgsFeature QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -46,7 +46,7 @@ class QgsConvexHullAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override { return QgsWkbTypes::Polygon; } QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override { return QgsWkbTypes::Polygon; }
QgsFields outputFields( const QgsFields &inputFields ) const override; QgsFields outputFields( const QgsFields &inputFields ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -69,7 +69,7 @@ QgsFeatureRequest QgsDropGeometryAlgorithm::request() const
return QgsFeatureRequest().setFlags( QgsFeatureRequest::NoGeometry ); return QgsFeatureRequest().setFlags( QgsFeatureRequest::NoGeometry );
} }
QgsFeature QgsDropGeometryAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsDropGeometryAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
f.clearGeometry(); f.clearGeometry();

View File

@ -47,7 +47,7 @@ class QgsDropGeometryAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
QgsFeatureRequest request() const override; QgsFeatureRequest request() const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };
///@endcond PRIVATE ///@endcond PRIVATE

View File

@ -77,7 +77,7 @@ bool QgsDropMZValuesAlgorithm::prepareAlgorithm( const QVariantMap &parameters,
return true; return true;
} }
QgsFeature QgsDropMZValuesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsDropMZValuesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -47,7 +47,7 @@ class QgsDropMZValuesAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:

View File

@ -67,7 +67,7 @@ QgsFixGeometriesAlgorithm *QgsFixGeometriesAlgorithm::createInstance() const
return new QgsFixGeometriesAlgorithm(); return new QgsFixGeometriesAlgorithm();
} }
QgsFeature QgsFixGeometriesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) QgsFeature QgsFixGeometriesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
if ( !feature.hasGeometry() ) if ( !feature.hasGeometry() )
return feature; return feature;

View File

@ -45,7 +45,7 @@ class QgsFixGeometriesAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QgsProcessingFeatureSource::Flag sourceFlags() const override; QgsProcessingFeatureSource::Flag sourceFlags() const override;
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type type ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type type ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -71,7 +71,7 @@ QgsMergeLinesAlgorithm *QgsMergeLinesAlgorithm::createInstance() const
return new QgsMergeLinesAlgorithm(); return new QgsMergeLinesAlgorithm();
} }
QgsFeature QgsMergeLinesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) QgsFeature QgsMergeLinesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
if ( !feature.hasGeometry() ) if ( !feature.hasGeometry() )
return feature; return feature;

View File

@ -50,7 +50,7 @@ class QgsMergeLinesAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsProcessing::SourceType outputLayerType() const override; QgsProcessing::SourceType outputLayerType() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -81,7 +81,7 @@ bool QgsMinimumEnclosingCircleAlgorithm::prepareAlgorithm( const QVariantMap &pa
return true; return true;
} }
QgsFeature QgsMinimumEnclosingCircleAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsMinimumEnclosingCircleAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -47,7 +47,7 @@ class QgsMinimumEnclosingCircleAlgorithm : public QgsProcessingFeatureBasedAlgor
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override;
QgsFields outputFields( const QgsFields &inputFields ) const override; QgsFields outputFields( const QgsFields &inputFields ) const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:

View File

@ -72,7 +72,7 @@ QgsFields QgsOrientedMinimumBoundingBoxAlgorithm::outputFields( const QgsFields
return fields; return fields;
} }
QgsFeature QgsOrientedMinimumBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsOrientedMinimumBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -45,7 +45,7 @@ class QgsOrientedMinimumBoundingBoxAlgorithm : public QgsProcessingFeatureBasedA
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type ) const override;
QgsFields outputFields( const QgsFields &inputFields ) const override; QgsFields outputFields( const QgsFields &inputFields ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -65,7 +65,7 @@ QgsWkbTypes::Type QgsPromoteToMultipartAlgorithm::outputWkbType( QgsWkbTypes::Ty
return QgsWkbTypes::multiType( inputWkbType ); return QgsWkbTypes::multiType( inputWkbType );
} }
QgsFeature QgsPromoteToMultipartAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsPromoteToMultipartAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() && !f.geometry().isMultipart() ) if ( f.hasGeometry() && !f.geometry().isMultipart() )

View File

@ -46,7 +46,7 @@ class QgsPromoteToMultipartAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
}; };

View File

@ -88,7 +88,7 @@ bool QgsSimplifyAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsP
return true; return true;
} }
QgsFeature QgsSimplifyAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsSimplifyAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -47,7 +47,7 @@ class QgsSimplifyAlgorithm : public QgsProcessingFeatureBasedAlgorithm
protected: protected:
QString outputName() const override; QString outputName() const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback ) override;
private: private:

View File

@ -96,7 +96,7 @@ bool QgsSmoothAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsPro
return true; return true;
} }
QgsFeature QgsSmoothAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) QgsFeature QgsSmoothAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -47,7 +47,7 @@ class QgsSmoothAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsProcessing::SourceType outputLayerType() const override; QgsProcessing::SourceType outputLayerType() const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:
int mIterations = 1; int mIterations = 1;

View File

@ -85,7 +85,7 @@ bool QgsSnapToGridAlgorithm::prepareAlgorithm( const QVariantMap &parameters, Qg
return true; return true;
} }
QgsFeature QgsSnapToGridAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) QgsFeature QgsSnapToGridAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -45,7 +45,7 @@ class QgsSnapToGridAlgorithm : public QgsProcessingFeatureBasedAlgorithm
protected: protected:
QString outputName() const override; QString outputName() const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:
double mIntervalX = 0.0; double mIntervalX = 0.0;

View File

@ -71,7 +71,7 @@ QgsWkbTypes::Type QgsSubdivideAlgorithm::outputWkbType( QgsWkbTypes::Type inputW
return QgsWkbTypes::multiType( inputWkbType ); return QgsWkbTypes::multiType( inputWkbType );
} }
QgsFeature QgsSubdivideAlgorithm::processFeature( const QgsFeature &f, QgsProcessingFeedback *feedback ) QgsFeature QgsSubdivideAlgorithm::processFeature( const QgsFeature &f, QgsProcessingContext &, QgsProcessingFeedback *feedback )
{ {
QgsFeature feature = f; QgsFeature feature = f;
if ( feature.hasGeometry() ) if ( feature.hasGeometry() )

View File

@ -46,7 +46,7 @@ class QgsSubdivideAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;

View File

@ -73,7 +73,7 @@ bool QgsTransformAlgorithm::prepareAlgorithm( const QVariantMap &parameters, Qgs
return true; return true;
} }
QgsFeature QgsTransformAlgorithm::processFeature( const QgsFeature &f, QgsProcessingFeedback * ) QgsFeature QgsTransformAlgorithm::processFeature( const QgsFeature &f, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature feature = f; QgsFeature feature = f;
if ( !mCreatedTransform ) if ( !mCreatedTransform )

View File

@ -48,7 +48,7 @@ class QgsTransformAlgorithm : public QgsProcessingFeatureBasedAlgorithm
QString outputName() const override; QString outputName() const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
private: private:

View File

@ -82,7 +82,7 @@ bool QgsTranslateAlgorithm::prepareAlgorithm( const QVariantMap &parameters, Qgs
return true; return true;
} }
QgsFeature QgsTranslateAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingFeedback * ) QgsFeature QgsTranslateAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
{ {
QgsFeature f = feature; QgsFeature f = feature;
if ( f.hasGeometry() ) if ( f.hasGeometry() )

View File

@ -45,7 +45,7 @@ class QgsTranslateAlgorithm : public QgsProcessingFeatureBasedAlgorithm
protected: protected:
QString outputName() const override; QString outputName() const override;
bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override; bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsFeature processFeature( const QgsFeature &feature, QgsProcessingFeedback *feedback ) override; QgsFeature processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override; QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const override;
private: private: