Skip to content
Permalink
Browse files

Merge pull request #4826 from nyalldawson/processing_cleanups

Some more cleanups and misc fixes to processing code
  • Loading branch information
nyalldawson committed Jul 8, 2017
2 parents e2c84f1 + fedf88e commit 40d833ff5feb990416a15f72cc911fd0ec3133db
Showing with 3,924 additions and 3,205 deletions.
  1. +1 −0 python/CMakeLists.txt
  2. +7 −1 python/core/core_auto.sip
  3. +379 −0 python/core/processing/models/qgsprocessingmodelalgorithm.sip
  4. +236 −0 python/core/processing/models/qgsprocessingmodelchildalgorithm.sip
  5. +192 −0 python/core/processing/models/qgsprocessingmodelchildparametersource.sip
  6. +85 −0 python/core/processing/models/qgsprocessingmodelcomponent.sip
  7. +92 −0 python/core/processing/models/qgsprocessingmodeloutput.sip
  8. +70 −0 python/core/processing/models/qgsprocessingmodelparameter.sip
  9. +51 −0 python/core/processing/qgsprocessing.sip
  10. +19 −3 python/core/processing/qgsprocessingalgorithm.sip
  11. +0 −955 python/core/processing/qgsprocessingmodelalgorithm.sip
  12. +4 −4 python/core/processing/qgsprocessingoutputs.sip
  13. +82 −69 python/core/processing/qgsprocessingparameters.sip
  14. +21 −0 python/core/processing/qgsprocessingutils.sip
  15. +3 −3 python/plugins/processing/algs/qgis/Aspect.py
  16. +2 −2 python/plugins/processing/algs/qgis/BarPlot.py
  17. +2 −2 python/plugins/processing/algs/qgis/BasicStatistics.py
  18. +2 −1 python/plugins/processing/algs/qgis/Boundary.py
  19. +2 −1 python/plugins/processing/algs/qgis/BoundingBox.py
  20. +4 −3 python/plugins/processing/algs/qgis/CheckValidity.py
  21. +4 −3 python/plugins/processing/algs/qgis/ConcaveHull.py
  22. +4 −3 python/plugins/processing/algs/qgis/Delaunay.py
  23. +4 −3 python/plugins/processing/algs/qgis/DeleteHoles.py
  24. +2 −1 python/plugins/processing/algs/qgis/DensifyGeometries.py
  25. +2 −1 python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
  26. +2 −1 python/plugins/processing/algs/qgis/DropGeometry.py
  27. +2 −1 python/plugins/processing/algs/qgis/ExtentFromLayer.py
  28. +2 −1 python/plugins/processing/algs/qgis/FixGeometry.py
  29. +2 −1 python/plugins/processing/algs/qgis/GridPolygon.py
  30. +2 −1 python/plugins/processing/algs/qgis/Merge.py
  31. +4 −3 python/plugins/processing/algs/qgis/PointsLayerFromTable.py
  32. +3 −2 python/plugins/processing/algs/qgis/RegularPoints.py
  33. +5 −4 python/plugins/processing/algs/qgis/SnapGeometries.py
  34. +3 −3 python/plugins/processing/algs/qgis/VectorSplit.py
  35. +4 −3 python/plugins/processing/algs/qgis/VoronoiPolygons.py
  36. +3 −2 python/plugins/processing/algs/qgis/ZonalStatistics.py
  37. +3 −3 python/plugins/processing/gui/AlgorithmDialog.py
  38. +2 −2 python/plugins/processing/gui/BatchAlgorithmDialog.py
  39. +4 −3 python/plugins/processing/gui/BatchInputSelectionPanel.py
  40. +2 −2 python/plugins/processing/gui/BatchOutputSelectionPanel.py
  41. +4 −4 python/plugins/processing/gui/DestinationSelectionPanel.py
  42. +8 −8 python/plugins/processing/gui/NumberInputPanel.py
  43. +8 −8 python/plugins/processing/gui/ParameterGuiUtils.py
  44. +3 −3 python/plugins/processing/gui/ParametersPanel.py
  45. +1 −1 python/plugins/processing/gui/ScriptEditorDialog.py
  46. +28 −24 python/plugins/processing/gui/wrappers.py
  47. +6 −4 python/plugins/processing/modeler/ModelerArrowItem.py
  48. +3 −2 python/plugins/processing/modeler/ModelerDialog.py
  49. +26 −23 python/plugins/processing/modeler/ModelerGraphicItem.py
  50. +16 −7 python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
  51. +38 −20 python/plugins/processing/modeler/ModelerParametersDialog.py
  52. +5 −5 python/plugins/processing/modeler/ModelerScene.py
  53. +6 −9 python/plugins/processing/tests/ModelerTest.py
  54. +1 −1 python/plugins/processing/tests/testdata/scripts/selectbyattribute.py
  55. +1 −1 python/plugins/processing/tests/testdata/scripts/selectbyexpression.py
  56. +3 −3 python/plugins/processing/tools/general.py
  57. +14 −2 src/core/CMakeLists.txt
  58. +90 −545 src/core/processing/{ → models}/qgsprocessingmodelalgorithm.cpp
  59. +405 −0 src/core/processing/models/qgsprocessingmodelalgorithm.h
  60. +181 −0 src/core/processing/models/qgsprocessingmodelchildalgorithm.cpp
  61. +254 −0 src/core/processing/models/qgsprocessingmodelchildalgorithm.h
  62. +149 −0 src/core/processing/models/qgsprocessingmodelchildparametersource.cpp
  63. +198 −0 src/core/processing/models/qgsprocessingmodelchildparametersource.h
  64. +62 −0 src/core/processing/models/qgsprocessingmodelcomponent.cpp
  65. +94 −0 src/core/processing/models/qgsprocessingmodelcomponent.h
  66. +47 −0 src/core/processing/models/qgsprocessingmodeloutput.cpp
  67. +98 −0 src/core/processing/models/qgsprocessingmodeloutput.h
  68. +44 −0 src/core/processing/models/qgsprocessingmodelparameter.cpp
  69. +77 −0 src/core/processing/models/qgsprocessingmodelparameter.h
  70. +8 −9 src/core/processing/qgsnativealgorithms.cpp
  71. +61 −0 src/core/processing/qgsprocessing.h
  72. +7 −2 src/core/processing/qgsprocessingalgorithm.cpp
  73. +19 −3 src/core/processing/qgsprocessingalgorithm.h
  74. +0 −977 src/core/processing/qgsprocessingmodelalgorithm.h
  75. +3 −3 src/core/processing/qgsprocessingoutputs.cpp
  76. +4 −4 src/core/processing/qgsprocessingoutputs.h
  77. +152 −108 src/core/processing/qgsprocessingparameters.cpp
  78. +87 −76 src/core/processing/qgsprocessingparameters.h
  79. +36 −0 src/core/processing/qgsprocessingutils.cpp
  80. +21 −0 src/core/processing/qgsprocessingutils.h
  81. +1 −0 tests/src/core/CMakeLists.txt
  82. +342 −266 tests/src/core/testqgsprocessing.cpp
@@ -117,6 +117,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/layout
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/processing
${CMAKE_SOURCE_DIR}/src/core/processing/models
${CMAKE_SOURCE_DIR}/src/core/providers
${CMAKE_SOURCE_DIR}/src/core/providers/memory
${CMAKE_SOURCE_DIR}/src/core/raster
@@ -161,12 +161,18 @@
%Include layout/qgslayoutsize.sip
%Include metadata/qgslayermetadata.sip
%Include metadata/qgslayermetadatavalidator.sip
%Include processing/qgsprocessing.sip
%Include processing/qgsprocessingalgorithm.sip
%Include processing/qgsprocessingcontext.sip
%Include processing/qgsprocessingmodelalgorithm.sip
%Include processing/qgsprocessingoutputs.sip
%Include processing/qgsprocessingparameters.sip
%Include processing/qgsprocessingutils.sip
%Include processing/models/qgsprocessingmodelalgorithm.sip
%Include processing/models/qgsprocessingmodelchildalgorithm.sip
%Include processing/models/qgsprocessingmodelchildparametersource.sip
%Include processing/models/qgsprocessingmodelcomponent.sip
%Include processing/models/qgsprocessingmodeloutput.sip
%Include processing/models/qgsprocessingmodelparameter.sip
%Include providers/memory/qgsmemoryproviderutils.sip
%Include raster/qgsbilinearrasterresampler.sip
%Include raster/qgsbrightnesscontrastfilter.sip

0 comments on commit 40d833f

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