Did some more work on GRASS descriptions

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@61 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 3, 2012 · 0aff3b4bc20d938397ef98e233461d7691fe0404 · 0aff3b4
1 parent 5a44ffc
commit 0aff3b4bc20d938397ef98e233461d7691fe0404
Show file tree

Hide file tree

Showing 42 changed files with 37 additions and 234 deletions.
diff --git a/src/sextante/grass/description/alg_101.txt b/src/sextante/grass/description/alg_101.txt
diff --git a/src/sextante/grass/description/alg_102.txt b/src/sextante/grass/description/alg_102.txt
@@ -1,6 +1,6 @@
 v.voronoi
 Vector (v.*)
-ParameterVector|input|input|-1|False
+ParameterVector|input|input|0|False
 ParameterBoolean|-l|-l|True
 ParameterBoolean|-t|-t|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_103.txt b/src/sextante/grass/description/alg_103.txt
diff --git a/src/sextante/grass/description/alg_104.txt b/src/sextante/grass/description/alg_104.txt
diff --git a/src/sextante/grass/description/alg_105.txt b/src/sextante/grass/description/alg_105.txt
@@ -2,9 +2,6 @@ r.random
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterRaster|cover|cover|False
-ParameterString|n|n|
-ParameterBoolean|-z|-z|True
-ParameterBoolean|-i|-i|True
-ParameterBoolean|-d|-d|True
+ParameterNumber|n|n|None|None|10
 OutputRaster|raster_output|raster_output
 OutputVector|vector_output|vector_output
diff --git a/src/sextante/grass/description/alg_106.txt b/src/sextante/grass/description/alg_106.txt
@@ -1,6 +1,5 @@
 r.transect
 Raster (r.*)
 ParameterRaster|map|map|False
-ParameterString|line|line|
-ParameterString|null|null|*
-ParameterBoolean|-g|-g|True
+ParameterString|line|line|0,0,0,100
+ParameterNumber|width|width|None|None|1
diff --git a/src/sextante/grass/description/alg_107.txt b/src/sextante/grass/description/alg_107.txt
@@ -3,5 +3,4 @@ Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|pattern|pattern|
 ParameterString|patval|patval|
-ParameterBoolean|-q|-q|True
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_108.txt b/src/sextante/grass/description/alg_108.txt
diff --git a/src/sextante/grass/description/alg_109.txt b/src/sextante/grass/description/alg_109.txt
@@ -1,6 +1,5 @@
 r.univar
 Raster (r.*)
-ParameterMultipleInput|map|map|1.0|False
-ParameterString|percentile|percentile|90
-ParameterBoolean|-g|-g|True
+ParameterMultipleInput|map|map|3|False
+ParameterNumber|percentile|percentile|0|100|90
 ParameterBoolean|-e|-e|True
diff --git a/src/sextante/grass/description/alg_111.txt b/src/sextante/grass/description/alg_111.txt
@@ -1,11 +1,8 @@
 v.to.points
 Vector (v.*)
 ParameterVector|input|input|-1|False
-ParameterString|type|type|point,line,boundary,centroid
-ParameterString|llayer|llayer|1
 ParameterString|dmax|dmax|100
 ParameterBoolean|-n|-n|True
 ParameterBoolean|-v|-v|True
 ParameterBoolean|-i|-i|True
-ParameterBoolean|-t|-t|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_113.txt b/src/sextante/grass/description/alg_113.txt
@@ -1,9 +1,8 @@
 v.class
 Vector (v.*)
 ParameterVector|map|map|-1|False
-ParameterString|layer|layer|1
-ParameterString|column|column|
+ParameterTableField|column|column|map
 ParameterString|where|where|
 ParameterSelection|algorithm|algorithm|int;std;qua;equ;dis
-ParameterString|nbclasses|nbclasses|
+ParameterNumber|nbclasses|nbclasses|2|None|3
 ParameterBoolean|-g|-g|True
diff --git a/src/sextante/grass/description/alg_114.txt b/src/sextante/grass/description/alg_114.txt
diff --git a/src/sextante/grass/description/alg_115.txt b/src/sextante/grass/description/alg_115.txt
@@ -1,7 +1,6 @@
 r.quantile
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterString|quantiles|quantiles|4
+ParameterNumber|quantiles|quantiles|2|None|4
 ParameterString|percentiles|percentiles|
-ParameterString|bins|bins|1000000
 ParameterBoolean|-r|-r|True
diff --git a/src/sextante/grass/description/alg_116.txt b/src/sextante/grass/description/alg_116.txt
@@ -1,6 +1,6 @@
 v.lidar.edgedetection
 Vector (v.*)
