Skip to content

Commit

Permalink
[FEATURE][processing] New modeler algorithm for conditional branches …
Browse files Browse the repository at this point in the history
…in models

This algorithm allows useres to setup multiple conditions (via qgis expressions),
which cause their corresponding branch of the model to be run or skipped
depending on the result of the expression evaluation.

Sponsored by Andreas Neumann
  • Loading branch information
nyalldawson committed Apr 16, 2020
1 parent 05bc716 commit 6a1b106
Show file tree
Hide file tree
Showing 11 changed files with 445 additions and 0 deletions.
29 changes: 29 additions & 0 deletions python/core/auto_generated/processing/qgsprocessingoutputs.sip.in
Expand Up @@ -47,6 +47,8 @@ as generated layers or calculated values.
sipType = sipType_QgsProcessingOutputFolder;
else if ( sipCpp->type() == QgsProcessingOutputFile::typeName() )
sipType = sipType_QgsProcessingOutputFile;
else if ( sipCpp->type() == QgsProcessingOutputConditionalBranch::typeName() )
sipType = sipType_QgsProcessingOutputConditionalBranch;
else
sipType = nullptr;
%End
Expand Down Expand Up @@ -393,6 +395,33 @@ Returns the type name for the output class.

};

class QgsProcessingOutputConditionalBranch : QgsProcessingOutputDefinition
{
%Docstring
A conditional branch output for processing algorithms, which represents a possible model logic
flow which branches out from this algorithm.

.. versionadded:: 3.14
%End

%TypeHeaderCode
#include "qgsprocessingoutputs.h"
%End
public:

QgsProcessingOutputConditionalBranch( const QString &name, const QString &description = QString() );
%Docstring
Constructor for QgsProcessingOutputConditionalBranch.
%End

static QString typeName();
%Docstring
Returns the type name for the output class.
%End
virtual QString type() const;

};




Expand Down
1 change: 1 addition & 0 deletions src/analysis/CMakeLists.txt
Expand Up @@ -37,6 +37,7 @@ SET(QGIS_ANALYSIS_SRCS
processing/qgsalgorithmcategorizeusingstyle.cpp
processing/qgsalgorithmcentroid.cpp
processing/qgsalgorithmclip.cpp
processing/qgsalgorithmconditionalbranch.cpp
processing/qgsalgorithmconstantraster.cpp
processing/qgsalgorithmconvexhull.cpp
processing/qgsalgorithmdbscanclustering.cpp
Expand Down
110 changes: 110 additions & 0 deletions src/analysis/processing/qgsalgorithmconditionalbranch.cpp
@@ -0,0 +1,110 @@
/***************************************************************************
qgsalgorithmconditionalbranch.cpp
---------------------
begin : March 2020
copyright : (C) 2020 by Nyall Dawson
email : nyall dot dawson at gmail dot com
***************************************************************************/

/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#include "qgsalgorithmconditionalbranch.h"
#include "qgsapplication.h"

///@cond PRIVATE

QString QgsConditionalBranchAlgorithm::name() const
{
return QStringLiteral( "condition" );
}

QString QgsConditionalBranchAlgorithm::displayName() const
{
return QObject::tr( "Conditional branch" );
}

QStringList QgsConditionalBranchAlgorithm::tags() const
{
return QObject::tr( "if,logic,test" ).split( ',' );
}

QString QgsConditionalBranchAlgorithm::group() const
{
return QObject::tr( "Modeler tools" );
}

QString QgsConditionalBranchAlgorithm::groupId() const
{
return QStringLiteral( "modelertools" );
}

QgsProcessingAlgorithm::Flags QgsConditionalBranchAlgorithm::flags() const
{
return FlagHideFromToolbox | FlagSkipGenericModelLogging;
}

QString QgsConditionalBranchAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm adds a conditional branch into a model, allowing parts of the model to be executed based on the result of an expression evaluation." );
}

QString QgsConditionalBranchAlgorithm::shortDescription() const
{
return QObject::tr( "Adds a conditional branch into a model, allowing parts of the model to be selectively executed." );
}

QgsConditionalBranchAlgorithm *QgsConditionalBranchAlgorithm::createInstance() const
{
return new QgsConditionalBranchAlgorithm();
}

QgsConditionalBranchAlgorithm::~QgsConditionalBranchAlgorithm()
{
qDeleteAll( mOutputs );
}

void QgsConditionalBranchAlgorithm::initAlgorithm( const QVariantMap &configuration )
{
const QVariantList branches = configuration.value( QStringLiteral( "conditions" ) ).toList();
for ( const QVariant &branch : branches )
{
const QVariantMap branchDef = branch.toMap();
const QString name = branchDef.value( QStringLiteral( "name" ) ).toString();
mOutputs.append( new Output( name, branchDef.value( QStringLiteral( "expression" ) ).toString() ) );
addOutput( new QgsProcessingOutputConditionalBranch( name, name ) );
}
}

