[sextante] algorithm fixes and minor changes

qgis · Jul 11, 2013 · 7ee80c7 · 7ee80c7
1 parent 646db83
commit 7ee80c7
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 14 deletions.
diff --git a/python/plugins/sextante/algs/ftools/Intersection.py b/python/plugins/sextante/algs/ftools/Intersection.py
@@ -69,7 +69,6 @@ def processAlgorithm(self, progress):
                 inFeatB = vlayerB.getFeatures(request).next()
                 tmpGeom = QgsGeometry(inFeatB.geometry())
                 if geom.intersects( tmpGeom ):
-                    print "hola"
                     atMapB = inFeatB.attributes()
                     int_geom = QgsGeometry( geom.intersection( tmpGeom ) )
                     if int_geom.wkbType() == 7:

diff --git a/python/plugins/sextante/gdal/scripts/proximity.py b/python/plugins/sextante/gdal/scripts/proximity.py
@@ -32,7 +32,7 @@
 ##values=string
 ##maxdist=number 0
 ##nodata=number 0
-##distunits=selection PIXEL;GEO
+##distunits=selection GEO,PIXEL
 ##fixed_buf_val=number 0
 from sextante.gdal.GdalUtils import GdalUtils
 try:

diff --git a/python/plugins/sextante/grass/description/v.clean.advanced.txt b/python/plugins/sextante/grass/description/v.clean.advanced.txt
@@ -3,6 +3,6 @@ v.clean.advanced - Toolset for cleaning topology of vector map (Advanced).
 Vector (v.*)
 ParameterVector|input|Layer to clean|-1|False
 ParameterString|tool|Cleaning tools (comma separated)|break
-ParameterNumber|thresh|Threshold|None|None|0.0
+ParameterNumber|thresh|Threshold|None|None|0..1
 OutputVector|output|Cleaned vector layer
 OutputVector|error|Errors layer
diff --git a/python/plugins/sextante/grass/description/v.clean.txt b/python/plugins/sextante/grass/description/v.clean.txt
@@ -3,6 +3,6 @@ v.clean - Toolset for cleaning topology of vector map.
 Vector (v.*)
 ParameterVector|input|Layer to clean|-1|False
 ParameterSelection|tool|Cleaning tool|break;snap;rmdangle;chdangle;rmbridge;chbridge;rmdupl;rmdac;bpol;prune;rmarea;rmline;rmsa
-ParameterNumber|thresh|Threshold|None|None|0.0
+ParameterNumber|thresh|Threshold|None|None|0.1
 OutputVector|output|Cleaned vector layer
 OutputVector|error|Errors layer
diff --git a/python/plugins/sextante/gui/help/algclasssification.txt b/python/plugins/sextante/gui/help/algclasssification.txt
@@ -308,7 +308,12 @@ saga:polartocartesiancoordinates,USE_ORIGINAL_NAME,Domain specific/Cost analysis
 saga:polygon-lineintersection,USE_ORIGINAL_NAME,Vector/Geometry operations
 saga:polygoncentroids,USE_ORIGINAL_NAME,Vector/Polygons
 saga:polygondissolve,USE_ORIGINAL_NAME,Vector/Polygons
-saga:polygonintersection,USE_ORIGINAL_NAME,Vector/Polygons
+saga:intersect,Polygon intersection,Vector/Polygons
+saga:difference,Polygon difference,Vector/Polygons
+saga:update,Polygon update,Vector/Polygons
+saga:identity,Polygon identity,Vector/Polygons
+saga:union,Polygon union,Vector/Polygons
+saga:symmetricaldifference,Polygon symmetrical difference,Vector/Polygons
 saga:polygonpartstoseparatepolygons,USE_ORIGINAL_NAME,Vector/Polygons
 saga:polygonproperties,USE_ORIGINAL_NAME,Vector/Polygons
 saga:polygonshapeindices,USE_ORIGINAL_NAME,Vector/Polygons

diff --git a/python/plugins/sextante/saga/description/PolygonDifference.txt b/python/plugins/sextante/saga/description/PolygonDifference.txt
@@ -0,0 +1,6 @@
+Difference
+shapes_polygons
+ParameterVector|A|Layer A|2|False
+ParameterVector|B|Layer B|2|False
+ParameterBoolean|SPLIT|Split Parts|True
+OutputVector|RESULT|Intersection
diff --git a/python/plugins/sextante/saga/description/PolygonIdentity.txt b/python/plugins/sextante/saga/description/PolygonIdentity.txt
@@ -0,0 +1,6 @@
+Identity
+shapes_polygons
+ParameterVector|A|Layer A|2|False
+ParameterVector|B|Layer B|2|False
+ParameterBoolean|SPLIT|Split Parts|True
+OutputVector|RESULT|Intersection
diff --git a/python/plugins/sextante/saga/description/PolygonIntersect.txt b/python/plugins/sextante/saga/description/PolygonIntersect.txt
@@ -0,0 +1,6 @@
+Intersect
+shapes_polygons
+ParameterVector|A|Layer A|2|False
+ParameterVector|B|Layer B|2|False
+ParameterBoolean|SPLIT|Split Parts|True
+OutputVector|RESULT|Intersection
diff --git a/python/plugins/sextante/saga/description/PolygonIntersection.txt b/python/plugins/sextante/saga/description/PolygonIntersection.txt
diff --git a/python/plugins/sextante/saga/description/PolygonSymmetricalDifference.txt b/python/plugins/sextante/saga/description/PolygonSymmetricalDifference.txt
@@ -0,0 +1,6 @@
+Symmetrical Difference
+shapes_polygons
+ParameterVector|A|Layer A|2|False
+ParameterVector|B|Layer B|2|False
+ParameterBoolean|SPLIT|Split Parts|True
+OutputVector|RESULT|Intersection
diff --git a/python/plugins/sextante/saga/description/PolygonUnion.txt b/python/plugins/sextante/saga/description/PolygonUnion.txt
@@ -0,0 +1,6 @@
+Union
+shapes_polygons
+ParameterVector|A|Layer A|2|False
+ParameterVector|B|Layer B|2|False
+ParameterBoolean|SPLIT|Split Parts|True
+OutputVector|RESULT|Intersection
diff --git a/python/plugins/sextante/saga/description/PolygonUpdate.txt b/python/plugins/sextante/saga/description/PolygonUpdate.txt
@@ -0,0 +1,6 @@
+Update
+shapes_polygons
+ParameterVector|A|Layer A|2|False
+ParameterVector|B|Layer B|2|False
+ParameterBoolean|SPLIT|Split Parts|True
+OutputVector|RESULT|Intersection