fixed bug #5361

changed saga and grass description filenames git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@101 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 16, 2012 · 2105287 · 2105287
1 parent 92b7dfd
commit 2105287
Show file tree

Hide file tree

Showing 431 changed files with 2,668 additions and 2,654 deletions.
diff --git a/src/sextante/ftools/MeanCoords.py b/src/sextante/ftools/MeanCoords.py
@@ -68,7 +68,10 @@ def processAlgorithm(self, progress):
                     if weightIndex == -1:
                         weight = 1.00
                     else:
-                        weight = float(feat.attributeMap()[weightIndex].toDouble()[0])
+                        try:
+                            weight = float(feat.attributeMap()[weightIndex].toDouble()[0])
+                        except:
+                            weight = 1.00
                     geom = QgsGeometry(feat.geometry())
                     geom = ftools_utils.extractPoints(geom)
                     for i in geom:

diff --git a/src/sextante/grass/GrassAlgorithmProvider.py b/src/sextante/grass/GrassAlgorithmProvider.py
@@ -48,12 +48,11 @@ def createAlgsList(self):
         folder = GrassUtils.grassDescriptionPath()
         for descriptionFile in os.listdir(folder):
             try:
-                if descriptionFile.startswith("alg_"):
-                    alg = GrassAlgorithm(os.path.join(folder, descriptionFile))
-                    if alg.name.strip() != "":
-                        self.preloadedAlgs.append(alg)
-                    else:
-                        SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
+                alg = GrassAlgorithm(os.path.join(folder, descriptionFile))
+                if alg.name.strip() != "":
+                    self.preloadedAlgs.append(alg)
+                else:
+                    SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
             except Exception,e:
                 SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
 
@@ -67,10 +66,10 @@ def getIcon(self):
         return  QIcon(os.path.dirname(__file__) + "/../images/grass.png")
 
     def createDescriptionFiles(self):
-        folder = GrassUtils.grassDescriptionPath()
+        folder = "C:\\descs\\grass"
         i = 0
-        for alg in self.algs:
-            f = open (os.path.join(folder, "alg_" + str(i)+".txt"), "w")
+        for alg in self.preloadedAlgs:
+            f = open (os.path.join(folder, alg.name +".txt"), "w")
             f.write(alg.name + "\n")
             f.write(alg.group + "\n")
             for param in alg.parameters:

diff --git a/src/sextante/grass/description/alg_109.txt b/src/sextante/grass/description/alg_109.txt
diff --git a/src/sextante/grass/description/alg_46.txt → src/sextante/grass/description/r.average.txt b/src/sextante/grass/description/alg_46.txt → src/sextante/grass/description/r.average.txt
diff --git a/src/sextante/grass/description/alg_77.txt → ...tante/grass/description/r.basins.fill.txt b/src/sextante/grass/description/alg_77.txt → ...tante/grass/description/r.basins.fill.txt
diff --git a/src/sextante/grass/description/alg_91.txt → ...sextante/grass/description/r.bilinear.txt b/src/sextante/grass/description/alg_91.txt → ...sextante/grass/description/r.bilinear.txt
diff --git a/src/sextante/grass/description/alg_107.txt → ...xtante/grass/description/r.bitpattern.txt b/src/sextante/grass/description/alg_107.txt → ...xtante/grass/description/r.bitpattern.txt
diff --git a/src/sextante/grass/description/alg_171.txt → src/sextante/grass/description/r.buffer.txt b/src/sextante/grass/description/alg_171.txt → src/sextante/grass/description/r.buffer.txt
diff --git a/src/sextante/grass/description/alg_162.txt → src/sextante/grass/description/r.carve.txt b/src/sextante/grass/description/alg_162.txt → src/sextante/grass/description/r.carve.txt
diff --git a/src/sextante/grass/description/alg_94.txt → src/sextante/grass/description/r.circle.txt b/src/sextante/grass/description/alg_94.txt → src/sextante/grass/description/r.circle.txt
diff --git a/src/sextante/grass/description/alg_0.txt → src/sextante/grass/description/r.clump.txt b/src/sextante/grass/description/alg_0.txt → src/sextante/grass/description/r.clump.txt
diff --git a/src/sextante/grass/description/alg_135.txt → src/sextante/grass/description/r.coin.txt b/src/sextante/grass/description/alg_135.txt → src/sextante/grass/description/r.coin.txt
diff --git a/src/sextante/grass/description/alg_13.txt → src/sextante/grass/description/r.colors.txt b/src/sextante/grass/description/alg_13.txt → src/sextante/grass/description/r.colors.txt
diff --git a/src/sextante/grass/description/alg_2.txt → ...extante/grass/description/r.composite.txt b/src/sextante/grass/description/alg_2.txt → ...extante/grass/description/r.composite.txt
@@ -3,10 +3,10 @@ Raster (r.*)
 ParameterRaster|red|red|False
 ParameterRaster|green|green|False
 ParameterRaster|blue|blue|False
-ParameterNumber|levels|levels|1|256|32
-ParameterNumber|lev_red|lev_red|1|256|32
-ParameterNumber|lev_green|lev_green|1|256|32
-ParameterNumber|lev_blue|lev_blue|1|256|32
+ParameterNumber|levels|levels|1.0|256.0|32
+ParameterNumber|lev_red|lev_red|1.0|256.0|32
+ParameterNumber|lev_green|lev_green|1.0|256.0|32
+ParameterNumber|lev_blue|lev_blue|1.0|256.0|32
 ParameterString|lev_red|lev_red|
 ParameterString|lev_green|lev_green|
 ParameterString|lev_blue|lev_blue|

diff --git a/src/sextante/grass/description/alg_12.txt → src/sextante/grass/description/r.contour.txt b/src/sextante/grass/description/alg_12.txt → src/sextante/grass/description/r.contour.txt
diff --git a/src/sextante/grass/description/alg_84.txt → src/sextante/grass/description/r.cost.txt b/src/sextante/grass/description/alg_84.txt → src/sextante/grass/description/r.cost.txt
diff --git a/src/sextante/grass/description/alg_122.txt → src/sextante/grass/description/r.covar.txt b/src/sextante/grass/description/alg_122.txt → src/sextante/grass/description/r.covar.txt
@@ -1,5 +1,4 @@
 r.covar
 Raster (r.*)
-ParameterMultipleInput|map|map|3|False
+ParameterMultipleInput|map|map|3.0|False
 ParameterBoolean|-r|-r|True
-
diff --git a/src/sextante/grass/description/alg_56.txt → src/sextante/grass/description/r.cross.txt b/src/sextante/grass/description/alg_56.txt → src/sextante/grass/description/r.cross.txt
@@ -1,6 +1,6 @@
 r.cross
 Raster (r.*)
-ParameterMultipleInput|input|input|3|False
+ParameterMultipleInput|input|input|3.0|False
 ParameterBoolean|-z|-z|True
 ParameterBoolean|-q|-q|True
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_67.txt → src/sextante/grass/description/r.cva.txt b/src/sextante/grass/description/alg_67.txt → src/sextante/grass/description/r.cva.txt
diff --git a/src/sextante/grass/description/alg_156.txt → ...sextante/grass/description/r.describe.txt b/src/sextante/grass/description/alg_156.txt → ...sextante/grass/description/r.describe.txt
@@ -2,7 +2,7 @@ r.describe
 Raster (r.*)
 ParameterRaster|map|map|False
 ParameterString|nv|nv|*
-ParameterNumber|nsteps|nsteps|1|None|255
+ParameterNumber|nsteps|nsteps|1.0|None|255
 ParameterBoolean|-1|-1|True
 ParameterBoolean|-r|-r|True
 ParameterBoolean|-n|-n|True

diff --git a/src/sextante/grass/description/alg_74.txt → ...sextante/grass/description/r.distance.txt b/src/sextante/grass/description/alg_74.txt → ...sextante/grass/description/r.distance.txt
diff --git a/src/sextante/grass/description/alg_33.txt → src/sextante/grass/description/r.drain.txt b/src/sextante/grass/description/alg_33.txt → src/sextante/grass/description/r.drain.txt
@@ -2,7 +2,7 @@ r.drain
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|coordinate|coordinate(E,N)|
-ParameterMultipleInput|vector_points|vector_points|0|False
+ParameterMultipleInput|vector_points|vector_points|0.0|False
 ParameterBoolean|-c|-c|True
 ParameterBoolean|-a|-a|True
 ParameterBoolean|-n|-n|True

diff --git a/src/sextante/grass/description/alg_132.txt → ...sextante/grass/description/r.fill.dir.txt b/src/sextante/grass/description/alg_132.txt → ...sextante/grass/description/r.fill.dir.txt
diff --git a/src/sextante/grass/description/alg_147.txt → ...extante/grass/description/r.fillnulls.txt b/src/sextante/grass/description/alg_147.txt → ...extante/grass/description/r.fillnulls.txt
diff --git a/src/sextante/grass/description/alg_87.txt → src/sextante/grass/description/r.flow.txt b/src/sextante/grass/description/alg_87.txt → src/sextante/grass/description/r.flow.txt
diff --git a/src/sextante/grass/description/alg_41.txt → ...nte/grass/description/r.grow.distance.txt b/src/sextante/grass/description/alg_41.txt → ...nte/grass/description/r.grow.distance.txt
diff --git a/src/sextante/grass/description/alg_85.txt → src/sextante/grass/description/r.grow.txt b/src/sextante/grass/description/alg_85.txt → src/sextante/grass/description/r.grow.txt
diff --git a/src/sextante/grass/description/alg_43.txt → src/sextante/grass/description/r.gwflow.txt b/src/sextante/grass/description/alg_43.txt → src/sextante/grass/description/r.gwflow.txt
diff --git a/src/sextante/grass/description/alg_47.txt → src/sextante/grass/description/r.his.txt b/src/sextante/grass/description/alg_47.txt → src/sextante/grass/description/r.his.txt
diff --git a/src/sextante/grass/description/alg_96.txt → src/sextante/grass/description/r.horizon.txt b/src/sextante/grass/description/alg_96.txt → src/sextante/grass/description/r.horizon.txt
diff --git a/src/sextante/grass/description/alg_29.txt → src/sextante/grass/description/r.info.txt b/src/sextante/grass/description/alg_29.txt → src/sextante/grass/description/r.info.txt
diff --git a/src/sextante/grass/description/alg_178.txt → src/sextante/grass/description/r.kappa.txt b/src/sextante/grass/description/alg_178.txt → src/sextante/grass/description/r.kappa.txt
diff --git a/src/sextante/grass/description/alg_4.txt → src/sextante/grass/description/r.lake.txt b/src/sextante/grass/description/alg_4.txt → src/sextante/grass/description/r.lake.txt
diff --git a/src/sextante/grass/description/alg_8.txt → src/sextante/grass/description/r.los.txt b/src/sextante/grass/description/alg_8.txt → src/sextante/grass/description/r.los.txt
diff --git a/src/sextante/grass/description/alg_151.txt → ...nte/grass/description/r.mapcalculator.txt b/src/sextante/grass/description/alg_151.txt → ...nte/grass/description/r.mapcalculator.txt
diff --git a/src/sextante/grass/description/alg_51.txt → src/sextante/grass/description/r.median.txt b/src/sextante/grass/description/alg_51.txt → src/sextante/grass/description/r.median.txt
diff --git a/src/sextante/grass/description/alg_73.txt → ...xtante/grass/description/r.mfilter.fp.txt b/src/sextante/grass/description/alg_73.txt → ...xtante/grass/description/r.mfilter.fp.txt
diff --git a/src/sextante/grass/description/alg_28.txt → src/sextante/grass/description/r.mfilter.txt b/src/sextante/grass/description/alg_28.txt → src/sextante/grass/description/r.mfilter.txt
@@ -2,7 +2,7 @@ r.mfilter
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|filter|filter|/file
-ParameterNumber|repeat|repeat|1|100|1
+ParameterNumber|repeat|repeat|1.0|100.0|1
 ParameterString|title|title|
 ParameterBoolean|-q|-q|True
 ParameterBoolean|-z|-z|True

