Merge pull request #4780 from nyalldawson/more_processing

[processing] Finish modeler port, start script algorithms porting
qgis · Jun 26, 2017 · be29a95 · be29a95
2 parents 8bfb695 + 7a6a6ff
commit be29a95
Show file tree

Hide file tree

Showing 27 changed files with 2,087 additions and 728 deletions.
diff --git a/python/core/processing/qgsprocessingalgorithm.sip b/python/core/processing/qgsprocessingalgorithm.sip
@@ -357,9 +357,8 @@ class QgsProcessingAlgorithm
  :rtype: bool
 %End
 
-    QgsFeatureSink *parameterAsSink( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context,
-                                     const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs,
-                                     QString &destinationIdentifier /Out/ ) const /Factory/;
+    QgsFeatureSink *parameterAsSink( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context, QString &destinationIdentifier /Out/,
+                                     const QgsFields &fields, QgsWkbTypes::Type geometryType = QgsWkbTypes::NoGeometry, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() ) const /Factory/;
 %Docstring
  Evaluates the parameter with matching ``name`` to a feature sink.
 

diff --git a/python/core/processing/qgsprocessingmodelalgorithm.sip b/python/core/processing/qgsprocessingmodelalgorithm.sip
@@ -153,6 +153,12 @@ class QgsProcessingModelAlgorithm : QgsProcessingAlgorithm
  :rtype: bool
 %End
 
+        QString asPythonCode() const;
+%Docstring
+ Attempts to convert the source to executable Python code.
+ :rtype: str
+%End
+
     };
 
     class Component
@@ -549,6 +555,12 @@ Copies are protected to avoid slicing
  :rtype: bool
 %End
 
+        QString asPythonCode() const;
+%Docstring
+ Attempts to convert the child to executable Python code.
+ :rtype: str
+%End
+
     };
 
     QgsProcessingModelAlgorithm( const QString &name = QString(), const QString &group = QString() );
@@ -802,6 +814,12 @@ Copies are protected to avoid slicing
 .. seealso:: sourceFilePath()
 %End
 
+    QString asPythonCode() const;
+%Docstring
+ Attempts to convert the model to executable Python code.
+ :rtype: str
+%End
+
   protected:
 
      virtual QVariantMap processAlgorithm( const QVariantMap &parameters,
@@ -811,6 +829,7 @@ Copies are protected to avoid slicing
 
 
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *