sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily make QgsProcessingAlgorithm::run non pure-virtual (for travis)

Browse Source
This commit is contained in:
Nyall Dawson 2017-05-09 13:24:06 +10:00
parent 3706d88045
commit 02b560e90d
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/processing/qgsprocessingalgorithm.sip
View File

@ -113,7 +113,7 @@ class QgsProcessingAlgorithm
void setProvider( QgsProcessingProvider *provider );
virtual bool run( const QVariantMap &parameters,
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs /Out/ ) const = 0;
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs /Out/ ) const;
%Docstring
Runs the algorithm using the specified ``parameters``. Algorithms should implement
their custom processing logic here.

2
src/core/processing/qgsnativealgorithms.cpp
View File

@ -78,7 +78,7 @@ bool QgsBufferAlgorithm::run( const QVariantMap &parameters, QgsProcessingContex
std::unique_ptr< QgsFeatureSink > writer( QgsProcessingUtils::createFeatureSink( dest, QString(), layer->fields(), QgsWkbTypes::Point, layer->crs(), context, outputLayer ) );
// fixed parameters
bool dissolve = QgsProcessingParameters::parameterAsBool( parameters, QStringLiteral( "DISSOLVE" ), context );
//bool dissolve = QgsProcessingParameters::parameterAsBool( parameters, QStringLiteral( "DISSOLVE" ), context );
int segments = QgsProcessingParameters::parameterAsInt( parameters, QStringLiteral( "DISSOLVE" ), context );
QgsGeometry::EndCapStyle endCapStyle = static_cast< QgsGeometry::EndCapStyle >( QgsProcessingParameters::parameterAsInt( parameters, QStringLiteral( "END_CAP_STYLE" ), context ) );
QgsGeometry::JoinStyle joinStyle = static_cast< QgsGeometry::JoinStyle>( QgsProcessingParameters::parameterAsInt( parameters, QStringLiteral( "JOIN_STYLE" ), context ) );

5
src/core/processing/qgsprocessingalgorithm.cpp
View File

@ -51,3 +51,8 @@ void QgsProcessingAlgorithm::setProvider( QgsProcessingProvider *provider )
{
mProvider = provider;
}
bool QgsProcessingAlgorithm::run( const QVariantMap &, QgsProcessingContext &, QgsProcessingFeedback *, QVariantMap & ) const
{
return true;
}

2
src/core/processing/qgsprocessingalgorithm.h
View File

@ -142,7 +142,7 @@ class CORE_EXPORT QgsProcessingAlgorithm
* \returns true if algorithm run was successful, or false if run was unsuccessful.
*/
virtual bool run( const QVariantMap &parameters,
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs SIP_OUT ) const = 0;
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs SIP_OUT ) const;
private: