python/plugins/sextante/grass/GrassAlgorithm.py

@@ -56,10 +56,14 @@
 
 class GrassAlgorithm(GeoAlgorithm):
 
+    GRASS_OUTPUT_TYPE_PARAMETER = "GRASS_OUTPUT_TYPE_PARAMETER" 
     GRASS_MIN_AREA_PARAMETER = "GRASS_MIN_AREA_PARAMETER"
     GRASS_SNAP_TOLERANCE_PARAMETER = "GRASS_SNAP_TOLERANCE_PARAMETER"
     GRASS_REGION_EXTENT_PARAMETER = "GRASS_REGION_PARAMETER"
     GRASS_REGION_CELLSIZE_PARAMETER = "GRASS_REGION_CELLSIZE_PARAMETER"
+    GRASS_REGION_ALIGN_TO_RESOLUTION = "-a_r.region"
+
+    OUTPUT_TYPES = ["auto", "point", "line", "area"]
 
     def __init__(self, descriptionfile):
         GeoAlgorithm.__init__(self)
@@ -113,17 +117,18 @@ def defineCharacteristicsFromFile(self):
         line = lines.readline().strip("\n").strip()
         self.group = line
         hasRasterOutput = False
-        hasVectorOutput = False
+        hasVectorInput = False
+        vectorOutputs = 0
         while line != "":
             try:
                 line = line.strip("\n").strip()
                 if line.startswith("Parameter"):
                     parameter = ParameterFactory.getFromString(line);
                     self.addParameter(parameter)
                     if isinstance(parameter, ParameterVector):
-                       hasVectorOutput = True
+                        hasVectorInput = True
                     if isinstance(parameter, ParameterMultipleInput) and parameter.datatype < 3:
-                       hasVectorOutput = True
+                        hasVectorInput = True
                 elif line.startswith("*Parameter"):
                     param = ParameterFactory.getFromString(line[1:])
                     param.isAdvanced = True
@@ -133,6 +138,8 @@ def defineCharacteristicsFromFile(self):
                     self.addOutput(output);
                     if isinstance(output, OutputRaster):
                         hasRasterOutput = True
+                    elif isinstance(output, OutputVector):
+                        vectorOutputs += 1
                 line = lines.readline().strip("\n").strip()
             except Exception,e:
                 SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + self.descriptionFile + "\n" + line)
@@ -142,15 +149,19 @@ def defineCharacteristicsFromFile(self):
         self.addParameter(ParameterExtent(self.GRASS_REGION_EXTENT_PARAMETER, "GRASS region extent"))
         if hasRasterOutput:
             self.addParameter(ParameterNumber(self.GRASS_REGION_CELLSIZE_PARAMETER, "GRASS region cellsize (leave 0 for default)", 0, None, 0.0))
-        if hasVectorOutput:
+        if hasVectorInput:
             param = ParameterNumber(self.GRASS_SNAP_TOLERANCE_PARAMETER, "v.in.ogr snap tolerance (-1 = no snap)", -1, None, -1.0)
             param.isAdvanced = True
             self.addParameter(param)
             param = ParameterNumber(self.GRASS_MIN_AREA_PARAMETER, "v.in.ogr min area", 0, None, 0.0001)
             param.isAdvanced = True
             self.addParameter(param)
-
-
+        if vectorOutputs == 1:            
+            param = ParameterSelection(self.GRASS_OUTPUT_TYPE_PARAMETER, "v.out.ogr output type", self.OUTPUT_TYPES)
+            param.isAdvanced = True
+            self.addParameter(param)
+
+
     def getDefaultCellsize(self):
         cellsize = 0
         for param in self.parameters:
@@ -251,7 +262,9 @@ def processAlgorithm(self, progress):
             command +=" res=" + str(cellsize);
         else:
             command +=" res=" + str(self.getDefaultCellsize())
-
+        alignToResolution = self.getParameterValue(self.GRASS_REGION_ALIGN_TO_RESOLUTION)
+        if alignToResolution:
+            command +=" -a"
         commands.append(command)
 
         #2: set parameters and outputs
@@ -260,7 +273,8 @@ def processAlgorithm(self, progress):
             if param.value == None or param.value == "":
                 continue
             if (param.name == self.GRASS_REGION_CELLSIZE_PARAMETER or param.name == self.GRASS_REGION_EXTENT_PARAMETER
-                    or param.name == self.GRASS_MIN_AREA_PARAMETER or param.name == self.GRASS_SNAP_TOLERANCE_PARAMETER):
+                    or param.name == self.GRASS_MIN_AREA_PARAMETER or param.name == self.GRASS_SNAP_TOLERANCE_PARAMETER
+                    or param.name == self.GRASS_OUTPUT_TYPE_PARAMETER or param.name == self.GRASS_REGION_ALIGN_TO_RESOLUTION):
                 continue
             if isinstance(param, (ParameterRaster, ParameterVector)):
                 value = param.value
@@ -321,11 +335,13 @@ def processAlgorithm(self, progress):
 
             if isinstance(out, OutputVector):
                 filename = out.value
-                command = "v.out.ogr -ce input=" + out.name + uniqueSufix
+                command = "v.out.ogr -e input=" + out.name + uniqueSufix
                 command += " dsn=\"" + os.path.dirname(out.value) + "\""
                 command += " format=ESRI_Shapefile"
                 command += " olayer=" + os.path.basename(out.value)[:-4]
-                command += " type=auto"
+                typeidx = self.getParameterValue(self.GRASS_OUTPUT_TYPE_PARAMETER);
+                outtype =  "auto" if typeidx is None else self.OUTPUT_TYPES[typeidx]                 
+                command += " type=" + outtype
                 commands.append(command)
                 outputCommands.append(command)
 

python/plugins/sextante/grass/description/r.resamp.interp.txt

@@ -3,4 +3,5 @@ r.resamp.interp - Resamples a raster map layer to a finer grid using interpolati
 Raster (r.*)
 ParameterRaster|input|Input raster layer|False
 ParameterSelection|method|Interpolation method|nearest;bilinear;bicubic
+ParameterBoolean|-a_r.region|Align region to resolution (default = align to bounds) in r.region|False
 OutputRaster|output|Output raster layer

python/plugins/sextante/grass/description/r.resamp.rst.txt

@@ -5,4 +5,5 @@ ParameterRaster|input|Raster layer|False
 ParameterNumber|ew_res|Desired east-west resolution|0.0|None|1
 ParameterNumber|ns_res|Desired north-south resolution|0.0|None|1
 ParameterBoolean|-t|Use dnorm independent tension|False
+ParameterBoolean|-a_r.region|Align region to resolution (default = align to bounds) in r.region|False
 OutputRaster|elev|Output layer

python/plugins/sextante/grass/description/r.resamp.stats.txt

@@ -5,4 +5,5 @@ ParameterRaster|input|Input raster layer|False
 ParameterSelection|method|Aggregation method|average;median;mode;minimum;maximum;quart1;quart3;perc90;sum;variance;stddev
 ParameterBoolean|-n|Propagate NULLs|False
 ParameterBoolean|-w|Weight according to area (slower)|False
+ParameterBoolean|-a_r.region|Align region to resolution (default = align to bounds) in r.region|False
 OutputRaster|output|Output raster layer

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

@@ -0,0 +1,8 @@
+v.clean
+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
+OutputVector|output|Cleaned vector layer
+OutputVector|error|Errors layer

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

@@ -5,5 +5,4 @@ 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
 OutputVector|output|Cleaned vector layer
-OutputVector|error|Errors layer
-
+OutputVector|error|Errors layer

python/plugins/sextante/otb/OTBAlgorithm.py

@@ -28,10 +28,8 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from sextante.core.GeoAlgorithm import GeoAlgorithm
-from sextante.parameters.ParameterTable import ParameterTable
 from sextante.parameters.ParameterMultipleInput import ParameterMultipleInput
 from sextante.parameters.ParameterRaster import ParameterRaster
-from sextante.outputs.OutputRaster import OutputRaster
 from sextante.parameters.ParameterVector import ParameterVector
 from sextante.parameters.ParameterBoolean import ParameterBoolean
 from sextante.parameters.ParameterSelection import ParameterSelection
@@ -87,11 +85,10 @@ def defineCharacteristicsFromFile(self):
                 line = line.strip("\n").strip()
                 if line.startswith("Parameter"):
                     param = ParameterFactory.getFromString(line)
-
                     # Hack for initializing the elevation parameters from Sextante configuration
-                    if param.name == "-elev.dem.path":
+                    if param.name == "-elev.dem.path" or param.name == "-elev.dem":
                         param.default = OTBUtils.otbSRTMPath()
-                    if param.name == "-elev.dem.geoid":
+                    elif param.name == "-elev.dem.geoid" or param.name == "-elev.geoid":
                         param.default = OTBUtils.otbGeoidPath()
                     self.addParameter(param)
                 elif line.startswith("*Parameter"):

python/plugins/sextante/otb/description/KmzExport.txt

@@ -4,10 +4,10 @@ Image to KMZ Export
 Miscellaneous
 ParameterRaster|-in|Input image|False
 OutputFile|-out|Output .kmz product
-ParameterNumber|-tilesize|Tile Size|None|None|0
+ParameterNumber|-tilesize|Tile Size|None|None|256
 ParameterRaster|-logo|Image logo|True
 ParameterRaster|-legend|Image legend|True
 ParameterSelection|-elev|Elevation management|dem;average|1
-ParameterFile|-elev.dem.path|DEM directory|
-ParameterFile|-elev.dem.geoid|Geoid File||
-ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
+ParameterString|-elev.dem|DEM directory|True
+ParameterFile|-elev.geoid|Geoid File|
+ParameterNumber|-elev.default|Average Elevation|None|None|0.0

python/plugins/sextante/saga/description/B-SplineApproximation.txt

@@ -5,5 +5,5 @@ ParameterTableField|FIELD|Attribute|SHAPES|-1|False
 ParameterSelection|TARGET|Target Grid|[0] user defined
 ParameterNumber|LEVEL|Resolution|None|None|1.0
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/CubicSplineApproximation.txt

@@ -8,5 +8,5 @@ ParameterNumber|NPMAX|Maximal Number of Points|None|None|20
 ParameterNumber|NPPC|Points per Square|None|None|5
 ParameterNumber|K|Tolerance|None|None|140.0
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/GeographicallyWeightedMultipleRegression.txt

@@ -14,7 +14,7 @@ ParameterSelection|NPOINTS|Number of Points|[0] maximum number of observations;[
 ParameterNumber|MAXPOINTS|Maximum Number of Observations|None|None|10
 ParameterNumber|MINPOINTS|Minimum Number of Observations|None|None|4
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_QUALITY|Quality
 OutputRaster|USER_INTERCEPT|Intercept
 OutputRaster|GRID_QUALITY|Quality

python/plugins/sextante/saga/description/GeographicallyWeightedRegression.txt

@@ -15,7 +15,7 @@ ParameterSelection|NPOINTS|Number of Points|[0] maximum number of observations;[
 ParameterNumber|MAXPOINTS|Maximum Number of Observations|None|None|10
 ParameterNumber|MINPOINTS|Minimum Number of Observations|None|None|4
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|0.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid
 OutputRaster|USER_QUALITY|Quality
 OutputRaster|USER_INTERCEPT|Intercept

python/plugins/sextante/saga/description/InverseDistanceWeighted.txt

@@ -12,5 +12,5 @@ ParameterSelection|MODE|Search Mode|[0] all directions;[1] quadrants
 ParameterSelection|POINTS|Number of Points|[0] maximum number of points;[1] all points
 ParameterNumber|NPOINTS|Maximum Number of Points|None|None|10
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|0.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/KernelDensityEstimation.txt

@@ -6,5 +6,5 @@ ParameterNumber|RADIUS|Radius|None|None|10
 ParameterSelection|KERNEL|Kernel|[0] quartic kernel;[1] gaussian kernel
 ParameterSelection|TARGET|Target Grid|[0] user defined
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/ModifedQuadraticShepard.txt

@@ -9,5 +9,5 @@ ParameterNumber|USER_XMIN|Left|None|None|0.0
 ParameterNumber|USER_XMAX|Right|None|None|0.0
 ParameterNumber|USER_YMIN|Bottom|None|None|0.0
 ParameterNumber|USER_YMAX|Top|None|None|0.0
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/MultilevelB-SplineInterpolation(fromGrid).txt

@@ -7,5 +7,5 @@ ParameterNumber|EPSILON|Threshold Error|None|None|0.0001
 ParameterNumber|LEVEL_MAX|Maximum Level|None|None|11.0
 ParameterSelection|DATATYPE|Data Type|[0] same as input grid;[1] floating point
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/MultilevelB-SplineInterpolation.txt

@@ -7,5 +7,5 @@ ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spli
 ParameterNumber|EPSILON|Threshold Error|None|None|0.0001
 ParameterNumber|LEVEL_MAX|Maximum Level|None|None|11.0
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/NaturalNeighbour.txt

@@ -5,5 +5,5 @@ ParameterTableField|FIELD|Attribute|SHAPES|-1|False
 ParameterSelection|TARGET|Target Grid|[0] user defined
 ParameterBoolean|SIBSON         |Sibson|True
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/NearestNeighbour.txt

@@ -4,5 +4,5 @@ ParameterVector|SHAPES|Points|0|False
 ParameterTableField|FIELD|Attribute|SHAPES|-1|False
 ParameterSelection|TARGET|Target Grid|[0] user defined
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/PolynomialRegression.txt

@@ -8,6 +8,6 @@ ParameterNumber|YORDER|Maximum Y Order|None|None|4
 ParameterNumber|TORDER|Maximum Total Order|None|None|4
 ParameterSelection|TARGET|Trend Surface|[0] user defined
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputVector|RESIDUALS|Residuals
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/RandomField.txt

@@ -2,7 +2,7 @@ Random Field
 grid_calculus
 ParameterNumber|NX|Width (Cells)|None|None|100
 ParameterNumber|NY|Height (Cells)|None|None|100
-ParameterNumber|CELLSIZE|Cellsize|None|None|1.0
+ParameterNumber|CELLSIZE|Cellsize|None|None|100.0
 ParameterNumber|XMIN|West|None|None|0.0
 ParameterNumber|YMIN|South|None|None|0.0
 ParameterSelection|METHOD|Method|[0] Uniform;[1] Gaussian

python/plugins/sextante/saga/description/Resampling.txt

@@ -6,5 +6,5 @@ ParameterSelection|TARGET|Target Grid|[0] user defined
 ParameterSelection|SCALE_UP_METHOD|Interpolation Method|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation;[5] Mean Value;[6] Mean Value (cell area weighted);[7] Minimum Value;[8] Maximum Value;[9] Majority
 ParameterSelection|SCALE_DOWN_METHOD|Interpolation Method|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/ShapestoGrid.txt

@@ -7,5 +7,5 @@ ParameterSelection|LINE_TYPE|Method for Lines|[0] thin;[1] thick
 ParameterSelection|GRID_TYPE|Preferred Target Grid Type|[0] Integer (1 byte);[1] Integer (2 byte);[2] Integer (4 byte);[3] Floating Point (4 byte);[4] Floating Point (8 byte)
 ParameterSelection|TARGET|Target Grid|[0] user defined
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/ThinPlateSpline(Global).txt

@@ -5,5 +5,5 @@ ParameterTableField|FIELD|Attribute|SHAPES|-1|False
 ParameterSelection|TARGET|Target Grid|[0] user defined
 ParameterNumber|REGUL|Regularisation|None|None|0.0
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/ThinPlateSpline(Local).txt

@@ -9,5 +9,5 @@ ParameterSelection|MODE|Search Mode|[0] all directions;[1] quadrants
 ParameterSelection|SELECT|Points Selection|[0] all points in search radius;[1] maximum number of points
 ParameterNumber|MAXPOINTS|Maximum Number of Points|None|None|10
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/ThinPlateSpline(TIN).txt

@@ -7,5 +7,5 @@ ParameterNumber|REGUL|Regularisation|None|None|0.0
 ParameterSelection|LEVEL|Neighbourhood|[0] immediate;[1] level 1;[2] level 2
 ParameterBoolean|FRAME          |Add Frame|True
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid

python/plugins/sextante/saga/description/Triangulation.txt

@@ -4,5 +4,5 @@ ParameterVector|SHAPES|Points|0|False
 ParameterTableField|FIELD|Attribute|SHAPES|-1|False
 ParameterSelection|TARGET|Target Grid|[0] user defined
 Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
-ParameterNumber|USER_SIZE|Cellsize|None|None|1.0
+ParameterNumber|USER_SIZE|Cellsize|None|None|100.0
 OutputRaster|USER_GRID|Grid