Skip to content

Commit 0c565f7

Browse files
alexbruyalexbruy
committed
[sextante] update algorithms to changes in ParameterVector
1 parent 470c9d0 commit 0c565f7

Some content is hidden

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

56 files changed

+1132
-1134
lines changed

‎python/plugins/sextante/admintools/CreateMosaicDatastore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
# self.addcaddBaseParameters()
5757
# self.name = "Import into GeoServer"
5858
# self.group = "GeoServer management tools"
59-
# self.addParameter(ParameterVector(self.INPUT, "Layer to import", ParameterVector.VECTOR_TYPE_ANY))
59+
# self.addParameter(ParameterVector(self.INPUT, "Layer to import", [ParameterVector.VECTOR_TYPE_ANY]))
6060
# self.addParameter(ParameterString(self.WORKSPACE, "Workspace"))
6161
#===============================================================================

‎python/plugins/sextante/admintools/ImportVectorIntoGeoServer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ def defineCharacteristics(self):
5959
self.addBaseParameters()
6060
self.name = "Import vector into GeoServer"
6161
self.group = "GeoServer management tools"
62-
self.addParameter(ParameterVector(self.INPUT, "Layer to import", ParameterVector.VECTOR_TYPE_ANY))
62+
self.addParameter(ParameterVector(self.INPUT, "Layer to import", [ParameterVector.VECTOR_TYPE_ANY]))
6363
self.addParameter(ParameterString(self.WORKSPACE, "Workspace"))
6464

‎python/plugins/sextante/algs/AddTableField.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def defineCharacteristics(self):
5858
self.name = "Add field to attributes table"
5959
self.group = "Vector table tools"
6060

61-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
61+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", [ParameterVector.VECTOR_TYPE_ANY], False))
6262
self.addParameter(ParameterString(self.FIELD_NAME, "Field name"))
6363
self.addParameter(ParameterSelection(self.FIELD_TYPE, "Field type", self.TYPE_NAMES))
6464
self.addParameter(ParameterNumber(self.FIELD_LENGTH, "Field length", 1, 255, 10))

‎python/plugins/sextante/algs/AutoincrementalField.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
6767
def defineCharacteristics(self):
6868
self.name = "Add autoincremental field"
6969
self.group = "Vector table tools"
70-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
70+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
7171
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
7272

7373

‎python/plugins/sextante/algs/EquivalentNumField.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def processAlgorithm(self, progress):
7474
def defineCharacteristics(self):
7575
self.name = "Create equivalent numerical field"
7676
self.group = "Vector table tools"
77-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
77+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
7878
self.addParameter(ParameterTableField(self.FIELD, "Class field", self.INPUT))
7979
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
8080

‎python/plugins/sextante/algs/Explode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@ def getPolylineAsSingleSegments(self, polyline):
8787
def defineCharacteristics(self):
8888
self.name = "Explode lines"
8989
self.group = "Vector geometry tools"
90-
self.addParameter(ParameterVector(self.INPUT, "Input layer",ParameterVector.VECTOR_TYPE_LINE))
90+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_LINE]))
9191
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
9292

‎python/plugins/sextante/algs/FieldPyculator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class FieldsPyculator(GeoAlgorithm):
6464
def defineCharacteristics(self):
6565
self.name = "Advanced Python field calculator"
6666
self.group = "Vector table tools"
67-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
67+
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))
7070
self.addParameter(ParameterNumber(self.FIELD_LENGTH, "Field length", 1, 255, 10))

‎python/plugins/sextante/algs/FieldsCalculator.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class FieldsCalculator(GeoAlgorithm):
5454
def defineCharacteristics(self):
5555
self.name = "Field calculator"
5656
self.group = "Vector table tools"
57-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
57+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", [ParameterVector.VECTOR_TYPE_ANY], False))
5858
self.addParameter(ParameterString(self.FIELD_NAME, "Result field name"))
5959
self.addParameter(ParameterSelection(self.FIELD_TYPE, "Field type", self.TYPE_NAMES))
6060
self.addParameter(ParameterNumber(self.FIELD_LENGTH, "Field length", 1, 255, 10))
@@ -81,20 +81,20 @@ def processAlgorithm(self, progress):
8181
nFeat = provider.featureCount()
8282
nElement = 0
8383
features = QGisLayers.features(layer)
84-
85-
fieldnames = [field.name() for field in provider.fields()]
84+
85+
fieldnames = [field.name() for field in provider.fields()]
8686
fieldnames.sort(key=len, reverse=False)
8787
fieldidx = [fieldnames.index(field.name()) for field in provider.fields()]
8888
print fieldidx
8989
for inFeat in features:
9090
progress.setPercentage(int((100 * nElement) / nFeat))
9191
attrs = inFeat.attributes()
92-
expression = formula
93-
for idx in fieldidx:
94-
expression = expression.replace(unicode(fields[idx].name()), unicode(attrs[idx]))
95-
try:
92+
expression = formula
93+
for idx in fieldidx:
94+
expression = expression.replace(unicode(fields[idx].name()), unicode(attrs[idx]))
95+
try:
9696
result = eval(expression)
97-
except Exception:
97+
except Exception:
9898
result = None
9999
nElement += 1
100100
inGeom = inFeat.geometry()

‎python/plugins/sextante/algs/JoinAttributes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class JoinAttributes(GeoAlgorithm):
4444
def defineCharacteristics(self):
4545
self.name = "Join attributes table"
4646
self.group = "Vector general tools"
47-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
48-
self.addParameter(ParameterVector(self.INPUT_LAYER_2, "Input layer 2", ParameterVector.VECTOR_TYPE_ANY, False))
47+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", [ParameterVector.VECTOR_TYPE_ANY], False))
48+
self.addParameter(ParameterVector(self.INPUT_LAYER_2, "Input layer 2", [ParameterVector.VECTOR_TYPE_ANY], False))
4949
self.addParameter(ParameterTableField(self.TABLE_FIELD, "Table field", self.INPUT_LAYER))
5050
self.addParameter(ParameterTableField(self.TABLE_FIELD_2, "Table field 2", self.INPUT_LAYER_2))
5151
self.addOutput(OutputVector(self.OUTPUT_LAYER, "Output layer"))

‎python/plugins/sextante/algs/Polygonize.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def processAlgorithm(self, progress):
8989
def defineCharacteristics(self):
9090
self.name = "Polygonize"
9191
self.group = "Vector geometry tools"
92-
self.addParameter(ParameterVector(self.INPUT, "Input layer",ParameterVector.VECTOR_TYPE_LINE))
92+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_LINE]))
9393
self.addParameter(ParameterBoolean(self.FIELDS, "Keep table structure of line layer", False))
9494
self.addParameter(ParameterBoolean(self.GEOMETRY, "Create geometry columns", True))
95-
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
95+
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))

‎python/plugins/sextante/algs/SaveSelectedFeatures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def defineCharacteristics(self):
6161

6262
#we add the input vector layer. It can have any kind of geometry
6363
#It is a mandatory (not optional) one, hence the False argument
64-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
64+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", [ParameterVector.VECTOR_TYPE_ANY], False))
6565
# we add a vector layer as output
6666
self.addOutput(OutputVector(self.OUTPUT_LAYER, "Output layer with selected features"))
6767

‎python/plugins/sextante/algs/StatisticsByCategories.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def defineCharacteristics(self):
4343
self.name = "Statistics by categories"
4444
self.group = "Vector table tools"
4545

46-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input vector layer", ParameterVector.VECTOR_TYPE_ANY, False))
46+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input vector layer", [ParameterVector.VECTOR_TYPE_ANY], False))
4747
self.addParameter(ParameterTableField(self.VALUES_FIELD_NAME, "Field to calculate statistics on",
4848
self.INPUT_LAYER, ParameterTableField.DATA_TYPE_NUMBER))
4949
self.addParameter(ParameterTableField(self.CATEGORIES_FIELD_NAME, "Field with categories",

‎python/plugins/sextante/algs/VectorLayerHistogram.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
6161
def defineCharacteristics(self):
6262
self.name = "Vector layer histogram"
6363
self.group = "Graphics"
64-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
64+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
6565
self.addParameter(ParameterTableField(self.FIELD, "Attribute", self.INPUT,ParameterTableField.DATA_TYPE_NUMBER))
6666
self.addParameter(ParameterNumber(self.BINS, "number of bins", 2, None, 10))
6767
self.addOutput(OutputHTML(self.OUTPUT, "Output"))

‎python/plugins/sextante/algs/VectorLayerScatterplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
6262
def defineCharacteristics(self):
6363
self.name = "Vector layer scatterplot"
6464
self.group = "Graphics"
65-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
65+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
6666
self.addParameter(ParameterTableField(self.XFIELD, "X attribute", self.INPUT,ParameterTableField.DATA_TYPE_NUMBER))
6767
self.addParameter(ParameterTableField(self.YFIELD, "Y attribute", self.INPUT,ParameterTableField.DATA_TYPE_NUMBER))
6868
self.addOutput(OutputHTML(self.OUTPUT, "Output"))

‎python/plugins/sextante/algs/ftools/Centroids.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def defineCharacteristics(self):
4848
self.name = "Polygon centroids"
4949
self.group = "Vector geometry tools"
5050

51-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_POLYGON))
51+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", [ParameterVector.VECTOR_TYPE_POLYGON]))
5252

5353
self.addOutput(OutputVector(self.OUTPUT_LAYER, "Output layer"))
5454

‎python/plugins/sextante/algs/ftools/Clip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class Clip(GeoAlgorithm):
5151
def defineCharacteristics(self):
5252
self.name = "Clip"
5353
self.group = "Vector overlay tools"
54-
self.addParameter(ParameterVector(Clip.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
55-
self.addParameter(ParameterVector(Clip.OVERLAY, "Clip layer", ParameterVector.VECTOR_TYPE_ANY))
54+
self.addParameter(ParameterVector(Clip.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
55+
self.addParameter(ParameterVector(Clip.OVERLAY, "Clip layer", [ParameterVector.VECTOR_TYPE_ANY]))
5656
self.addOutput(OutputVector(Clip.OUTPUT, "Clipped"))
5757

5858
def processAlgorithm(self, progress):

‎python/plugins/sextante/algs/ftools/ConvexHull.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class ConvexHull(GeoAlgorithm):
5959
def defineCharacteristics(self):
6060
self.name = "Convex hull"
6161
self.group = "Vector geometry tools"
62-
self.addParameter(ParameterVector(ConvexHull.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
62+
self.addParameter(ParameterVector(ConvexHull.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
6363
self.addParameter(ParameterTableField(ConvexHull.FIELD, "Field (optional, only used if creating convex hulls by classes)", ConvexHull.INPUT, optional = True))
6464
self.addParameter(ParameterSelection(ConvexHull.METHOD, "Method", ConvexHull.METHODS))
6565
self.addOutput(OutputVector(ConvexHull.OUTPUT, "Convex hull"))

‎python/plugins/sextante/algs/ftools/Delaunay.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def defineCharacteristics(self):
5454
self.name = "Delaunay triangulation"
5555
self.group = "Vector geometry tools"
5656

57-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_POINT))
57+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_POINT]))
5858

5959
self.addOutput(OutputVector(self.OUTPUT, "Delaunay triangulation"))
6060

‎python/plugins/sextante/algs/ftools/DensifyGeometries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def defineCharacteristics(self):
4545
self.name = "Densify geometries"
4646
self.group = "Vector geometry tools"
4747

48-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
48+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_POLYGON,ParameterVector.VECTOR_TYPE_LINE]))
4949
self.addParameter(ParameterNumber(self.VERTICES, "Vertices to add", 1, 10000000, 1))
5050

5151
self.addOutput(OutputVector(self.OUTPUT, "Densified layer"))

‎python/plugins/sextante/algs/ftools/DensifyGeometriesInterval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def defineCharacteristics(self):
4646
self.name = "Densify geometries given an interval"
4747
self.group = "Vector geometry tools"
4848

49-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
49+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_POLYGON,ParameterVector.VECTOR_TYPE_LINE]))
5050
self.addParameter(ParameterNumber(self.INTERVAL, "Interval between Vertices to add", 1, 10000000, 1))
5151

5252
self.addOutput(OutputVector(self.OUTPUT, "Densified layer"))

‎python/plugins/sextante/algs/ftools/Difference.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class Difference(GeoAlgorithm):
5050
def defineCharacteristics(self):
5151
self.name = "Difference"
5252
self.group = "Vector overlay tools"
53-
self.addParameter(ParameterVector(Difference.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
54-
self.addParameter(ParameterVector(Difference.OVERLAY, "Difference layer", ParameterVector.VECTOR_TYPE_ANY))
53+
self.addParameter(ParameterVector(Difference.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
54+
self.addParameter(ParameterVector(Difference.OVERLAY, "Difference layer", [ParameterVector.VECTOR_TYPE_ANY]))
5555
self.addOutput(OutputVector(Difference.OUTPUT, "Difference"))
5656

5757
def processAlgorithm(self, progress):

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@ def processAlgorithm(self, progress):
115115
def defineCharacteristics(self):
116116
self.name = "Dissolve"
117117
self.group = "Vector geometry tools"
118-
self.addParameter(ParameterVector(Dissolve.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_POLYGON))
118+
self.addParameter(ParameterVector(Dissolve.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_POLYGON]))
119119
self.addParameter(ParameterBoolean(Dissolve.DISSOLVE_ALL, "Dissolve all (do not use field)", True))
120120
self.addParameter(ParameterTableField(Dissolve.FIELD, "Unique ID field",Dissolve.INPUT, optional=True ))
121121
self.addOutput(OutputVector(Dissolve.OUTPUT, "Dissolved"))
122-
123-
#=========================================================

‎python/plugins/sextante/algs/ftools/ExportGeometryInfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def defineCharacteristics(self):
5757
self.name = "Export/Add geometry columns"
5858
self.group = "Vector table tools"
5959

60-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
60+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
6161
self.addParameter(ParameterSelection(self.METHOD, "Calculate using", self.CALC_METHODS, 0))
6262

6363
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))

‎python/plugins/sextante/algs/ftools/ExtentFromLayer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def defineCharacteristics(self):
5151
self.name = "Polygon from layer extent"
5252
self.group = "Vector general tools"
5353

54-
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
54+
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
5555
self.addParameter(ParameterBoolean(self.BY_FEATURE, "Calculate extent for each feature separately", False))
5656

5757
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))

‎python/plugins/sextante/algs/ftools/ExtractNodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def defineCharacteristics(self):
4747
self.name = "Extract nodes"
4848
self.group = "Vector geometry tools"
4949

50-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
50+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_POLYGON, ParameterVector.VECTOR_TYPE_LINE]))
5151

5252
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
5353

‎python/plugins/sextante/algs/ftools/FixedDistanceBuffer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class FixedDistanceBuffer(GeoAlgorithm):
5555
def defineCharacteristics(self):
5656
self.name = "Fixed distance buffer"
5757
self.group = "Vector geometry tools"
58-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
58+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
5959
self.addParameter(ParameterNumber(self.DISTANCE, "Distance", 0.0, default=10.0))
6060
self.addParameter(ParameterNumber(self.SEGMENTS, "Segments", 1, default=5))
6161
self.addParameter(ParameterBoolean(self.DISSOLVE, "Dissolve result", False))

‎python/plugins/sextante/algs/ftools/Intersection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ def processAlgorithm(self, progress):
9090
def defineCharacteristics(self):
9191
self.name = "Intersection"
9292
self.group = "Vector overlay tools"
93-
self.addParameter(ParameterVector(Intersection.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
94-
self.addParameter(ParameterVector(Intersection.INPUT2, "Intersect layer", ParameterVector.VECTOR_TYPE_ANY))
93+
self.addParameter(ParameterVector(Intersection.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
94+
self.addParameter(ParameterVector(Intersection.INPUT2, "Intersect layer", [ParameterVector.VECTOR_TYPE_ANY]))
9595
self.addOutput(OutputVector(Intersection.OUTPUT, "Intersection"))

‎python/plugins/sextante/algs/ftools/LinesIntersection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def defineCharacteristics(self):
5050
self.name = "Line intersections"
5151
self.group = "Vector overlay tools"
5252

53-
self.addParameter(ParameterVector(self.INPUT_A, "Input layer", ParameterVector.VECTOR_TYPE_LINE))
54-
self.addParameter(ParameterVector(self.INPUT_B, "Intersect layer", ParameterVector.VECTOR_TYPE_LINE))
53+
self.addParameter(ParameterVector(self.INPUT_A, "Input layer", [ParameterVector.VECTOR_TYPE_LINE]))
54+
self.addParameter(ParameterVector(self.INPUT_B, "Intersect layer", [ParameterVector.VECTOR_TYPE_LINE]))
5555
self.addParameter(ParameterTableField(self.FIELD_A, "Input unique ID field", self.INPUT_A))
5656
self.addParameter(ParameterTableField(self.FIELD_B, "Intersect unique ID field", self.INPUT_B))
5757

‎python/plugins/sextante/algs/ftools/LinesToPolygons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def defineCharacteristics(self):
4545
self.name = "Lines to polygons"
4646
self.group = "Vector geometry tools"
4747

48-
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_LINE))
48+
self.addParameter(ParameterVector(self.INPUT, "Input layer", [ParameterVector.VECTOR_TYPE_LINE]))
4949
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
5050

5151
def processAlgorithm(self, progress):

‎python/plugins/sextante/algs/ftools/MeanCoords.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def defineCharacteristics(self):
4949
self.name = "Mean coordinate(s)"
5050
self.group = "Vector analysis tools"
5151

52-
self.addParameter(ParameterVector(self.POINTS, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
52+
self.addParameter(ParameterVector(self.POINTS, "Input layer", [ParameterVector.VECTOR_TYPE_ANY]))
5353
self.addParameter(ParameterTableField(self.WEIGHT, "Weight field", MeanCoords.POINTS, ParameterTableField.DATA_TYPE_NUMBER))
5454
self.addParameter(ParameterTableField(self.UID, "Unique ID field", MeanCoords.POINTS, ParameterTableField.DATA_TYPE_NUMBER))
5555

‎python/plugins/sextante/algs/ftools/NearestNeighbourAnalysis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def defineCharacteristics(self):
5353
self.name = "Nearest neighbour analysis"
5454
self.group = "Vector analysis tools"
5555

56-
self.addParameter(ParameterVector(self.POINTS, "Points", ParameterVector.VECTOR_TYPE_POINT))
56+
self.addParameter(ParameterVector(self.POINTS, "Points", [ParameterVector.VECTOR_TYPE_POINT]))
5757

5858
self.addOutput(OutputHTML(self.OUTPUT, "Result"))
5959

0 commit comments

Comments
 (0)