[GRASS-SVN] r63230 - in grass/trunk: display/d.legend general/g.region gui/wxpython/animation lib/gis lib/python/temporal raster/r.carve

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-28 01:50:07 -0800 (Fri, 28 Nov 2014)
New Revision: 63230

Modified:
   grass/trunk/display/d.legend/main.c
   grass/trunk/general/g.region/main.c
   grass/trunk/gui/wxpython/animation/g.gui.animation.py
   grass/trunk/lib/gis/parser_standard_options.c
   grass/trunk/lib/python/temporal/open_stds.py
   grass/trunk/raster/r.carve/main.c
Log:
update keys to use new element names (#2409)


Modified: grass/trunk/display/d.legend/main.c
===================================================================
--- grass/trunk/display/d.legend/main.c	2014-11-28 09:44:05 UTC (rev 63229)
+++ grass/trunk/display/d.legend/main.c	2014-11-28 09:50:07 UTC (rev 63230)
@@ -89,12 +89,12 @@
 	  "of the graphics monitor.");
 
     opt_rast2d = G_define_standard_option(G_OPT_R_MAP);
-    opt_rast2d->key = "rast";
+    opt_rast2d->key = "raster";
     opt_rast2d->required = NO;
     opt_rast2d->guisection = _("Input");
 
     opt_rast3d = G_define_standard_option(G_OPT_R3_MAP);
-    opt_rast3d->key = "rast3d";
+    opt_rast3d->key = "raster3d";
     opt_rast3d->required = NO;
     opt_rast3d->guisection = _("Input");
 

Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c	2014-11-28 09:44:05 UTC (rev 63229)
+++ grass/trunk/general/g.region/main.c	2014-11-28 09:50:07 UTC (rev 63230)
@@ -161,14 +161,14 @@
     parm.region->guisection = _("Existing");
 
     parm.raster = G_define_standard_option(G_OPT_R_MAP);
-    parm.raster->key = "rast";
+    parm.raster->key = "raster";
     parm.raster->required = NO;
     parm.raster->multiple = YES;
     parm.raster->description = _("Set region to match raster map(s)");
     parm.raster->guisection = _("Existing");
 
     parm.raster3d = G_define_standard_option(G_OPT_R3_MAP);
-    parm.raster3d->key = "rast3d";
+    parm.raster3d->key = "3draster";
     parm.raster3d->required = NO;
     parm.raster3d->multiple = NO;
     parm.raster3d->description =
@@ -177,7 +177,7 @@
     parm.raster3d->guisection = _("Existing");
 
     parm.vect = G_define_standard_option(G_OPT_V_MAP);
-    parm.vect->key = "vect";
+    parm.vect->key = "vector";
     parm.vect->required = NO;
     parm.vect->multiple = YES;
     parm.vect->label = _("Set region to match vector map(s)");

Modified: grass/trunk/gui/wxpython/animation/g.gui.animation.py
===================================================================
--- grass/trunk/gui/wxpython/animation/g.gui.animation.py	2014-11-28 09:44:05 UTC (rev 63229)
+++ grass/trunk/gui/wxpython/animation/g.gui.animation.py	2014-11-28 09:50:07 UTC (rev 63230)
@@ -85,7 +85,7 @@
 
     if numInputs > 1:
         grass.fatal(_("%s=, %s=, %s= and %s= are mutually exclusive.") %
-                ("rast", "vect", "strds", "stvds"))
+                ("raster", "vector", "strds", "stvds"))
         
     if numInputs > 0:
         # We need to initialize the temporal framework in case

Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c	2014-11-28 09:44:05 UTC (rev 63229)
+++ grass/trunk/lib/gis/parser_standard_options.c	2014-11-28 09:50:07 UTC (rev 63230)
@@ -825,8 +825,8 @@
 	Opt->type = TYPE_STRING;
 	Opt->key_desc = "name";
 	Opt->required = NO;
-	Opt->answer = "rast";
-	Opt->options = "rast,vect,rast3d";
+	Opt->answer = "raster";
+	Opt->options = "raster,vector,3draster";
 	Opt->description = _("Type of the input map");
 	break;
     case G_OPT_T_TYPE:

Modified: grass/trunk/lib/python/temporal/open_stds.py
===================================================================
--- grass/trunk/lib/python/temporal/open_stds.py	2014-11-28 09:44:05 UTC (rev 63229)
+++ grass/trunk/lib/python/temporal/open_stds.py	2014-11-28 09:50:07 UTC (rev 63230)
@@ -52,7 +52,7 @@
 
     if type == "strds" or type == "rast" or type == "raster":
         sp = dataset_factory("strds", id)
-    elif type == "str3ds" or type == "rast3d" or type == "raster3d":
+    elif type == "str3ds" or type == "rast3d" or type == "3draster":
         sp = dataset_factory("str3ds", id)
     elif type == "stvds" or type == "vect" or type == "vector":
         sp = dataset_factory("stvds", id)
@@ -108,7 +108,7 @@
 
     if type == "strds" or type == "rast" or type == "raster":
         sp = dataset_factory("strds", id)
-    elif type == "str3ds" or type == "rast3d" or type == "raster3d":
+    elif type == "str3ds" or type == "rast3d" or type == "3draster":
         sp = dataset_factory("str3ds", id)
     elif type == "stvds" or type == "vect" or type == "vector":
         sp = dataset_factory("stvds", id)

Modified: grass/trunk/raster/r.carve/main.c
===================================================================
--- grass/trunk/raster/r.carve/main.c	2014-11-28 09:44:05 UTC (rev 63229)
+++ grass/trunk/raster/r.carve/main.c	2014-11-28 09:50:07 UTC (rev 63230)
@@ -78,11 +78,11 @@
 			    "to raster and subtracts depth from the output DEM.");
 
     parm.inrast = G_define_standard_option(G_OPT_R_INPUT);
-    parm.inrast->key = "rast";
+    parm.inrast->key = "raster";
     parm.inrast->description = _("Name of input raster elevation map");
 
     parm.invect = G_define_standard_option(G_OPT_V_INPUT);
-    parm.invect->key = "vect";
+    parm.invect->key = "vector";
     parm.invect->label =
 	_("Name of input vector map containing stream(s)");