-ParameterVector|input|input|-1|False
+ParameterVector|input|input|0|False
 ParameterString|see|see|4
 ParameterString|sen|sen|4
 ParameterString|lambda_g|lambda_g|0.01

diff --git a/src/sextante/grass/description/alg_117.txt b/src/sextante/grass/description/alg_117.txt
@@ -2,5 +2,4 @@ r.reclass
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|rules|rules|/file
-ParameterString|title|title|
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_118.txt b/src/sextante/grass/description/alg_118.txt
@@ -2,5 +2,4 @@ r.surf.contour
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterBoolean|-f|-f|True
-ParameterBoolean|-s|-s|True
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_120.txt b/src/sextante/grass/description/alg_120.txt
@@ -1,8 +1,6 @@
 v.qcount
 Vector (v.*)
-ParameterVector|input|input|-1|False
-ParameterNumber|n|n|None|None|0.0
-ParameterNumber|r|r|None|None|0.0
-ParameterBoolean|-g|-g|True
-ParameterBoolean|-q|-q|True
+ParameterVector|input|input|0|False
+ParameterNumber|n|n|0|None|4
+ParameterNumber|r|r|0|None|10
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_121.txt b/src/sextante/grass/description/alg_121.txt
@@ -1,5 +1,4 @@
 r.resample
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterBoolean|-q|-q|True
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_122.txt b/src/sextante/grass/description/alg_122.txt
@@ -1,5 +1,5 @@
 r.covar
 Raster (r.*)
-ParameterMultipleInput|map|map|1.0|False
+ParameterMultipleInput|map|map|3|False
 ParameterBoolean|-r|-r|True
-ParameterBoolean|-q|-q|True
+
diff --git a/src/sextante/grass/description/alg_123.txt b/src/sextante/grass/description/alg_123.txt
@@ -5,11 +5,9 @@ ParameterRaster|depression|depression|False
 ParameterRaster|flow|flow|False
 ParameterRaster|disturbed.land|disturbed.land|False
 ParameterRaster|blocking|blocking|False
-ParameterString|threshold|threshold|
-ParameterString|max.slope.length|max.slope.length|
-ParameterString|memory|memory|300
+ParameterNumber|threshold|threshold|0
+ParameterNumber|max.slope.length|max.slope.length|0
 ParameterBoolean|-4|-4|True
-ParameterBoolean|-m|-m|True
 OutputRaster|accumulation|accumulation
 OutputRaster|drainage|drainage
 OutputRaster|basin|basin

diff --git a/src/sextante/grass/description/alg_124.txt b/src/sextante/grass/description/alg_124.txt
@@ -1,16 +1,10 @@
 v.distance
 Vector (v.*)
-ParameterVector|from|from|-1|False
+ParameterVector|from|from|0|False
 ParameterVector|to|to|-1|False
-ParameterString|from_type|from_type|point
-ParameterString|to_type|to_type|point,line,area
-ParameterString|from_layer|from_layer|1
-ParameterString|to_layer|to_layer|1
-ParameterString|dmax|dmax|-1
-ParameterString|dmin|dmin|-1
 ParameterString|upload|upload|
-ParameterString|column|column|
-ParameterString|to_column|to_column|
+ParameterString|column|column|col_name
+ParameterString|to_column|to_column|to_col_name
 ParameterBoolean|-p|-p|True
 ParameterBoolean|-a|-a|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_125.txt b/src/sextante/grass/description/alg_125.txt
@@ -1,7 +1,6 @@
 v.info
 Vector (v.*)
 ParameterVector|map|map|-1|False
-ParameterString|layer|layer|1
 ParameterBoolean|-h|-h|True
 ParameterBoolean|-c|-c|True
 ParameterBoolean|-g|-g|True

diff --git a/src/sextante/grass/description/alg_126.txt b/src/sextante/grass/description/alg_126.txt
@@ -1,6 +1,5 @@
 v.hull
 Vector (v.*)
-ParameterVector|input|input|-1|False
+ParameterVector|input|input|0|False
 ParameterBoolean|-a|-a|True
-ParameterBoolean|-f|-f|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_127.txt b/src/sextante/grass/description/alg_127.txt
@@ -1,6 +1,6 @@
 v.patch
 Vector (v.*)
-ParameterMultipleInput|input|input|5.0|False
+ParameterMultipleInput|input|input|-1|False
 ParameterBoolean|-a|-a|True
 ParameterBoolean|-e|-e|True
 OutputVector|output|output

diff --git a/src/sextante/grass/description/alg_128.txt b/src/sextante/grass/description/alg_128.txt
diff --git a/src/sextante/grass/description/alg_129.txt b/src/sextante/grass/description/alg_129.txt
@@ -1,11 +1,9 @@
 v.drape
 Vector (v.*)
 ParameterVector|input|input|-1|False