diff --git a/src/sextante/grass/description/alg_36.txt → src/sextante/grass/description/r.mode.txt b/src/sextante/grass/description/alg_36.txt → src/sextante/grass/description/r.mode.txt
diff --git a/src/sextante/grass/description/alg_157.txt → ...extante/grass/description/r.neighbors.txt b/src/sextante/grass/description/alg_157.txt → ...extante/grass/description/r.neighbors.txt
@@ -2,6 +2,6 @@ r.neighbors
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterSelection|method|method|average;median;mode;minimum;maximum;stddev;sum;variance;diversity;interspersion
-ParameterNumber|size|size|1|None|3
+ParameterNumber|size|size|1.0|None|3
 ParameterBoolean|-c|-c|True
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_95.txt → src/sextante/grass/description/r.out.arc.txt b/src/sextante/grass/description/alg_95.txt → src/sextante/grass/description/r.out.arc.txt
diff --git a/src/sextante/grass/description/alg_19.txt → ...extante/grass/description/r.out.ascii.txt b/src/sextante/grass/description/alg_19.txt → ...extante/grass/description/r.out.ascii.txt
diff --git a/src/sextante/grass/description/alg_20.txt → ...tante/grass/description/r.out.gridatb.txt b/src/sextante/grass/description/alg_20.txt → ...tante/grass/description/r.out.gridatb.txt
diff --git a/src/sextante/grass/description/alg_49.txt → src/sextante/grass/description/r.out.ppm.txt b/src/sextante/grass/description/alg_49.txt → src/sextante/grass/description/r.out.ppm.txt
diff --git a/src/sextante/grass/description/alg_81.txt → ...sextante/grass/description/r.out.vrml.txt b/src/sextante/grass/description/alg_81.txt → ...sextante/grass/description/r.out.vrml.txt
diff --git a/src/sextante/grass/description/alg_78.txt → ...tante/grass/description/r.param.scale.txt b/src/sextante/grass/description/alg_78.txt → ...tante/grass/description/r.param.scale.txt
diff --git a/src/sextante/grass/description/alg_1.txt → src/sextante/grass/description/r.patch.txt b/src/sextante/grass/description/alg_1.txt → src/sextante/grass/description/r.patch.txt
@@ -1,6 +1,6 @@
 r.patch
 Raster (r.*)
-ParameterMultipleInput|input|input|1|False
+ParameterMultipleInput|input|input|1.0|False
 ParameterBoolean|-q|-q|True
 ParameterBoolean|-z|-z|True
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_110.txt → src/sextante/grass/description/r.plane.txt b/src/sextante/grass/description/alg_110.txt → src/sextante/grass/description/r.plane.txt
diff --git a/src/sextante/grass/description/alg_161.txt → src/sextante/grass/description/r.profile.txt b/src/sextante/grass/description/alg_161.txt → src/sextante/grass/description/r.profile.txt
diff --git a/src/sextante/grass/description/alg_50.txt → ...xtante/grass/description/r.prominence.txt b/src/sextante/grass/description/alg_50.txt → ...xtante/grass/description/r.prominence.txt
@@ -1,7 +1,7 @@
 r.prominence
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterNumber|radius|radius|1|None|1
+ParameterNumber|radius|radius|1.0|None|1
 ParameterBoolean|-a|-a|True
 ParameterBoolean|-l|-l|True
 ParameterBoolean|-g|-g|True

diff --git a/src/sextante/grass/description/alg_35.txt → src/sextante/grass/description/r.quant.txt b/src/sextante/grass/description/alg_35.txt → src/sextante/grass/description/r.quant.txt
@@ -1,7 +1,7 @@
 r.quant
 Raster (r.*)
 ParameterRaster|basemap|basemap|False
-ParameterMultipleInput|input|input|1|False
+ParameterMultipleInput|input|input|1.0|False
 ParameterString|fprange|fprange(dmin,dmax)|0,1
 ParameterString|range|range|1,255
 ParameterBoolean|-t|-t|True

diff --git a/src/sextante/grass/description/alg_115.txt → ...sextante/grass/description/r.quantile.txt b/src/sextante/grass/description/alg_115.txt → ...sextante/grass/description/r.quantile.txt
@@ -1,6 +1,6 @@
 r.quantile
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterNumber|quantiles|quantiles|2|None|4
+ParameterNumber|quantiles|quantiles|2.0|None|4
 ParameterString|percentiles|percentiles|
 ParameterBoolean|-r|-r|True
diff --git a/src/sextante/grass/description/alg_40.txt → ...ante/grass/description/r.random.cells.txt b/src/sextante/grass/description/alg_40.txt → ...ante/grass/description/r.random.cells.txt
@@ -2,4 +2,4 @@ r.random.cells
 Raster (r.*)
 ParameterNumber|distance|distance|None|None|0.0
 ParameterNumber|seed|seed|None|None|0.0
-OutputRaster|output|output
+OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_105.txt → src/sextante/grass/description/r.random.txt b/src/sextante/grass/description/alg_105.txt → src/sextante/grass/description/r.random.txt
diff --git a/src/sextante/grass/description/alg_44b.txt → ...ante/grass/description/r.reclass.area.txt b/src/sextante/grass/description/alg_44b.txt → ...ante/grass/description/r.reclass.area.txt
@@ -1,5 +1,5 @@
-r.reclass.area
-Raster (r.*)
-ParameterRaster|input|input|False
-ParameterNumber|greater|greater|None|None|0.0
-OutputRaster|output|output
+r.reclass.area
+Raster (r.*)
+ParameterRaster|input|input|False
+ParameterNumber|greater|greater|None|None|0.0
+OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_117.txt → src/sextante/grass/description/r.reclass.txt b/src/sextante/grass/description/alg_117.txt → src/sextante/grass/description/r.reclass.txt
diff --git a/src/sextante/grass/description/alg_72.txt → src/sextante/grass/description/r.recode.txt b/src/sextante/grass/description/alg_72.txt → src/sextante/grass/description/r.recode.txt
diff --git a/src/sextante/grass/description/alg_155.txt → ...e/grass/description/r.regression.line.txt b/src/sextante/grass/description/alg_155.txt → ...e/grass/description/r.regression.line.txt
diff --git a/src/sextante/grass/description/alg_142.txt → src/sextante/grass/description/r.report.txt b/src/sextante/grass/description/alg_142.txt → src/sextante/grass/description/r.report.txt
@@ -1,6 +1,6 @@
 r.report
 Raster (r.*)
-ParameterMultipleInput|map|map|3|False
+ParameterMultipleInput|map|map|3.0|False
 ParameterSelection|units|units|mi;me;k;a;h;c;p
 ParameterString|null|null|*
 ParameterNumber|nsteps|nsteps|None|None|255

diff --git a/src/sextante/grass/description/alg_144.txt → ...nte/grass/description/r.resamp.interp.txt b/src/sextante/grass/description/alg_144.txt → ...nte/grass/description/r.resamp.interp.txt
diff --git a/src/sextante/grass/description/alg_6.txt → ...xtante/grass/description/r.resamp.rst.txt b/src/sextante/grass/description/alg_6.txt → ...xtante/grass/description/r.resamp.rst.txt
@@ -1,9 +1,7 @@
 r.resamp.rst
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterNumber|ew_res|ew_res|0|None|1
-Parameternumber|ns_res|ns_res|0|None|1
+ParameterNumber|ew_res|ew_res|0.0|None|1
 ParameterBoolean|-t|-t|True
 ParameterBoolean|-d|-d|True
 OutputRaster|elev|elev
-
diff --git a/src/sextante/grass/description/alg_17.txt → ...ante/grass/description/r.resamp.stats.txt b/src/sextante/grass/description/alg_17.txt → ...ante/grass/description/r.resamp.stats.txt
diff --git a/src/sextante/grass/description/alg_121.txt → ...sextante/grass/description/r.resample.txt b/src/sextante/grass/description/alg_121.txt → ...sextante/grass/description/r.resample.txt
diff --git a/src/sextante/grass/description/alg_21.txt → ...xtante/grass/description/r.rescale.eq.txt b/src/sextante/grass/description/alg_21.txt → ...xtante/grass/description/r.rescale.eq.txt
diff --git a/src/sextante/grass/description/alg_130.txt → src/sextante/grass/description/r.rescale.txt b/src/sextante/grass/description/alg_130.txt → src/sextante/grass/description/r.rescale.txt
diff --git a/src/sextante/grass/description/alg_10.txt → src/sextante/grass/description/r.ros.txt b/src/sextante/grass/description/alg_10.txt → src/sextante/grass/description/r.ros.txt
diff --git a/src/sextante/grass/description/alg_97.txt → ...nte/grass/description/r.shaded.relief.txt b/src/sextante/grass/description/alg_97.txt → ...nte/grass/description/r.shaded.relief.txt
diff --git a/src/sextante/grass/description/alg_159.txt → ...ante/grass/description/r.sim.sediment.txt b/src/sextante/grass/description/alg_159.txt → ...ante/grass/description/r.sim.sediment.txt
diff --git a/src/sextante/grass/description/alg_119.txt → ...extante/grass/description/r.sim.water.txt b/src/sextante/grass/description/alg_119.txt → ...extante/grass/description/r.sim.water.txt
diff --git a/src/sextante/grass/description/alg_82.txt → ...ante/grass/description/r.slope.aspect.txt b/src/sextante/grass/description/alg_82.txt → ...ante/grass/description/r.slope.aspect.txt
diff --git a/src/sextante/grass/description/alg_88.txt → src/sextante/grass/description/r.spread.txt b/src/sextante/grass/description/alg_88.txt → src/sextante/grass/description/r.spread.txt
diff --git a/src/sextante/grass/description/alg_98.txt → ...xtante/grass/description/r.spreadpath.txt b/src/sextante/grass/description/alg_98.txt → ...xtante/grass/description/r.spreadpath.txt
diff --git a/src/sextante/grass/description/alg_58.txt → ...xtante/grass/description/r.statistics.txt b/src/sextante/grass/description/alg_58.txt → ...xtante/grass/description/r.statistics.txt
diff --git a/src/sextante/grass/description/alg_133.txt → src/sextante/grass/description/r.stats.txt b/src/sextante/grass/description/alg_133.txt → src/sextante/grass/description/r.stats.txt
@@ -1,6 +1,6 @@
 r.stats
 Raster (r.*)
-ParameterMultipleInput|input|input|3|False
+ParameterMultipleInput|input|input|3.0|False
 ParameterString|output|output|/file
 ParameterString|fs|fs|space
 ParameterString|nv|nv|*

diff --git a/src/sextante/grass/description/alg_30.txt → src/sextante/grass/description/r.sum.txt b/src/sextante/grass/description/alg_30.txt → src/sextante/grass/description/r.sum.txt
diff --git a/src/sextante/grass/description/alg_25.txt → src/sextante/grass/description/r.sun.txt b/src/sextante/grass/description/alg_25.txt → src/sextante/grass/description/r.sun.txt
diff --git a/src/sextante/grass/description/alg_76.txt → src/sextante/grass/description/r.sunmask.txt b/src/sextante/grass/description/alg_76.txt → src/sextante/grass/description/r.sunmask.txt
diff --git a/src/sextante/grass/description/alg_39.txt → ...extante/grass/description/r.surf.area.txt b/src/sextante/grass/description/alg_39.txt → ...extante/grass/description/r.surf.area.txt
diff --git a/src/sextante/grass/description/alg_118.txt → ...ante/grass/description/r.surf.contour.txt b/src/sextante/grass/description/alg_118.txt → ...ante/grass/description/r.surf.contour.txt
diff --git a/src/sextante/grass/description/alg_9.txt → ...xtante/grass/description/r.surf.gauss.txt b/src/sextante/grass/description/alg_9.txt → ...xtante/grass/description/r.surf.gauss.txt
diff --git a/src/sextante/grass/description/alg_177.txt → ...sextante/grass/description/r.surf.idw.txt b/src/sextante/grass/description/alg_177.txt → ...sextante/grass/description/r.surf.idw.txt
@@ -1,6 +1,6 @@
 r.surf.idw
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterNumber|npoints|npoints|1|None|12
+ParameterNumber|npoints|npoints|1.0|None|12
 ParameterBoolean|-e|-e|False
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_153.txt → ...extante/grass/description/r.surf.idw2.txt b/src/sextante/grass/description/alg_153.txt → ...extante/grass/description/r.surf.idw2.txt
@@ -1,5 +1,5 @@
 r.surf.idw2
 Raster (r.*)
 ParameterRaster|input|input|False
-ParameterNumber|npoints|npoints|1|None|12
+ParameterNumber|npoints|npoints|1.0|None|12
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/alg_172.txt → ...tante/grass/description/r.surf.random.txt b/src/sextante/grass/description/alg_172.txt → ...tante/grass/description/r.surf.random.txt
diff --git a/src/sextante/grass/description/alg_152.txt → ...e/grass/description/r.terraflow.short.txt b/src/sextante/grass/description/alg_152.txt → ...e/grass/description/r.terraflow.short.txt
diff --git a/src/sextante/grass/description/alg_146.txt → ...extante/grass/description/r.terraflow.txt b/src/sextante/grass/description/alg_146.txt → ...extante/grass/description/r.terraflow.txt
diff --git a/src/sextante/grass/description/alg_18.txt → src/sextante/grass/description/r.texture.txt b/src/sextante/grass/description/alg_18.txt → src/sextante/grass/description/r.texture.txt
diff --git a/src/sextante/grass/description/alg_38.txt → src/sextante/grass/description/r.thin.txt b/src/sextante/grass/description/alg_38.txt → src/sextante/grass/description/r.thin.txt
diff --git a/src/sextante/grass/description/alg_59.txt → src/sextante/grass/description/r.to.vect.txt b/src/sextante/grass/description/alg_59.txt → src/sextante/grass/description/r.to.vect.txt
diff --git a/src/sextante/grass/description/alg_139.txt → src/sextante/grass/description/r.topidx.txt b/src/sextante/grass/description/alg_139.txt → src/sextante/grass/description/r.topidx.txt
diff --git a/src/sextante/grass/description/alg_64.txt → ...sextante/grass/description/r.topmodel.txt b/src/sextante/grass/description/alg_64.txt → ...sextante/grass/description/r.topmodel.txt
diff --git a/src/sextante/grass/description/alg_106.txt → ...sextante/grass/description/r.transect.txt b/src/sextante/grass/description/alg_106.txt → ...sextante/grass/description/r.transect.txt
diff --git a/src/sextante/grass/description/alg_24.txt → ...extante/grass/description/r.univar.sh.txt b/src/sextante/grass/description/alg_24.txt → ...extante/grass/description/r.univar.sh.txt
diff --git a/src/sextante/grass/description/r.univar.txt b/src/sextante/grass/description/r.univar.txt
@@ -0,0 +1,5 @@
+r.univar
+Raster (r.*)
+ParameterMultipleInput|map|map|3.0|False
+ParameterNumber|percentile|percentile|0.0|100.0|90
+ParameterBoolean|-e|-e|True
diff --git a/src/sextante/grass/description/alg_112.txt → src/sextante/grass/description/r.volume.txt b/src/sextante/grass/description/alg_112.txt → src/sextante/grass/description/r.volume.txt
diff --git a/src/sextante/grass/description/alg_42.txt → src/sextante/grass/description/r.walk.txt b/src/sextante/grass/description/alg_42.txt → src/sextante/grass/description/r.walk.txt
diff --git a/src/sextante/grass/description/alg_89.txt → ...ante/grass/description/r.water.outlet.txt b/src/sextante/grass/description/alg_89.txt → ...ante/grass/description/r.water.outlet.txt
diff --git a/src/sextante/grass/description/alg_123.txt → ...extante/grass/description/r.watershed.txt b/src/sextante/grass/description/alg_123.txt → ...extante/grass/description/r.watershed.txt
diff --git a/src/sextante/grass/description/alg_45.txt → src/sextante/grass/description/v.buffer.txt b/src/sextante/grass/description/alg_45.txt → src/sextante/grass/description/v.buffer.txt
diff --git a/src/sextante/grass/description/alg_113.txt → src/sextante/grass/description/v.class.txt b/src/sextante/grass/description/alg_113.txt → src/sextante/grass/description/v.class.txt
@@ -4,5 +4,5 @@ ParameterVector|map|map|-1|False
 ParameterTableField|column|column|map
 ParameterString|where|where|
 ParameterSelection|algorithm|algorithm|int;std;qua;equ;dis
-ParameterNumber|nbclasses|nbclasses|2|None|3
+ParameterNumber|nbclasses|nbclasses|2.0|None|3
 ParameterBoolean|-g|-g|True
