Merge pull request #5264 from NaturalGIS/fix_saga_several_tools

[procesing] fix few SAGA modules
qgis · Sep 28, 2017 · 7de9078 · 7de9078
2 parents 5e101aa + eb9f44d
commit 7de9078
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 35 deletions.
diff --git a/python/plugins/processing/algs/saga/SagaNameDecorator.py b/python/plugins/processing/algs/saga/SagaNameDecorator.py
@@ -155,7 +155,7 @@ def decoratedGroupName(name):
               'Threshold Buffer': 'Threshold raster buffer',
               'Transform Shapes': 'Transform vector layer',
               'Transpose Grids': 'Transpose Raster layers',
-              'Union': 'Polygon uUnion',
+              'Union': 'Polygon Union',
               'Update': 'Polygon update',
               'Upslope Area': 'Upslope Area',
               'Zonal Grid Statistics': 'Zonal raster statistics'}

diff --git a/python/plugins/processing/algs/saga/description/AddGridValuestoPoints.txt b/python/plugins/processing/algs/saga/description/AddGridValuestoPoints.txt
@@ -2,6 +2,6 @@ Add Grid Values to Points
 shapes_grid
 ParameterVector|SHAPES|Points|0|False
 ParameterMultipleInput|GRIDS|Grids|3|False
-ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
 OutputVector|RESULT|Result
 AllowUnmatching
diff --git a/python/plugins/processing/algs/saga/description/AddGridValuestoShapes.txt b/python/plugins/processing/algs/saga/description/AddGridValuestoShapes.txt
@@ -2,6 +2,6 @@ Add Grid Values to Shapes
 shapes_grid
 ParameterVector|SHAPES|Shapes|-1|False
 ParameterMultipleInput|GRIDS|Grids|3|False
-ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
 OutputVector|RESULT|Result
 AllowUnmatching
diff --git a/python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(GridGrids).txt b/python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(GridGrids).txt
@@ -1,15 +1,16 @@
-Multiple Regression Analysis (Grid/Grids)
+Multiple Regression Analysis (Grid and Predictor Grids)
 statistics_regression
 ParameterRaster|DEPENDENT|Dependent|False
-ParameterMultipleInput|GRIDS|Grids|3|False
-ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
-ParameterBoolean|COORD_X         |Include X Coordinate|True
-ParameterBoolean|COORD_Y         |Include Y Coordinate|True
+ParameterMultipleInput|PREDICTORS|Predictors|3|False
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterBoolean|COORD_X|Include X Coordinate|True
+ParameterBoolean|COORD_Y|Include Y Coordinate|True
 ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise
-ParameterNumber|P_IN|P in|None|None|5
-ParameterNumber|P_OUT|P out|None|None|5
+ParameterNumber|P_VALUE|Significance Level|0.0|100.0|5.0
+ParameterSelection|CROSSVAL|Cross Validation|[0] None;[1] leave one out;[2] 2-fold;[3] k-fold
+ParameterNumber|CROSSVAL_K|Cross Validation Subsamples|2|None|10
 OutputRaster|REGRESSION|Regression
 OutputRaster|RESIDUALS|Residuals
 OutputTable|INFO_COEFF|Details: Coefficients
 OutputTable|INFO_MODEL|Details: Model
-OutputTable|INFO_STEPS|Details: Steps
+OutputTable|INFO_STEPS|Details: Steps
diff --git a/python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(PointsGrids).txt b/python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(PointsGrids).txt
@@ -1,16 +1,20 @@
-Multiple Regression Analysis (Points/Grids)
+Multiple Regression Analysis (Points and Predictor Grids)
 statistics_regression
-ParameterMultipleInput|GRIDS|Grids|3|False
-ParameterVector|SHAPES|Shapes|-1|False
-ParameterTableField|ATTRIBUTE|Attribute|SHAPES|-1|False
-ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
-ParameterBoolean|COORD_X         |Include X Coordinate|True
-ParameterBoolean|COORD_Y         |Include Y Coordinate|True
+ParameterMultipleInput|PREDICTORS|Predictors|3|False
+ParameterVector|POINTS|Shapes|-1|False
+ParameterTableField|ATTRIBUTE|Attribute|POINTS|-1|False
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterBoolean|COORD_X|Include X Coordinate|True
+ParameterBoolean|COORD_Y|Include Y Coordinate|True
+ParameterBoolean|INTERCEPT|Intercept|True
 ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise
-ParameterNumber|P_IN|P in|None|None|5
-ParameterNumber|P_OUT|P out|None|None|5
+ParameterNumber|P_VALUE|Significance Level|0.0|100.0|5.0
+ParameterSelection|CROSSVAL|Cross Validation|[0] None;[1] leave one out;[2] 2-fold;[3] k-fold
+ParameterNumber|CROSSVAL_K|Cross Validation Subsamples|2|None|10
+ParameterSelection|RESIDUAL_COR|Residual Interpolation|[0] Multleve B-Spline Interpolation;[1] Inverse Distance Weighted
 OutputTable|INFO_COEFF|Details: Coefficients
 OutputTable|INFO_MODEL|Details: Model
 OutputTable|INFO_STEPS|Details: Steps
 OutputVector|RESIDUALS|Residuals
 OutputRaster|REGRESSION|Regression
+OutputRaster|REGRESCORR|Regression with Residual Correction
diff --git a/python/plugins/processing/algs/saga/description/OrdinaryKriging(Global).txt b/python/plugins/processing/algs/saga/description/OrdinaryKriging(Global).txt
@@ -23,5 +23,5 @@ ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
 ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
 ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
 ParameterMultipleInput|PREDICTORS|Predictors|3|True
-ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
-ParameterBoolean|COORDS|Coordinates|False
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterBoolean|COORDS|Coordinates|False
diff --git a/python/plugins/processing/algs/saga/description/Patching.txt b/python/plugins/processing/algs/saga/description/Patching.txt
@@ -2,5 +2,5 @@ Patching
 grid_tools
 ParameterRaster|ORIGINAL|Grid|False
 ParameterRaster|ADDITIONAL|Patch Grid|False
-ParameterSelection|INTERPOLATION|Interpolation Method|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
-OutputRaster|COMPLETED|Completed Grid
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+OutputRaster|COMPLETED|Completed Grid
diff --git a/python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsGrid).txt b/python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsGrid).txt
@@ -1,9 +1,9 @@
-Regression analysis|Regression Analysis (Points/Grid)
+Regression Analysis (Points and Predictor Grid)
 statistics_regression
-ParameterRaster|GRID|Grid|False
-ParameterVector|SHAPES|Shapes|-1|False
-ParameterTableField|ATTRIBUTE|Attribute|SHAPES|-1|False
-ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterRaster|PREDICTOR|Predictor|False
+ParameterVector|POINTS|Shapes|-1|False
+ParameterTableField|ATTRIBUTE|Attribute|POINTS|-1|False
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
 ParameterSelection|METHOD|Regression Function|[0] Y = a + b * X (linear);[1] Y = a + b / X;[2] Y = a / (b - X);[3] Y = a * X^b (power);[4] Y = a e^(b * X) (exponential);[5] Y = a + b * ln(X) (logarithmic)
 OutputRaster|REGRESSION|Regression
-OutputVector|RESIDUAL|Residuals
+OutputVector|RESIDUAL|Residuals
diff --git a/python/plugins/processing/algs/saga/description/UniversalKriging(Global).txt b/python/plugins/processing/algs/saga/description/UniversalKriging(Global).txt
@@ -23,7 +23,7 @@ ParameterBoolean|COORD_Y|Include Y Coordinate|False
 ParameterBoolean|INTERCEPT|Intercept|True
 ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise|3
 ParameterNumber|P_VALUE|Significance Level|0|100.0|5.0
-ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
+ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
 ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
 ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
 ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance

diff --git a/...essing/algs/saga/description/ZonalMultipleRegressionAnalysis(PointsandPredictorGrids).txt b/...essing/algs/saga/description/ZonalMultipleRegressionAnalysis(PointsandPredictorGrids).txt
@@ -3,12 +3,12 @@ statistics_regression
 ParameterMultipleInput|PREDICTORS|Predictors|3|False
 ParameterVector|ZONES|Zones|-1|False
 ParameterVector|POINTS|Points|-1|False
-ParameterTable|ATTRIBUTE|Dependent Variable|False
-OutputVector|RESIDUALS|Residuals
-OutputRaster|REGRESSION|Regression
+ParameterTableField|ATTRIBUTE|Dependent Variable|POINTS|-1|False
 ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbour;[1] Bilinear Interpolation;[2] Bicubic Spline Interpolation;[3] B-Spline Interpolation| 3
 ParameterBoolean|COORD_X|Include X Coordinate|False
 ParameterBoolean|COORD_Y|Include Y Coordinate|False
 ParameterBoolean|INTERCEPT|Intercept|True
 ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise| 3
-ParameterNumber|P_VALUE|Significance Level| 0.000000| 100.000000| 5.000000
+ParameterNumber|P_VALUE|Significance Level| 0.000000| 100.000000| 5.000000
+OutputVector|RESIDUALS|Residuals
+OutputRaster|REGRESSION|Regression