-ParameterString|type|type|point,centroid,line,boundary,face,kernel
 ParameterRaster|rast|rast|False
 ParameterSelection|method|method|nearest;bilinear;cubic
 ParameterString|scale|scale|1.0
 ParameterString|where|where|
-ParameterString|layer|layer|1
 ParameterString|null_value|null_value|
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_130.txt b/src/sextante/grass/description/alg_130.txt
@@ -1,8 +1,6 @@
 r.rescale
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterString|from|from|
-ParameterString|to|to|
-ParameterString|title|title|
-ParameterBoolean|-q|-q|True
+ParameterString|from|from|0,100
+ParameterString|to|to|0,1
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_131.txt b/src/sextante/grass/description/alg_131.txt
@@ -1,12 +1,5 @@
 v.select
 Vector (v.*)
 ParameterVector|ainput|ainput|-1|False
-ParameterString|atype|atype|point,line,boundary,centroid,area
-ParameterString|alayer|alayer|1
 ParameterVector|binput|binput|-1|False
-ParameterString|btype|btype|point,line,boundary,centroid,area
-ParameterString|blayer|blayer|1
-ParameterSelection|operator|operator|overlap
-ParameterBoolean|-t|-t|True
-ParameterBoolean|-r|-r|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_133.txt b/src/sextante/grass/description/alg_133.txt
@@ -1,6 +1,6 @@
 r.stats
 Raster (r.*)
-ParameterMultipleInput|input|input|1.0|False
+ParameterMultipleInput|input|input|3|False
 ParameterString|output|output|/file
 ParameterString|fs|fs|space
 ParameterString|nv|nv|*

diff --git a/src/sextante/grass/description/alg_134.txt b/src/sextante/grass/description/alg_134.txt
@@ -1,9 +1,8 @@
 v.rast.stats
 Vector (v.*)
 ParameterVector|vector|vector|-1|False
-ParameterString|layer|layer|1
 ParameterRaster|raster|raster|False
 ParameterString|colprefix|colprefix|
-ParameterString|percentile|percentile|90
+ParameterNumber|percentile|percentile|0|100|90
 ParameterBoolean|-c|-c|True
 ParameterBoolean|-e|-e|True
diff --git a/src/sextante/grass/description/alg_136.txt b/src/sextante/grass/description/alg_136.txt
@@ -1,11 +1,10 @@
 v.outlier
 Vector (v.*)
 ParameterVector|input|input|-1|False
-ParameterString|soe|soe|10
-ParameterString|son|son|10
-ParameterString|lambda_i|lambda_i|0.1
-ParameterString|thres_o|thres_o|50
+ParameterNumber|soe|soe|None|None|10
+ParameterNumber|son|son|None|None|10
+ParameterNumber|lambda_i|lambda_i|None|None|0.1
+ParameterNumber|thres_o|thres_o|None|None|50
 ParameterBoolean|-e|-e|True
 OutputVector|output|output
 OutputVector|outlier|outlier
-OutputVector|qgis|qgis
diff --git a/src/sextante/grass/description/alg_137.txt b/src/sextante/grass/description/alg_137.txt
diff --git a/src/sextante/grass/description/alg_138.txt b/src/sextante/grass/description/alg_138.txt
diff --git a/src/sextante/grass/description/alg_140.txt b/src/sextante/grass/description/alg_140.txt
diff --git a/src/sextante/grass/description/alg_141.txt b/src/sextante/grass/description/alg_141.txt
diff --git a/src/sextante/grass/description/alg_142.txt b/src/sextante/grass/description/alg_142.txt
@@ -1,12 +1,9 @@
 r.report
 Raster (r.*)
-ParameterMultipleInput|map|map|1.0|False
-ParameterString|units|units|
+ParameterMultipleInput|map|map|3|False
+ParameterSelection|units|units|mi;me;k;a;h;c;p
 ParameterString|null|null|*
-ParameterString|pl|pl|
-ParameterString|pw|pw|
-ParameterString|output|output|
-ParameterString|nsteps|nsteps|255
+ParameterNumber|nsteps|nsteps|None|None|255
 ParameterBoolean|-q|-q|True
 ParameterBoolean|-h|-h|True
 ParameterBoolean|-f|-f|True
@@ -15,3 +12,4 @@ ParameterBoolean|-n|-n|True
 ParameterBoolean|-N|-N|True
 ParameterBoolean|-C|-C|True
 ParameterBoolean|-i|-i|True
+OutputHTML|output|output