[GRASS-SVN] r41764 - in grass/trunk: lib/gis raster/r.flow raster/r.topmodel raster/simwe/r.sim.sediment raster/simwe/r.sim.water

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-08 16:09:09 -0400 (Thu, 08 Apr 2010)
New Revision: 41764

Modified:
   grass/trunk/lib/gis/parser_standard_options.c
   grass/trunk/raster/r.flow/main.c
   grass/trunk/raster/r.topmodel/main.c
   grass/trunk/raster/simwe/r.sim.sediment/main.c
   grass/trunk/raster/simwe/r.sim.water/main.c
Log:
more options standardization
http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Renamedoptions


Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c	2010-04-08 19:59:21 UTC (rev 41763)
+++ grass/trunk/lib/gis/parser_standard_options.c	2010-04-08 20:09:09 UTC (rev 41764)
@@ -212,7 +212,7 @@
 	Opt->key_desc = "name";
 	Opt->required = YES;
 	Opt->gisprompt = "old,cell,raster";
-	Opt->description = _("Name of input raster map");
+	Opt->description = _("Name of raster map");
 	break;
     case G_OPT_R_MAPS:
 	Opt->key = "map";
@@ -221,7 +221,7 @@
 	Opt->required = YES;
 	Opt->multiple = YES;
 	Opt->gisprompt = "old,cell,raster";
-	Opt->description = _("Name of input raster map(s)");
+	Opt->description = _("Name of raster map(s)");
 	break;
     case G_OPT_R_BASE:
 	Opt->key = "base";
@@ -245,7 +245,7 @@
 	Opt->key_desc = "name";
 	Opt->required = YES;
 	Opt->gisprompt = "old,cell,raster";
-	Opt->description = _("Name of elevation raster map");
+	Opt->description = _("Name of input elevation raster map");
 	break;
     case G_OPT_R_ELEVS:
 	Opt->key = "elevation";
@@ -254,7 +254,7 @@
 	Opt->required = YES;
 	Opt->multiple = YES;
 	Opt->gisprompt = "old,cell,raster";
-	Opt->description = _("Name of elevation raster map(s)");
+	Opt->description = _("Name of input elevation raster map(s)");
 	break;
 
 	/*g3d maps */

Modified: grass/trunk/raster/r.flow/main.c
===================================================================
--- grass/trunk/raster/r.flow/main.c	2010-04-08 19:59:21 UTC (rev 41763)
+++ grass/trunk/raster/r.flow/main.c	2010-04-08 20:09:09 UTC (rev 41764)
@@ -427,6 +427,7 @@
 	  "map.");
 
     pelevin = G_define_standard_option(G_OPT_R_ELEV);
+    pelevin->key = "elevation_input";
     
     paspin = G_define_standard_option(G_OPT_R_INPUT);
     paspin->key = "aspect_input";

Modified: grass/trunk/raster/r.topmodel/main.c
===================================================================
--- grass/trunk/raster/r.topmodel/main.c	2010-04-08 19:59:21 UTC (rev 41763)
+++ grass/trunk/raster/r.topmodel/main.c	2010-04-08 20:09:09 UTC (rev 41764)
@@ -65,6 +65,11 @@
 	_("Simulates TOPMODEL which is a physically based hydrologic model.");
 
     /* Parameter definitions */
+    param.elev = G_define_standard_option(G_OPT_R_ELEV);
+    param.elev->key = "elevation_input";
+    param.elev->required = NO;
+    param.elev->guisection = _("Input");
+
     param.basin = G_define_standard_option(G_OPT_R_INPUT);
     param.basin->key = "basin_input";
     param.basin->label =
@@ -73,12 +78,8 @@
     param.basin->required = NO;
     param.basin->guisection = _("Input");
 
-    param.elev = G_define_standard_option(G_OPT_R_ELEV);
-    param.elev->required = NO;
-    param.elev->guisection = _("Input");
-
     param.fill = G_define_standard_option(G_OPT_R_OUTPUT);
-    param.fill->key = "dep_output";
+    param.fill->key = "delevation_output";
     param.fill->description = _("Name for output depressionless elevation raster map");
     param.fill->required = NO;
     param.fill->guisection = _("Output");

Modified: grass/trunk/raster/simwe/r.sim.sediment/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.sediment/main.c	2010-04-08 19:59:21 UTC (rev 41763)
+++ grass/trunk/raster/simwe/r.sim.sediment/main.c	2010-04-08 20:09:09 UTC (rev 41764)
@@ -119,7 +119,8 @@
 	  "using path sampling method (SIMWE).");
 
     parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
-
+    parm.elevin->key = "elevation_input";
+    
     parm.wdepth = G_define_standard_option(G_OPT_R_INPUT);
     parm.wdepth->key = "wdepth_input";
     parm.wdepth->description = _("Name of water depth raster map [m]");
@@ -154,7 +155,7 @@
     parm.manin->guisection = _("Input");
 
     parm.maninval = G_define_option();
-    parm.maninval->key = "maninval";
+    parm.maninval->key = "man_value";
     parm.maninval->type = TYPE_DOUBLE;
     parm.maninval->answer = MANINVAL;
     parm.maninval->required = NO;

Modified: grass/trunk/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/main.c	2010-04-08 19:59:21 UTC (rev 41763)
+++ grass/trunk/raster/simwe/r.sim.water/main.c	2010-04-08 20:09:09 UTC (rev 41764)
@@ -123,7 +123,8 @@
 	  "path sampling method (SIMWE).");
 
     parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
-
+    parm.elevin->key = "elevation_input";
+    
     parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
     parm.dxin->key = "dx_input";
     parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
@@ -140,7 +141,7 @@
     parm.rain->guisection = _("Input");
     
     parm.rainval = G_define_option();
-    parm.rainval->key = "rain_val";
+    parm.rainval->key = "rain_value";
     parm.rainval->type = TYPE_DOUBLE;
     parm.rainval->answer = RAINVAL;
     parm.rainval->required = NO;
@@ -156,7 +157,7 @@
     parm.infil->guisection = _("Input");
 
     parm.infilval = G_define_option();
-    parm.infilval->key = "infil_val";
+    parm.infilval->key = "infil_value";
     parm.infilval->type = TYPE_DOUBLE;
     parm.infilval->answer = INFILVAL;
     parm.infilval->required = NO;
@@ -171,7 +172,7 @@
     parm.manin->guisection = _("Input");
 
     parm.maninval = G_define_option();
-    parm.maninval->key = "man_val";
+    parm.maninval->key = "man_value";
     parm.maninval->type = TYPE_DOUBLE;
     parm.maninval->answer = MANINVAL;
     parm.maninval->required = NO;