Skip to content

Commit 15953a7

Browse files
committed
[sextante] made ParameterTableField and ParameterString optional.
Changed serializing format of ParameterTableField
1 parent 48c6acb commit 15953a7

File tree

73 files changed

+104
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+104
-101
lines changed

python/plugins/sextante/algs/FieldPyculator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ def defineCharacteristics(self):
6767
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
6868
self.addParameter(ParameterString(self.FIELD_NAME, "Result field name", "NewField"))
6969
self.addParameter(ParameterSelection(self.FIELD_TYPE, "Field type", self.TYPE_NAMES))
70-
self.addParameter(ParameterNumber(self.FIELD_LENGTH, "Field lenght", 1, 255, 10))
70+
self.addParameter(ParameterNumber(self.FIELD_LENGTH, "Field length", 1, 255, 10))
7171
self.addParameter(ParameterNumber(self.FIELD_PRECISION, "Field precision", 0, 10, 0))
72-
self.addParameter(ParameterString(self.GLOBAL, "Global expression", multiline = True))
72+
self.addParameter(ParameterString(self.GLOBAL, "Global expression", multiline = True, optional = True))
7373
self.addParameter(ParameterString(self.FORMULA, "Formula", "value = ", multiline = True))
7474
self.addOutput(OutputVector(self.OUTPUT_LAYER, "Output layer"))
7575

python/plugins/sextante/algs/ftools/Dissolve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def defineCharacteristics(self):
121121
self.group = "Vector geometry tools"
122122
self.addParameter(ParameterVector(Dissolve.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_POLYGON))
123123
self.addParameter(ParameterBoolean(Dissolve.DISSOLVE_ALL, "Dissolve all (do not use field)", True))
124-
self.addParameter(ParameterTableField(Dissolve.FIELD, "Unique ID field",Dissolve.INPUT ))
124+
self.addParameter(ParameterTableField(Dissolve.FIELD, "Unique ID field",Dissolve.INPUT, optional=True ))
125125
self.addOutput(OutputVector(Dissolve.OUTPUT, "Dissolved"))
126126

127127
#=========================================================

python/plugins/sextante/grass/description/v.buffer.column.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ v.buffer
22
v.buffer.column - Creates a buffer around features of given type.
33
Vector (v.*)
44
ParameterVector|input|Input vector layer|-1|False
5-
ParameterTableField|bufcolumn|Name of column to use for buffer distances|input
5+
ParameterTableField|bufcolumn|Name of column to use for buffer distances|input|-1|False
66
ParameterNumber|scale|Scaling factor for attribute column values|None|None|1.0
77
ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01
88
ParameterBoolean|-s|Make outside corners straight|False

python/plugins/sextante/grass/description/v.class.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ v.class
22
v.class - Classifies attribute data, e.g. for thematic mapping.
33
Vector (v.*)
44
ParameterVector|map|Input vector layer|-1|False
5-
ParameterTableField|column|Column name or expression|map
5+
ParameterTableField|column|Column name or expression|map|-1|False
66
ParameterString|where|WHERE conditions of SQL statement without 'where' keyword|
77
ParameterSelection|algorithm|Algorithm to use for classification|int;std;qua;equ;dis
88
ParameterNumber|nbclasses|Number of classes to define|2.0|None|3

python/plugins/sextante/grass/description/v.dissolve.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ v.dissolve
22
v.dissolve - Dissolves boundaries between adjacent areas sharing a common category number or attribute.
33
Vector (v.*)
44
ParameterVector|input|Input vector layer|-1|False
5-
ParameterTableField|column|Name of column used to dissolve common boundaries|input
5+
ParameterTableField|column|Name of column used to dissolve common boundaries|input|-1|False
66
OutputVector|output|Dissolved layer
77

python/plugins/sextante/grass/description/v.distance.toattr.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Vector (v.*)
44
ParameterVector|from|"from" input layer|0|False
55
ParameterVector|to|"to" input layer|-1|False
66
ParameterSelection|upload|Values describing the relation between two nearest features|to_attr
7-
ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to
8-
ParameterTableField|to_column|Column name of nearest feature|to
7+
ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to|-1|False
8+
ParameterTableField|to_column|Column name of nearest feature|to|-1|False
99
ParameterBoolean|-a|Calculate distances to all features within the threshold|False
1010
OutputVector|output|Output layer

python/plugins/sextante/grass/description/v.distance.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Vector (v.*)
44
ParameterVector|from|"from" input layer|0|False
55
ParameterVector|to|"to" input layer|-1|False
66
ParameterSelection|upload|Values describing the relation between two nearest features|cat;dist;to_x;to_y;to_along;to_angle
7-
ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to
7+
ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to|-1|False
88
ParameterBoolean|-a|Calculate distances to all features within the threshold|False
99
OutputVector|output|Output layer
1010

python/plugins/sextante/grass/description/v.normal.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ v.normal - Tests for normality for points.
33
Vector (v.*)
44
ParameterVector|map|point vector defining sample points|-1|False
55
ParameterString|tests|Lists of tests (1-15): e.g. 1,3-8,13|1-3
6-
ParameterTableField|column|Attribute column|map
6+
ParameterTableField|column|Attribute column|map|-1|False
77
ParameterBoolean|-r|Use only points in current region|True
88
ParameterBoolean|-l|lognormal|False
99
OutputHTML|html|Output

python/plugins/sextante/grass/description/v.reclass.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ v.reclass - Changes vector category values for an existing vector map according
33
Vector (v.*)
44
ParameterVector|input|Input layer|-1|False
55
ParameterString|type|Feature type|point,line,boundary,centroid
6-
ParameterTableField|column|The name of the column whose values are to be used as new categories|input
6+
ParameterTableField|column|The name of the column whose values are to be used as new categories|input|-1|False
77
ParameterFile|rules|Reclass rule file|False
88
OutputVector|output|Reclassified layer
99

python/plugins/sextante/grass/description/v.sample.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ v.sample
22
v.sample - Samples a raster layer at vector point locations.
33
Vector (v.*)
44
ParameterVector|input|Vector layer defining sample points|0|False
5-
ParameterTableField|column|Vector layer attribute column to use for comparison|input
5+
ParameterTableField|column|Vector layer attribute column to use for comparison|input|-1|False
66
ParameterRaster|raster|Raster map to be sampled|False
77
ParameterNumber|z|Sampled raster values will be multiplied by this factor|None|None|1.0
88
ParameterBoolean|-b|Bilinear interpolation (default is nearest neighbor)|False

0 commit comments

Comments
 (0)