Skip to content

Commit

Permalink
processing fix SAGA 2.2.* grid_spline tools
Browse files Browse the repository at this point in the history
  • Loading branch information
Giovanni Manghi committed Mar 7, 2016
1 parent 42d8884 commit 35c81b4
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 20 deletions.
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/saga/description/2.2.0/B-SplineApproximation.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ ParameterNumber|LEVEL|Resolution|0.001|None|1.0
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Gri
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/saga/description/2.2.0/CubicSplineApproximation.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ Hardcoded|-TARGET_DEFINITION 0
ParameterNumber|NPMIN|Minimal Number of Points|0|None|3
ParameterNumber|NPMAX|Maximal Number of Points|11|59|20
ParameterNumber|NPPC|Points per Square|1|None|5
ParameterNumber|K|Tolerance|0|None|140.0
ParameterNumber|K|Tolerance|0|None|140
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid
3 changes: 2 additions & 1 deletion ...gins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation(fromGrid).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ ParameterRaster|GRID|Grid|False
Hardcoded|-TARGET_DEFINITION 0
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
ParameterNumber|LEVEL_MAX|Maximum Level|1|14|11.0
ParameterNumber|LEVEL_MAX|Maximum Level|1|14|11
ParameterBoolean|UPDATE|Update View|False
ParameterSelection|DATATYPE|Data Type|[0] same as input grid;[1] floating point
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid
2 changes: 2 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
ParameterNumber|LEVEL_MAX|Maximum level|1|14|11
ParameterBoolean|UPDATE|Update View|False
Hardcoded|-TARGET_DEFINITION 0
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid
7 changes: 4 additions & 3 deletions ...ription/2.2.0/ThinPlateSpline(Global).txt → ...velB-SplineInterpolationforCategories.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Thin Plate Spline (Global)
Multilevel B-Spline Interpolation for Categories
grid_spline
ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
Hardcoded|-TARGET_DEFINITION 0
ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_CATEGORIES|Categories
OutputRaster|TARGET_PROPABILITY|Propability
1 change: 1 addition & 0 deletions python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(TIN).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ ParameterBoolean|FRAME|Add Frame|True
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid
6 changes: 4 additions & 2 deletions ...cription/2.2.3/ThinPlateSpline(Local).txt → ...aga/description/2.2.0/ThinPlateSpline.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thin Plate Spline (Local)
Thin Plate Spline
grid_spline
ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
Expand All @@ -7,9 +7,11 @@ ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
ParameterNumber|SEARCH_RADIUS|Search Radius|0.0|None|1000.0
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
ParameterNumber|SEARCH_POINTS_MIN|Maximum Number of Points|1|None|16
ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|1|None|20
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid
1 change: 0 additions & 1 deletion python/plugins/processing/algs/saga/description/2.2.2/MultilevelB-SplineInterpolation.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
ParameterBoolean|UPDATE|Update View|False
Hardcoded|-TARGET_DEFINITION 0
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
Expand Down
7 changes: 4 additions & 3 deletions ...ription/2.2.3/ThinPlateSpline(Global).txt → ...velB-SplineInterpolationforCategories.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Thin Plate Spline (Global)
Multilevel B-Spline Interpolation for Categories
grid_spline
ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
Hardcoded|-TARGET_DEFINITION 0
ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_CATEGORIES|Categories
OutputRaster|TARGET_PROPABILITY|Propability
6 changes: 4 additions & 2 deletions ...cription/2.2.0/ThinPlateSpline(Local).txt → ...aga/description/2.2.2/ThinPlateSpline.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thin Plate Spline (Local)
Thin Plate Spline
grid_spline
ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
Expand All @@ -7,9 +7,11 @@ ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
ParameterNumber|SEARCH_RADIUS|Search Radius|0.0|None|1000.0
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
ParameterNumber|SEARCH_POINTS_MIN|Maximum Number of Points|1|None|16
ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|1|None|20
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid
1 change: 0 additions & 1 deletion python/plugins/processing/algs/saga/description/2.2.3/MultilevelB-SplineInterpolation.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement
ParameterNumber|EPSILON|Threshold Error|0|None|0.0001
ParameterBoolean|UPDATE|Update View|False
Hardcoded|-TARGET_DEFINITION 0
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
Expand Down
7 changes: 4 additions & 3 deletions ...ription/2.2.2/ThinPlateSpline(Global).txt → ...velB-SplineInterpolationforCategories.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Thin Plate Spline (Global)
Multilevel B-Spline Interpolation for Categories
grid_spline
ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
Hardcoded|-TARGET_DEFINITION 0
ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_CATEGORIES|Categories
OutputRaster|TARGET_PROPABILITY|Propability
6 changes: 4 additions & 2 deletions ...cription/2.2.2/ThinPlateSpline(Local).txt → ...aga/description/2.2.3/ThinPlateSpline.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thin Plate Spline (Local)
Thin Plate Spline
grid_spline
ParameterVector|SHAPES|Points|0|False
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
Expand All @@ -7,9 +7,11 @@ ParameterNumber|REGULARISATION|Regularisation|0.0000|None|0.0001
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
ParameterNumber|SEARCH_RADIUS|Search Radius|0.0|None|1000.0
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
ParameterNumber|SEARCH_POINTS_MIN|Maximum Number of Points|1|None|16
ParameterNumber|SEARCH_POINTS_MAX|Maximum Number of Points|1|None|20
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
OutputRaster|TARGET_OUT_GRID|Grid
ParameterRaster|TARGET_TEMPLATE|Target system|True
OutputRaster|TARGET_OUT_GRID|Grid

0 comments on commit 35c81b4

Please sign in to comment.