Merge pull request #1984 from NaturalGIS/fix_saga_interpolations

pcav · pcav · commit b83eb9f51cf7 · 2015-04-09T13:58:49.000+02:00
fix saga interpolations modules
diff --git a/python/plugins/processing/algs/saga/description/2.1.3/InverseDistanceWeighted.txt b/python/plugins/processing/algs/saga/description/2.1.3/InverseDistanceWeighted.txt
@@ -2,15 +2,15 @@ Inverse Distance Weighted
 grid_gridding
 ParameterVector|SHAPES|Points|0|False
 ParameterTableField|FIELD|Attribute|SHAPES|-1|False
-Hardcoded|-TARGET_DEFINITION 0
+ParameterRaster|TARGET_TEMPLATE|Target System|True
 ParameterSelection|WEIGHTING|Distance Weighting|[0] inverse distance to a power;[1] linearly decreasing within search radius;[2] exponential weighting scheme;[3] gaussian weighting scheme
 ParameterNumber|WEIGHT_POWER|Inverse Distance Power|0.0|None|2
 ParameterNumber|WEIGHT_BANDWIDTH|Exponential and Gaussian Weighting Bandwidth|0.0|None|1
 ParameterSelection|SEARCH_RANGE|Search Range|[0] search radius (local);[1] no search radius (global)
 ParameterNumber|SEARCH_RADIUS|Search Radius|None|None|100.0
 ParameterSelection|SEARCH_DIRECTION|Search Mode|[0] all directions;[1] quadrants
-ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points
-ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|None|None|10
 Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
-OutputRaster|USER_GRID|Grid
+ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
+ParameterSelection|TARGET_DEFINITION|Target Grid System|[0] user defined;[1] grid or grid system
+ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
+OutputRaster|TARGET_OUT_GRID|Grid
diff --git a/python/plugins/processing/algs/saga/description/2.1.3/MultilevelB-SplineInterpolation.txt b/python/plugins/processing/algs/saga/description/2.1.3/MultilevelB-SplineInterpolation.txt
@@ -2,10 +2,12 @@ Multilevel B-Spline Interpolation
 grid_spline
 ParameterVector|SHAPES|Points|0|False
 ParameterTableField|FIELD|Attribute|SHAPES|-1|False
-Hardcoded|-TARGET_DEFINITION 0
+ParameterRaster|TARGET_TEMPLATE|Target System|True
 ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
 ParameterNumber|EPSILON|Threshold Error|None|None|0.0001
-ParameterNumber|LEVEL_MAX|Maximum Level|None|None|11.0
+ParameterBoolean|UPDATE|Update View|False
 Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
 ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
-OutputRaster|TARGET_OUT_GRID|Grid
+ParameterSelection|TARGET_DEFINITION|Target Grid System|[0] user defined;[1] grid or grid system
+ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
+OutputRaster|TARGET_OUT_GRID|Grid
diff --git a/python/plugins/processing/algs/saga/description/2.1.3/StatisticsforGrids.txt b/python/plugins/processing/algs/saga/description/2.1.3/StatisticsforGrids.txt
@@ -1,10 +1,14 @@
 Statistics for Grids
 statistics_grid
 ParameterMultipleInput|GRIDS|Grids|3|False
+ParameterNumber|PCTL_VAL|Percentile|0.0|100.0|50.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|MIN|Minimum
 OutputRaster|MAX|Maximum
 OutputRaster|VAR|Variance
+OutputRaster|SUM|Sum
+OutputRaster|RANGE|Range
+OutputRaster|PCTL|Percentile
 OutputRaster|STDDEV|Standard Deviation
 OutputRaster|STDDEVLO|Mean less Standard Deviation
-OutputRaster|STDDEVHI|Mean plus Standard Deviation
+OutputRaster|STDDEVHI|Mean plus Standard Deviation
