Skip to content

Commit 29b080f

Browse files
m-kuhnm-kuhn
authoredApr 11, 2018
Merge pull request #6754 from m-kuhn/processing_filter_algorithm
 [FEATURE] Feature filter algorithm for processing models
·
ltr-3_40final-3_2_0
2 parents 9dc3ee4 + fbb4ef5 commit 29b080f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1343
-40
lines changed
 

‎python/core/processing/qgsprocessingalgorithm.sip.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@
1010

1111

1212

13-
1413
%ModuleHeaderCode
1514
#include <qgsprocessingmodelalgorithm.h>
1615
%End
1716

18-
1917
class QgsProcessingAlgorithm
2018
{
2119
%Docstring
@@ -276,7 +274,7 @@ Returns true if this algorithm generates HTML outputs.
276274
%End
277275

278276
QVariantMap run( const QVariantMap &parameters,
279-
QgsProcessingContext &context, QgsProcessingFeedback *feedback, bool *ok /Out/ = 0 ) const;
277+
QgsProcessingContext &context, QgsProcessingFeedback *feedback, bool *ok /Out/ = 0, const QVariantMap &configuration = QVariantMap() ) const;
280278
%Docstring
281279
Executes the algorithm using the specified ``parameters``. This method internally
282280
creates a copy of the algorithm before running it, so it is safe to call

‎python/core/processing/qgsprocessingparameters.sip.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ their acceptable ranges, defaults, etc.
168168
FlagAdvanced,
169169
FlagHidden,
170170
FlagOptional,
171+
FlagIsModelOutput,
171172
};
172173
typedef QFlags<QgsProcessingParameterDefinition::Flag> Flags;
173174

0 commit comments

Comments
 (0)
Please sign in to comment.