[GRASS-SVN] r38332 - grass-addons/vector/v.krige

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-07-09 10:05:24 -0400 (Thu, 09 Jul 2009)
New Revision: 38332

Modified:
   grass-addons/vector/v.krige/v.krige.py
Log:
cosmetics in CLI, -o flag replaced by --o


Modified: grass-addons/vector/v.krige/v.krige.py
===================================================================
--- grass-addons/vector/v.krige/v.krige.py	2009-07-09 12:55:33 UTC (rev 38331)
+++ grass-addons/vector/v.krige/v.krige.py	2009-07-09 14:05:24 UTC (rev 38332)
@@ -26,7 +26,7 @@
 #% key: input
 #% type: string
 #% gisprompt: old,vector,vector
-#% description: Name of point vector map containing sample data.
+#% description: Name of point vector map containing sample data
 #% required: yes
 #%end
 #%option
@@ -38,8 +38,9 @@
 #%option
 #% key: output
 #% type: string
-#% gisprompt: old,raster,raster
-#% description: Name of output map. If omitted, will be <input name>_kriging
+#% gisprompt: new,cell,raster
+#% label: Name for output raster map
+#% description: If omitted, will be <input name>_kriging
 #% required : no
 #%end
 #%option
@@ -47,7 +48,7 @@
 #% type: string
 #% options: gstat, geor
 #% answer: gstat
-#% description: R package to use. Choices: gstat, geor 
+#% description: R package to use
 #% required: no
 #%end
 #%option
@@ -55,35 +56,31 @@
 #% type: string
 #% options: Exp,Sph,Gau,Mat,Lin
 #% multiple: yes
-#% description: Variogram model(s). Leave empty to 
+#% label: Variogram model(s)
+#% description: Leave empty to 
 #% required: no
 #%end
 #%option
 #% key: range
 #% type: integer
-#% description: Range value. Automatically fixed if not set
+#% label: Range value
+#% description: Automatically fixed if not set
 #% required : no
 #%end
 #%option
 #% key: nugget
 #% type: double
-#% description: Nugget value. Automatically fixed if not set
+#% label: Nugget value
+#% description: Automatically fixed if not set
 #% required : no
 #%end
 #%option
 #% key: sill
 #% type: double
-#% description: Sill value. Automatically fixed if not set
+#% label: Sill value
+#% description: Automatically fixed if not set
 #% required : no
 #%end
-#%flag
-#% key: o
-#% description: Overwrite output map with same name
-#%end
-# #%flag
-# #% key: 
-# #% description: 
-# #%end
 
 import os, sys
 
@@ -499,9 +496,9 @@
         # Export map
         controller.ExportMap(map = KrigingResult,
                              column='var1.pred',
-                             name = argv[0]['output'],
-                             overwrite = argv[1]['o'])
-        grass.message(_("Map exported. "))
+                             name = argv[0]['output'])
+        
+        grass.message(_("Map exported."))
     
 if __name__ == '__main__':
     if len(sys.argv) > 1: