Skip to content

Commit ae8e03e

Browse files
Giovanni Manghialexbruy
Giovanni Manghi
authored and
alexbruy
committedMar 8, 2016
processing fix SAGA 2.2.* grid_spline tools
1 parent f11c5b3 commit ae8e03e

13 files changed

+33
-20
lines changed
 

‎python/plugins/processing/algs/saga/description/2.2.0/B-SplineApproximation.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ ParameterNumber|LEVEL|Resolution|0.001|None|1.0
77
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
88
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
99
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
10-
OutputRaster|TARGET_OUT_GRID|Grid
10+
ParameterRaster|TARGET_TEMPLATE|Target system|True
11+
OutputRaster|TARGET_OUT_GRID|Gri

‎python/plugins/processing/algs/saga/description/2.2.0/CubicSplineApproximation.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ Hardcoded|-TARGET_DEFINITION 0
66
ParameterNumber|NPMIN|Minimal Number of Points|0|None|3
77
ParameterNumber|NPMAX|Maximal Number of Points|11|59|20
88
ParameterNumber|NPPC|Points per Square|1|None|5
9-
ParameterNumber|K|Tolerance|0|None|140.0
9+
ParameterNumber|K|Tolerance|0|None|140
1010
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1111
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1212
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
13+
ParameterRaster|TARGET_TEMPLATE|Target system|True
1314
OutputRaster|TARGET_OUT_GRID|Grid

‎python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation(fromGrid).txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ ParameterRaster|GRID|Grid|False
44
Hardcoded|-TARGET_DEFINITION 0
55
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
66
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
7-
ParameterNumber|LEVEL_MAX|Maximum Level|1|14|11.0
7+
ParameterNumber|LEVEL_MAX|Maximum Level|1|14|11
88
ParameterBoolean|UPDATE|Update View|False
99
ParameterSelection|DATATYPE|Data Type|[0] same as input grid;[1] floating point
1010
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1111
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1212
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
13+
ParameterRaster|TARGET_TEMPLATE|Target system|True
1314
OutputRaster|TARGET_OUT_GRID|Grid

‎python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
55
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
66
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
7+
ParameterNumber|LEVEL_MAX|Maximum level|1|14|11
78
ParameterBoolean|UPDATE|Update View|False
89
Hardcoded|-TARGET_DEFINITION 0
910
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1011
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1112
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
13+
ParameterRaster|TARGET_TEMPLATE|Target system|True
1214
OutputRaster|TARGET_OUT_GRID|Grid

‎python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(Global).txt renamed to ‎python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolationforCategories.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
Thin Plate Spline (Global)
1+
Multilevel B-Spline Interpolation for Categories
22
grid_spline
33
ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
55
Hardcoded|-TARGET_DEFINITION 0
6-
ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
76
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
87
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
98
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
10-
OutputRaster|TARGET_OUT_GRID|Grid
9+
ParameterRaster|TARGET_TEMPLATE|Target system|True
10+
OutputRaster|TARGET_CATEGORIES|Categories
11+
OutputRaster|TARGET_PROPABILITY|Propability

‎python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(TIN).txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ ParameterBoolean|FRAME|Add Frame|True
99
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1010
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1111
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
12+
ParameterRaster|TARGET_TEMPLATE|Target system|True
1213
OutputRaster|TARGET_OUT_GRID|Grid

‎python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline(Local).txt renamed to ‎python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Thin Plate Spline (Local)
1+
Thin Plate Spline
22
grid_spline
33
ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
@@ -7,9 +7,11 @@ ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
77
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
88
ParameterNumber|SEARCH_RADIUS|Search Radius|0.0|None|1000.0
99
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
10+
ParameterNumber|SEARCH_POINTS_MIN|Maximum Number of Points|1|None|16
1011
ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|1|None|20
1112
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
1213
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1314
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1415
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
15-
OutputRaster|TARGET_OUT_GRID|Grid
16+
ParameterRaster|TARGET_TEMPLATE|Target system|True
17+
OutputRaster|TARGET_OUT_GRID|Grid

‎python/plugins/processing/algs/saga/description/2.2.2/MultilevelB-SplineInterpolation.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
55
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
66
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
7-
ParameterBoolean|UPDATE|Update View|False
87
Hardcoded|-TARGET_DEFINITION 0
98
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
109
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0

‎python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline(Global).txt renamed to ‎python/plugins/processing/algs/saga/description/2.2.2/MultilevelB-SplineInterpolationforCategories.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
Thin Plate Spline (Global)
1+
Multilevel B-Spline Interpolation for Categories
22
grid_spline
33
ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
55
Hardcoded|-TARGET_DEFINITION 0
6-
ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
76
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
87
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
98
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
10-
OutputRaster|TARGET_OUT_GRID|Grid
9+
ParameterRaster|TARGET_TEMPLATE|Target system|True
10+
OutputRaster|TARGET_CATEGORIES|Categories
11+
OutputRaster|TARGET_PROPABILITY|Propability

‎python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(Local).txt renamed to ‎python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Thin Plate Spline (Local)
1+
Thin Plate Spline
22
grid_spline
33
ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
@@ -7,9 +7,11 @@ ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
77
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
88
ParameterNumber|SEARCH_RADIUS|Search Radius|0.0|None|1000.0
99
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
10+
ParameterNumber|SEARCH_POINTS_MIN|Maximum Number of Points|1|None|16
1011
ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|1|None|20
1112
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
1213
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1314
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1415
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
15-
OutputRaster|TARGET_OUT_GRID|Grid
16+
ParameterRaster|TARGET_TEMPLATE|Target system|True
17+
OutputRaster|TARGET_OUT_GRID|Grid

‎python/plugins/processing/algs/saga/description/2.2.3/MultilevelB-SplineInterpolation.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
55
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
66
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
7-
ParameterBoolean|UPDATE|Update View|False
87
Hardcoded|-TARGET_DEFINITION 0
98
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
109
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0

‎python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline(Global).txt renamed to ‎python/plugins/processing/algs/saga/description/2.2.3/MultilevelB-SplineInterpolationforCategories.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
Thin Plate Spline (Global)
1+
Multilevel B-Spline Interpolation for Categories
22
grid_spline
33
ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
55
Hardcoded|-TARGET_DEFINITION 0
6-
ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
76
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
87
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
98
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
10-
OutputRaster|TARGET_OUT_GRID|Grid
9+
ParameterRaster|TARGET_TEMPLATE|Target system|True
10+
OutputRaster|TARGET_CATEGORIES|Categories
11+
OutputRaster|TARGET_PROPABILITY|Propability

‎python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline(Local).txt renamed to ‎python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Thin Plate Spline (Local)
1+
Thin Plate Spline
22
grid_spline
33
ParameterVector|SHAPES|Points|0|False
44
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
@@ -7,9 +7,11 @@ ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
77
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
88
ParameterNumber|SEARCH_RADIUS|Search Radius|0.0|None|1000.0
99
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
10+
ParameterNumber|SEARCH_POINTS_MIN|Maximum Number of Points|1|None|16
1011
ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|1|None|20
1112
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
1213
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1314
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1415
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
15-
OutputRaster|TARGET_OUT_GRID|Grid
16+
ParameterRaster|TARGET_TEMPLATE|Target system|True
17+
OutputRaster|TARGET_OUT_GRID|Grid

0 commit comments

Comments
 (0)