QVariantMap QgsConditionalBranchAlgorithm::processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
{
QgsExpressionContext expressionContext = createExpressionContext( parameters, context );

QVariantMap results;
for ( Output *output : qgis::as_const( mOutputs ) )
{
output->expression.prepare( &expressionContext );
const QVariant res = output->expression.evaluate( &expressionContext );
results.insert( output->name, res );
if ( res.toBool() )
{
feedback->pushInfo( QObject::tr( "Condition %1 passed" ).arg( output->name ) );
}
else
{
feedback->pushInfo( QObject::tr( "Condition %1 failed" ).arg( output->name ) );
}
}
qDeleteAll( mOutputs );
mOutputs.clear();
return results;
}


///@endcond PRIVATE
76 changes: 76 additions & 0 deletions src/analysis/processing/qgsalgorithmconditionalbranch.h
@@ -0,0 +1,76 @@
/***************************************************************************
qgsalgorithmconditionalbranch.h
---------------------
begin : March 2020
copyright : (C) 2020 by Nyall Dawson
email : nyall dot dawson at gmail dot com
***************************************************************************/

/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef QGSALGORITHMCONDITIONALBRANCH_H
#define QGSALGORITHMCONDITIONALBRANCH_H

#define SIP_NO_FILE

#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

class QgsProcessingModelAlgorithm;
class QTableWidget;

///@cond PRIVATE

/**
* Feature filter algorithm for modeler.
* Accepts a list of expressions and names and creates outputs where
* matching features are sent to.
*
* \since QGIS 3.2
*/
class QgsConditionalBranchAlgorithm : public QgsProcessingAlgorithm
{
public:
QgsConditionalBranchAlgorithm() = default;
~QgsConditionalBranchAlgorithm() override;

void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
QString name() const override;
QString displayName() const override;
QStringList tags() const override;
QString group() const override;
QString groupId() const override;
Flags flags() const override;
QString shortHelpString() const override;
QString shortDescription() const override;
QgsConditionalBranchAlgorithm *createInstance() const override SIP_FACTORY;

protected:

QVariantMap processAlgorithm( const QVariantMap &parameters,
QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;

private:
struct Output
{
Output( const QString &name, const QString &expression )
: name( name )
, expression( expression )
{}
QString name;
QgsExpression expression;
};

QList<Output *> mOutputs;
};

///@endcond PRIVATE

#endif // QGSALGORITHMCONDITIONALBRANCH_H
2 changes: 2 additions & 0 deletions src/analysis/processing/qgsnativealgorithms.cpp
Expand Up @@ -32,6 +32,7 @@
#include "qgsalgorithmcategorizeusingstyle.h"
#include "qgsalgorithmcentroid.h"
#include "qgsalgorithmclip.h"
#include "qgsalgorithmconditionalbranch.h"
#include "qgsalgorithmconstantraster.h"
#include "qgsalgorithmconvexhull.h"
#include "qgsalgorithmdbscanclustering.h"
Expand Down Expand Up @@ -227,6 +228,7 @@ void QgsNativeAlgorithms::loadAlgorithms()
addAlgorithm( new QgsClipAlgorithm() );
addAlgorithm( new QgsCollectAlgorithm() );
addAlgorithm( new QgsCombineStylesAlgorithm() );
addAlgorithm( new QgsConditionalBranchAlgorithm() );
addAlgorithm( new QgsConstantRasterAlgorithm() );
addAlgorithm( new QgsConvexHullAlgorithm() );
addAlgorithm( new QgsDbscanClusteringAlgorithm() );
Expand Down
6 changes: 6 additions & 0 deletions src/core/processing/qgsprocessingoutputs.cpp
Expand Up @@ -84,3 +84,9 @@ QString QgsProcessingOutputMultipleLayers::type() const
{
return typeName();
}

QgsProcessingOutputConditionalBranch::QgsProcessingOutputConditionalBranch( const QString &name, const QString &description )
: QgsProcessingOutputDefinition( name, description )
{

}
26 changes: 26 additions & 0 deletions src/core/processing/qgsprocessingoutputs.h
Expand Up @@ -63,6 +63,8 @@ class CORE_EXPORT QgsProcessingOutputDefinition
sipType = sipType_QgsProcessingOutputFolder;
else if ( sipCpp->type() == QgsProcessingOutputFile::typeName() )
sipType = sipType_QgsProcessingOutputFile;
else if ( sipCpp->type() == QgsProcessingOutputConditionalBranch::typeName() )
sipType = sipType_QgsProcessingOutputConditionalBranch;
else
sipType = nullptr;
SIP_END
Expand Down Expand Up @@ -380,6 +382,30 @@ class CORE_EXPORT QgsProcessingOutputFile : public QgsProcessingOutputDefinition

};

/**
* \class QgsProcessingOutputConditionalBranch
* \ingroup core
* A conditional branch output for processing algorithms, which represents a possible model logic
* flow which branches out from this algorithm.
* \since QGIS 3.14
*/
class CORE_EXPORT QgsProcessingOutputConditionalBranch : public QgsProcessingOutputDefinition
{
public:

/**
* Constructor for QgsProcessingOutputConditionalBranch.
*/
QgsProcessingOutputConditionalBranch( const QString &name, const QString &description = QString() );

/**
* Returns the type name for the output class.
*/
static QString typeName() { return QStringLiteral( "outputBranch" ); }
QString type() const override { return typeName(); }

};


#endif // QGSPROCESSINGOUTPUTS_H

Expand Down

0 comments on commit 6a1b106

Please sign in to comment.