Skip to content
Permalink
Browse files

Merge pull request #4780 from nyalldawson/more_processing

[processing] Finish modeler port, start script algorithms porting
  • Loading branch information
nyalldawson committed Jun 26, 2017
2 parents 8bfb695 + 7a6a6ff commit be29a955839ae07b52403a201107b7d240e90831
Showing with 2,087 additions and 728 deletions.
  1. +2 −3 python/core/processing/qgsprocessingalgorithm.sip
  2. +19 −0 python/core/processing/qgsprocessingmodelalgorithm.sip
  3. +175 −0 python/core/processing/qgsprocessingparameters.sip
  4. +2 −3 python/plugins/processing/algs/qgis/IdwInterpolation.py
  5. +1 −1 python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
  6. +2 −3 python/plugins/processing/algs/qgis/Relief.py
  7. +2 −3 python/plugins/processing/algs/qgis/TinInterpolation.py
  8. +28 −12 python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py
  9. +18 −13 python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
  10. +24 −13 python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py
  11. +40 −28 python/plugins/processing/core/outputs.py
  12. +9 −280 python/plugins/processing/core/parameters.py
  13. +48 −25 python/plugins/processing/gui/NumberInputPanel.py
  14. +1 −1 python/plugins/processing/gui/wrappers.py
  15. +0 −77 python/plugins/processing/modeler/ModelerAlgorithm.py
  16. +1 −1 python/plugins/processing/modeler/ModelerDialog.py
  17. +0 −3 python/plugins/processing/modeler/ModelerParametersDialog.py
  18. +75 −19 python/plugins/processing/script/ScriptAlgorithm.py
  19. +0 −209 python/plugins/processing/tests/ParametersTest.py
  20. +18 −19 src/core/processing/qgsnativealgorithms.cpp
  21. +1 −1 src/core/processing/qgsprocessingalgorithm.cpp
  22. +2 −3 src/core/processing/qgsprocessingalgorithm.h
  23. +133 −0 src/core/processing/qgsprocessingmodelalgorithm.cpp
  24. +18 −0 src/core/processing/qgsprocessingmodelalgorithm.h
  25. +597 −0 src/core/processing/qgsprocessingparameters.cpp
  26. +145 −1 src/core/processing/qgsprocessingparameters.h
  27. +726 −10 tests/src/core/testqgsprocessing.cpp
@@ -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.

@@ -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 *
* *

0 comments on commit be29a95

Please sign in to comment.
You can’t perform that action at this time.