fixed #5954 anad #6087

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@309 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d

Author: volayaf

src/sextante/grass/GrassUtils.py

@@ -63,7 +63,7 @@ def grassPath():
     @staticmethod
     def grassHelpPath():
         folder = SextanteConfig.getSetting(GrassUtils.GRASS_HELP_FOLDER)
-        if folder == None:
+        if folder == None or folder == "":
             if SextanteUtils.isWindows():
                 testfolders = [os.path.join(GrassUtils.grassPath(), "docs", "html")]
             else:

src/sextante/grass/description/r.lake.txt …ante/grass/description/r.lake.coords.txtsrc/sextante/grass/description/r.lake.txt renamed to src/sextante/grass/description/r.lake.coords.txt src/sextante/grass/description/r.lake.txt renamed to src/sextante/grass/description/r.lake.coords.txt

@@ -1,10 +1,8 @@
 r.lake
-r.lake - Fills lake at given point to given level.
+r.lake.coords - Fills lake at given point to given level.
 Raster (r.*)
 ParameterRaster|dem|Name of terrain raster map (DEM)|False
 ParameterString|wl|Water level|
 ParameterString|xy|Seed point coordinates|
-ParameterRaster|seed|Name of raster map with given starting point(s) (at least 1 cell > 0)|False
 ParameterBoolean|-n|Use negative depth values for lake raster map|False
-ParameterBoolean|-o|Overwrite seed map with result (lake) map|False
 OutputRaster|lake|Name for output raster map with lake

src/sextante/grass/description/r.lake.layer.txt

@@ -0,0 +1,8 @@
+r.lake
+r.lake.layer - Fills lake at given point to given level.
+Raster (r.*)
+ParameterRaster|dem|Name of terrain raster map (DEM)|False
+ParameterString|wl|Water level|
+ParameterRaster|seed|Name of raster map with given starting point(s) (at least 1 cell > 0)|False
+ParameterBoolean|-n|Use negative depth values for lake raster map|False
+OutputRaster|lake|Name for output raster map with lake

src/sextante/grass/description/v.distance.toattr.txt

@@ -0,0 +1,10 @@
+v.distance
+v.distance.toattr - Finds the nearest element in vector map 'to' for elements in vector map 'from'.
+Vector (v.*)
+ParameterVector|from|Name of existing vector map (from)|0|False
+ParameterVector|to|Name of existing vector map (to)|-1|False
+ParameterSelection|upload|Values describing the relation between two nearest features|to_attr
+ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to
+ParameterTableField|to_column|Column name of nearest feature|to
+ParameterBoolean|-a|Calculate distances to all features within the threshold|False
+OutputVector|output|Name for output vector map

src/sextante/grass/description/v.distance.txt

@@ -3,10 +3,8 @@ v.distance - Finds the nearest element in vector map 'to' for elements in vector
 Vector (v.*)
 ParameterVector|from|Name of existing vector map (from)|0|False
 ParameterVector|to|Name of existing vector map (to)|-1|False
-ParameterSelection|upload|Values describing the relation between two nearest features|cat;dist;to_x;to_y;to_along;to_angle;to_attr
-ParameterString|column|Column name(s) where values specified by 'upload' option will be uploaded|col_name
-ParameterTableField|to_column|Column name of nearest feature (used with upload=to_attr)|to
-ParameterBoolean|-p|Print output to stdout, don't update attribute table|False
+ParameterSelection|upload|Values describing the relation between two nearest features|cat;dist;to_x;to_y;to_along;to_angle
+ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to
 ParameterBoolean|-a|Calculate distances to all features within the threshold|False
 OutputVector|output|Name for output vector map