Skip to content

Commit 7ee80c7

Browse files
committedJul 11, 2013
[sextante] algorithm fixes and minor changes
1 parent 646db83 commit 7ee80c7

File tree

12 files changed

+45
-14
lines changed

12 files changed

+45
-14
lines changed
 

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def processAlgorithm(self, progress):
6969
inFeatB = vlayerB.getFeatures(request).next()
7070
tmpGeom = QgsGeometry(inFeatB.geometry())
7171
if geom.intersects( tmpGeom ):
72-
print "hola"
7372
atMapB = inFeatB.attributes()
7473
int_geom = QgsGeometry( geom.intersection( tmpGeom ) )
7574
if int_geom.wkbType() == 7:

‎python/plugins/sextante/gdal/scripts/proximity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
##values=string
3333
##maxdist=number 0
3434
##nodata=number 0
35-
##distunits=selection PIXEL;GEO
35+
##distunits=selection GEO,PIXEL
3636
##fixed_buf_val=number 0
3737
from sextante.gdal.GdalUtils import GdalUtils
3838
try:

‎python/plugins/sextante/grass/description/v.clean.advanced.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ v.clean.advanced - Toolset for cleaning topology of vector map (Advanced).
33
Vector (v.*)
44
ParameterVector|input|Layer to clean|-1|False
55
ParameterString|tool|Cleaning tools (comma separated)|break
6-
ParameterNumber|thresh|Threshold|None|None|0.0
6+
ParameterNumber|thresh|Threshold|None|None|0..1
77
OutputVector|output|Cleaned vector layer
88
OutputVector|error|Errors layer

‎python/plugins/sextante/grass/description/v.clean.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ v.clean - Toolset for cleaning topology of vector map.
33
Vector (v.*)
44
ParameterVector|input|Layer to clean|-1|False
55
ParameterSelection|tool|Cleaning tool|break;snap;rmdangle;chdangle;rmbridge;chbridge;rmdupl;rmdac;bpol;prune;rmarea;rmline;rmsa
6-
ParameterNumber|thresh|Threshold|None|None|0.0
6+
ParameterNumber|thresh|Threshold|None|None|0.1
77
OutputVector|output|Cleaned vector layer
88
OutputVector|error|Errors layer

‎python/plugins/sextante/gui/help/algclasssification.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,12 @@ saga:polartocartesiancoordinates,USE_ORIGINAL_NAME,Domain specific/Cost analysis
308308
saga:polygon-lineintersection,USE_ORIGINAL_NAME,Vector/Geometry operations
309309
saga:polygoncentroids,USE_ORIGINAL_NAME,Vector/Polygons
310310
saga:polygondissolve,USE_ORIGINAL_NAME,Vector/Polygons
311-
saga:polygonintersection,USE_ORIGINAL_NAME,Vector/Polygons
311+
saga:intersect,Polygon intersection,Vector/Polygons
312+
saga:difference,Polygon difference,Vector/Polygons
313+
saga:update,Polygon update,Vector/Polygons
314+
saga:identity,Polygon identity,Vector/Polygons
315+
saga:union,Polygon union,Vector/Polygons
316+
saga:symmetricaldifference,Polygon symmetrical difference,Vector/Polygons
312317
saga:polygonpartstoseparatepolygons,USE_ORIGINAL_NAME,Vector/Polygons
313318
saga:polygonproperties,USE_ORIGINAL_NAME,Vector/Polygons
314319
saga:polygonshapeindices,USE_ORIGINAL_NAME,Vector/Polygons
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Difference
2+
shapes_polygons
3+
ParameterVector|A|Layer A|2|False
4+
ParameterVector|B|Layer B|2|False
5+
ParameterBoolean|SPLIT|Split Parts|True
6+
OutputVector|RESULT|Intersection
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Identity
2+
shapes_polygons
3+
ParameterVector|A|Layer A|2|False
4+
ParameterVector|B|Layer B|2|False
5+
ParameterBoolean|SPLIT|Split Parts|True
6+
OutputVector|RESULT|Intersection
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Intersect
2+
shapes_polygons
3+
ParameterVector|A|Layer A|2|False
4+
ParameterVector|B|Layer B|2|False
5+
ParameterBoolean|SPLIT|Split Parts|True
6+
OutputVector|RESULT|Intersection

‎python/plugins/sextante/saga/description/PolygonIntersection.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Symmetrical Difference
2+
shapes_polygons
3+
ParameterVector|A|Layer A|2|False
4+
ParameterVector|B|Layer B|2|False
5+
ParameterBoolean|SPLIT|Split Parts|True
6+
OutputVector|RESULT|Intersection
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Union
2+
shapes_polygons
3+
ParameterVector|A|Layer A|2|False
4+
ParameterVector|B|Layer B|2|False
5+
ParameterBoolean|SPLIT|Split Parts|True
6+
OutputVector|RESULT|Intersection
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Update
2+
shapes_polygons
3+
ParameterVector|A|Layer A|2|False
4+
ParameterVector|B|Layer B|2|False
5+
ParameterBoolean|SPLIT|Split Parts|True
6+
OutputVector|RESULT|Intersection

0 commit comments

Comments
 (0)
Please sign in to comment.