diff --git a/src/sextante/grass/description/alg_65.txt → src/sextante/grass/description/v.clean.txt b/src/sextante/grass/description/alg_65.txt → src/sextante/grass/description/v.clean.txt
diff --git a/src/sextante/grass/description/alg_79.txt → ...xtante/grass/description/v.crossbones.txt b/src/sextante/grass/description/alg_79.txt → ...xtante/grass/description/v.crossbones.txt
diff --git a/src/sextante/grass/description/alg_23.txt → ...sextante/grass/description/v.delaunay.txt b/src/sextante/grass/description/alg_23.txt → ...sextante/grass/description/v.delaunay.txt
diff --git a/src/sextante/grass/description/alg_83.txt → ...sextante/grass/description/v.dissolve.txt b/src/sextante/grass/description/alg_83.txt → ...sextante/grass/description/v.dissolve.txt
diff --git a/src/sextante/grass/description/alg_124.txt → ...sextante/grass/description/v.distance.txt b/src/sextante/grass/description/alg_124.txt → ...sextante/grass/description/v.distance.txt
diff --git a/src/sextante/grass/description/alg_129.txt → src/sextante/grass/description/v.drape.txt b/src/sextante/grass/description/alg_129.txt → src/sextante/grass/description/v.drape.txt
diff --git a/src/sextante/grass/description/alg_93.txt → src/sextante/grass/description/v.extract.txt b/src/sextante/grass/description/alg_93.txt → src/sextante/grass/description/v.extract.txt
diff --git a/src/sextante/grass/description/alg_63.txt → src/sextante/grass/description/v.extrude.txt b/src/sextante/grass/description/alg_63.txt → src/sextante/grass/description/v.extrude.txt
diff --git a/src/sextante/grass/description/alg_90.txt → ...xtante/grass/description/v.generalize.txt b/src/sextante/grass/description/alg_90.txt → ...xtante/grass/description/v.generalize.txt
diff --git a/src/sextante/grass/description/alg_126.txt → src/sextante/grass/description/v.hull.txt b/src/sextante/grass/description/alg_126.txt → src/sextante/grass/description/v.hull.txt
diff --git a/src/sextante/grass/description/alg_34.txt → src/sextante/grass/description/v.in.dxf.txt b/src/sextante/grass/description/alg_34.txt → src/sextante/grass/description/v.in.dxf.txt
diff --git a/src/sextante/grass/description/alg_48.txt → src/sextante/grass/description/v.in.wfs.txt b/src/sextante/grass/description/alg_48.txt → src/sextante/grass/description/v.in.wfs.txt
diff --git a/src/sextante/grass/description/alg_125.txt → src/sextante/grass/description/v.info.txt b/src/sextante/grass/description/alg_125.txt → src/sextante/grass/description/v.info.txt
diff --git a/src/sextante/grass/description/alg_150.txt → src/sextante/grass/description/v.kcv.txt b/src/sextante/grass/description/alg_150.txt → src/sextante/grass/description/v.kcv.txt
@@ -1,7 +1,7 @@
 v.kcv
 Vector (v.*)
 ParameterVector|input|input|-1|False
-ParameterNumber|k|k|2|None|10
+ParameterNumber|k|k|2.0|None|10
 ParameterString|column|column|part
 ParameterBoolean|-d|-d|True
 ParameterBoolean|-q|-q|True

diff --git a/src/sextante/grass/description/alg_16.txt → .../grass/description/v.lidar.correction.txt b/src/sextante/grass/description/alg_16.txt → .../grass/description/v.lidar.correction.txt
diff --git a/src/sextante/grass/description/alg_116.txt → ...ass/description/v.lidar.edgedetection.txt b/src/sextante/grass/description/alg_116.txt → ...ass/description/v.lidar.edgedetection.txt
diff --git a/src/sextante/grass/description/alg_69.txt → ...nte/grass/description/v.lidar.growing.txt b/src/sextante/grass/description/alg_69.txt → ...nte/grass/description/v.lidar.growing.txt
diff --git a/src/sextante/grass/description/alg_158.txt → src/sextante/grass/description/v.mkgrid.txt b/src/sextante/grass/description/alg_158.txt → src/sextante/grass/description/v.mkgrid.txt
diff --git a/src/sextante/grass/description/alg_174.txt → ...extante/grass/description/v.neighbors.txt b/src/sextante/grass/description/alg_174.txt → ...extante/grass/description/v.neighbors.txt
diff --git a/src/sextante/grass/description/alg_160.txt → src/sextante/grass/description/v.normal.txt b/src/sextante/grass/description/alg_160.txt → src/sextante/grass/description/v.normal.txt
diff --git a/src/sextante/grass/description/alg_14.txt → src/sextante/grass/description/v.out.dxf.txt b/src/sextante/grass/description/alg_14.txt → src/sextante/grass/description/v.out.dxf.txt
diff --git a/src/sextante/grass/description/alg_52.txt → src/sextante/grass/description/v.out.pov.txt b/src/sextante/grass/description/alg_52.txt → src/sextante/grass/description/v.out.pov.txt
diff --git a/src/sextante/grass/description/alg_136.txt → src/sextante/grass/description/v.outlier.txt b/src/sextante/grass/description/alg_136.txt → src/sextante/grass/description/v.outlier.txt
diff --git a/src/sextante/grass/description/alg_26.txt → src/sextante/grass/description/v.overlay.txt b/src/sextante/grass/description/alg_26.txt → src/sextante/grass/description/v.overlay.txt
diff --git a/src/sextante/grass/description/alg_165.txt → ...sextante/grass/description/v.parallel.txt b/src/sextante/grass/description/alg_165.txt → ...sextante/grass/description/v.parallel.txt
diff --git a/src/sextante/grass/description/alg_127.txt → src/sextante/grass/description/v.patch.txt b/src/sextante/grass/description/alg_127.txt → src/sextante/grass/description/v.patch.txt
@@ -1,6 +1,6 @@
 v.patch
 Vector (v.*)
-ParameterMultipleInput|input|input|-1|False
+ParameterMultipleInput|input|input|-1.0|False
 ParameterBoolean|-a|-a|True
 ParameterBoolean|-e|-e|True
 OutputVector|output|output

diff --git a/src/sextante/grass/description/alg_54.txt → src/sextante/grass/description/v.perturb.txt b/src/sextante/grass/description/alg_54.txt → src/sextante/grass/description/v.perturb.txt
diff --git a/src/sextante/grass/description/alg_120.txt → src/sextante/grass/description/v.qcount.txt b/src/sextante/grass/description/alg_120.txt → src/sextante/grass/description/v.qcount.txt
@@ -1,6 +1,6 @@
 v.qcount
 Vector (v.*)
 ParameterVector|input|input|0|False
-ParameterNumber|n|n|0|None|4
-ParameterNumber|r|r|0|None|10
+ParameterNumber|n|n|0.0|None|4
+ParameterNumber|r|r|0.0|None|10
 OutputVector|output|output
diff --git a/src/sextante/grass/description/alg_3.txt → src/sextante/grass/description/v.random.txt b/src/sextante/grass/description/alg_3.txt → src/sextante/grass/description/v.random.txt
diff --git a/src/sextante/grass/description/alg_134.txt → ...xtante/grass/description/v.rast.stats.txt b/src/sextante/grass/description/alg_134.txt → ...xtante/grass/description/v.rast.stats.txt
@@ -3,6 +3,6 @@ Vector (v.*)
 ParameterVector|vector|vector|-1|False
 ParameterRaster|raster|raster|False
 ParameterString|colprefix|colprefix|
-ParameterNumber|percentile|percentile|0|100|90
+ParameterNumber|percentile|percentile|0.0|100.0|90
 ParameterBoolean|-c|-c|True
 ParameterBoolean|-e|-e|True
diff --git a/src/sextante/grass/description/alg_31.txt → src/sextante/grass/description/v.reclass.txt b/src/sextante/grass/description/alg_31.txt → src/sextante/grass/description/v.reclass.txt
diff --git a/src/sextante/grass/description/alg_86.txt → src/sextante/grass/description/v.report.txt b/src/sextante/grass/description/alg_86.txt → src/sextante/grass/description/v.report.txt
diff --git a/src/sextante/grass/description/alg_7.txt → src/sextante/grass/description/v.sample.txt b/src/sextante/grass/description/alg_7.txt → src/sextante/grass/description/v.sample.txt
diff --git a/src/sextante/grass/description/alg_176.txt → src/sextante/grass/description/v.segment.txt b/src/sextante/grass/description/alg_176.txt → src/sextante/grass/description/v.segment.txt
diff --git a/src/sextante/grass/description/alg_131.txt → src/sextante/grass/description/v.select.txt b/src/sextante/grass/description/alg_131.txt → src/sextante/grass/description/v.select.txt
diff --git a/src/sextante/grass/description/alg_149.txt → src/sextante/grass/description/v.split.txt b/src/sextante/grass/description/alg_149.txt → src/sextante/grass/description/v.split.txt
diff --git a/src/sextante/grass/description/alg_75.txt → ...ante/grass/description/v.surf.bspline.txt b/src/sextante/grass/description/alg_75.txt → ...ante/grass/description/v.surf.bspline.txt
diff --git a/src/sextante/grass/description/alg_92.txt → ...sextante/grass/description/v.surf.idw.txt b/src/sextante/grass/description/alg_92.txt → ...sextante/grass/description/v.surf.idw.txt
diff --git a/src/sextante/grass/description/alg_99.txt → ...sextante/grass/description/v.surf.rst.txt b/src/sextante/grass/description/alg_99.txt → ...sextante/grass/description/v.surf.rst.txt
@@ -7,8 +7,8 @@ ParameterTableField|zcolumn|zcolumn|input
 ParameterNumber|tension|tension|None|None|40
 ParameterNumber|segmax|segmax|None|None|40
 ParameterNumber|npmin|npmin|None|None|300
-ParameterNumber|dmin|dmin|None|None|0.500000
-ParameterNumber|dmax|dmax|None|None|2.500000
+ParameterNumber|dmin|dmin|None|None|0.5
+ParameterNumber|dmax|dmax|None|None|2.5
 ParameterNumber|zmult|zmult|None|None|1.0
 ParameterNumber|theta|theta|None|None|0
 ParameterNumber|scalex|scalex|None|None|0

diff --git a/src/sextante/grass/description/alg_15.txt → src/sextante/grass/description/v.to.3d.txt b/src/sextante/grass/description/alg_15.txt → src/sextante/grass/description/v.to.3d.txt
diff --git a/src/sextante/grass/description/alg_111.txt → ...extante/grass/description/v.to.points.txt b/src/sextante/grass/description/alg_111.txt → ...extante/grass/description/v.to.points.txt
diff --git a/src/sextante/grass/description/alg_37.txt → src/sextante/grass/description/v.to.rast.txt b/src/sextante/grass/description/alg_37.txt → src/sextante/grass/description/v.to.rast.txt
diff --git a/src/sextante/grass/description/alg_70.txt → ...extante/grass/description/v.transform.txt b/src/sextante/grass/description/alg_70.txt → ...extante/grass/description/v.transform.txt
diff --git a/src/sextante/grass/description/alg_11.txt → src/sextante/grass/description/v.univar.txt b/src/sextante/grass/description/alg_11.txt → src/sextante/grass/description/v.univar.txt
diff --git a/src/sextante/grass/description/alg_169.txt → src/sextante/grass/description/v.vol.rst.txt b/src/sextante/grass/description/alg_169.txt → src/sextante/grass/description/v.vol.rst.txt
diff --git a/src/sextante/grass/description/alg_102.txt → src/sextante/grass/description/v.voronoi.txt b/src/sextante/grass/description/alg_102.txt → src/sextante/grass/description/v.voronoi.txt
diff --git a/src/sextante/gui/HistoryDialog.py b/src/sextante/gui/HistoryDialog.py
@@ -33,10 +33,20 @@ def setupUi(self):
         self.verticalLayout.addWidget(self.text)
         self.text.setObjectName("text")
         self.text.setReadOnly(True)
+        self.closeButton = QtGui.QPushButton()
+        self.closeButton.setObjectName("closeButton")
+        self.closeButton.setText("Close")
+        QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow)
+        self.verticalLayout.addWidget(self.closeButton)
         self.setWindowTitle("History")
         self.setLayout(self.verticalLayout)
         QtCore.QMetaObject.connectSlotsByName(self)
 
+
+    def closeWindow(self):
+        self.close()
+
+
     def fillTree(self):
         elements = SextanteLog.getLogEntries()
         for category in elements.keys():

diff --git a/src/sextante/gui/OutputSelectionPanel.py b/src/sextante/gui/OutputSelectionPanel.py
@@ -32,11 +32,15 @@ def __init__(self, output, alg):
 
     def showSelectionDialog(self):
         filefilter = self.output.getFileFilter(self.alg)
-        if OutputSelectionPanel.lastOutputFolder == None:
-            OutputSelectionPanel.lastOutputFolder = SextanteConfig.getSetting(SextanteConfig.OUTPUT_FOLDER)
-        filename = QtGui.QFileDialog.getSaveFileName(self, "Save file", QtCore.QString(OutputSelectionPanel.lastOutputFolder), filefilter)
+        settings = QtCore.QSettings()
+        if settings.contains("/SextanteQGIS/LastOutputPath"):
+            path = str(settings.value( "/SextanteQGIS/LastOutputPath", QtCore.QVariant( "" ) ).toString())
+        else:
+            path = SextanteConfig.getSetting(SextanteConfig.OUTPUT_FOLDER)
+        filename = QtGui.QFileDialog.getSaveFileName(self, "Save file", QtCore.QString(path), filefilter)
         if filename:
             self.text.setText(str(filename))
+            settings.setValue("/SextanteQGIS/LastOutputPath", os.path.dirname(str(filename)))
 
     def getValue(self):
         filename = str(self.text.text())

diff --git a/src/sextante/gui/ResultsDialog.py b/src/sextante/gui/ResultsDialog.py
@@ -33,11 +33,24 @@ def setupUi(self):
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.horizontalLayout.addWidget(self.tree)
         self.horizontalLayout.addWidget(self.webView)
-        self.setLayout(self.horizontalLayout)
+        self.closeButton = QtGui.QPushButton()
+        self.closeButton.setObjectName("closeButton")
+        self.closeButton.setText("Close")
+        QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow)
+        self.verticalLayout= QtGui.QVBoxLayout()
+        self.verticalLayout.setSpacing(2)
+        self.verticalLayout.setMargin(0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.verticalLayout.addWidget(self.closeButton)
+        self.setLayout(self.verticalLayout)
         QtCore.QMetaObject.connectSlotsByName(self)
         if self.lastUrl:
             self.webView.load(self.lastUrl)
 
+    def closeWindow(self):
+        self.close()
+
     def fillTree(self):
         elements = SextanteResults.getResults()
         if len(elements) == 0:

diff --git a/src/sextante/modeler/ModelerDialog.py b/src/sextante/modeler/ModelerDialog.py
@@ -133,10 +133,14 @@ def setupUi(self):
         self.saveButton = QtGui.QPushButton()
         self.saveButton.setObjectName("saveButton")
         self.saveButton.setText("Save")
-        self.buttonBox.addButton(self.openButton, QtGui.QDialogButtonBox.ActionRole)
         self.buttonBox.addButton(self.saveButton, QtGui.QDialogButtonBox.ActionRole)
+        self.closeButton = QtGui.QPushButton()
+        self.closeButton.setObjectName("closeButton")
+        self.closeButton.setText("Close")
+        self.buttonBox.addButton(self.closeButton, QtGui.QDialogButtonBox.ActionRole)
         QObject.connect(self.openButton, QtCore.SIGNAL("clicked()"), self.openModel)
         QObject.connect(self.saveButton, QtCore.SIGNAL("clicked()"), self.saveModel)
+        QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow)
 
         self.globalLayout = QtGui.QVBoxLayout()
         self.globalLayout.setSpacing(2)
@@ -149,6 +153,9 @@ def setupUi(self):
 
         self.view.ensureVisible(0, 0, 10, 10)
 
+    def closeWindow(self):
+        self.close()
+
     def createScript(self):
         if str(self.textGroup.text()).strip() == "":
             QMessageBox.warning(self, "Warning", "Please enter group name before saving")

diff --git a/src/sextante/saga/SagaAlgorithm.py b/src/sextante/saga/SagaAlgorithm.py
@@ -236,7 +236,7 @@ def processAlgorithm(self, progress):
                 if SextanteUtils.isWindows():
                     commands.append("io_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 1 -TYPE 0 -FILE \"" + filename + "\"");
                 else:
-                    commands.append("libio_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 1 -TYPE 0 -FILE " + filename + "\"");
+                    commands.append("libio_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 1 -TYPE 0 -FILE \"" + filename + "\"");
 
         #4 Run SAGA
         SagaUtils.createSagaBatchJobFileFromSagaCommands(commands)

diff --git a/src/sextante/saga/SagaAlgorithmProvider.py b/src/sextante/saga/SagaAlgorithmProvider.py
@@ -42,10 +42,9 @@ def createAlgsList(self):
         folder = SagaUtils.sagaDescriptionPath()
         for descriptionFile in os.listdir(folder):
             try:
-                if descriptionFile.startswith("alg_"):
-                    alg = SagaAlgorithm(os.path.join(folder, descriptionFile))
-                    if alg.name.strip() != "":
-                        self.preloadedAlgs.append(alg)
+                alg = SagaAlgorithm(os.path.join(folder, descriptionFile))
+                if alg.name.strip() != "":
+                    self.preloadedAlgs.append(alg)
             except Exception,e:
                 SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open SAGA algorithm: " + descriptionFile)
 
@@ -59,10 +58,10 @@ def getIcon(self):
         return  QIcon(os.path.dirname(__file__) + "/../images/saga.png")
 
     def createDescriptionFiles(self):
-        folder = SagaUtils.sagaDescriptionPath()
+        folder = "C:\\descs\\saga"
         i = 0
-        for alg in self.algs:
-            f = open (os.path.join(folder, "alg_" + str(i)+".txt"), "w")
+        for alg in self.preloadedAlgs:
+            f = open (os.path.join(folder, alg.name.replace(" ","").replace("/", "") + ".txt"), "w")
             f.write(alg.name + "\n")
             f.write(alg.undecoratedGroup + "\n")
             for param in alg.parameters: