[GRASS-SVN] r63587 - in grass/trunk: general/g.list lib/gis lib/gpde/test lib/manage

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-18 07:18:43 -0800 (Thu, 18 Dec 2014)
New Revision: 63587

Modified:
   grass/trunk/general/g.list/main.c
   grass/trunk/lib/gis/parser_standard_options.c
   grass/trunk/lib/gpde/test/test_arrays.c
   grass/trunk/lib/manage/do_remove.c
   grass/trunk/lib/manage/do_rename.c
   grass/trunk/lib/manage/option.c
Log:
update c files to use raster_3d


Modified: grass/trunk/general/g.list/main.c
===================================================================
--- grass/trunk/general/g.list/main.c	2014-12-18 15:14:40 UTC (rev 63586)
+++ grass/trunk/general/g.list/main.c	2014-12-18 15:18:43 UTC (rev 63587)
@@ -409,7 +409,7 @@
 
     if (strcmp(alias, "raster") == 0)
 	type = TYPE_RAST;
-    else if (strcmp(alias, "3draster") == 0)
+    else if (strcmp(alias, "raster_3d") == 0)
 	type = TYPE_RAST3D;
     else if (strcmp(alias, "vector") == 0)
 	type = TYPE_VECT;

Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c	2014-12-18 15:14:40 UTC (rev 63586)
+++ grass/trunk/lib/gis/parser_standard_options.c	2014-12-18 15:18:43 UTC (rev 63587)
@@ -826,7 +826,7 @@
 	Opt->key_desc = "name";
 	Opt->required = NO;
 	Opt->answer = "raster";
-	Opt->options = "raster,vector,3draster";
+	Opt->options = "raster,vector,raster_3d";
 	Opt->description = _("Type of the input map");
 	break;
     case G_OPT_T_TYPE:

Modified: grass/trunk/lib/gpde/test/test_arrays.c
===================================================================
--- grass/trunk/lib/gpde/test/test_arrays.c	2014-12-18 15:14:40 UTC (rev 63586)
+++ grass/trunk/lib/gpde/test/test_arrays.c	2014-12-18 15:18:43 UTC (rev 63587)
@@ -857,7 +857,7 @@
     N_free_array_3d(tmp);
 
     sprintf(buff,
-	    "g.remove -f type=3draster name=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
+	    "g.remove -f type=raster_3d name=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
     system(buff);
 
     N_free_array_3d(data1);

Modified: grass/trunk/lib/manage/do_remove.c
===================================================================
--- grass/trunk/lib/manage/do_remove.c	2014-12-18 15:14:40 UTC (rev 63586)
+++ grass/trunk/lib/manage/do_remove.c	2014-12-18 15:18:43 UTC (rev 63587)
@@ -73,7 +73,7 @@
 		G_warning(_("Raster map <%s> not found"), old);
 	}
 
-	if (G_strcasecmp(list[n].alias, "3draster") == 0) {
+	if (G_strcasecmp(list[n].alias, "raster_3d") == 0) {
 	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 	}

Modified: grass/trunk/lib/manage/do_rename.c
===================================================================
--- grass/trunk/lib/manage/do_rename.c	2014-12-18 15:14:40 UTC (rev 63586)
+++ grass/trunk/lib/manage/do_rename.c	2014-12-18 15:18:43 UTC (rev 63587)
@@ -71,7 +71,7 @@
 		G_warning(_("Raster map <%s> not found"), old);
 	}
 
-	if (G_strcasecmp(list[n].alias, "3draster") == 0) {
+	if (G_strcasecmp(list[n].alias, "raster_3d") == 0) {
 	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 	}

Modified: grass/trunk/lib/manage/option.c
===================================================================
--- grass/trunk/lib/manage/option.c	2014-12-18 15:14:40 UTC (rev 63586)
+++ grass/trunk/lib/manage/option.c	2014-12-18 15:18:43 UTC (rev 63587)
@@ -47,7 +47,7 @@
     G_asprintf(&str, _("%s to be %s"),
 	       list[n].text, desc);
     p->description = str;
-    if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "3draster") == 0)
+    if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "raster_3d") == 0)
 	p->guisection = _("Raster");
     else if (strcmp(p->key, "vector") == 0 ||
              strcmp(p->key, "oldvector") == 0 ||