浏览代码

update c files to use raster_3d

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63587 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父节点
当前提交
aac2c046e6
共有 6 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      general/g.list/main.c
  2. 1 1
      lib/gis/parser_standard_options.c
  3. 1 1
      lib/gpde/test/test_arrays.c
  4. 1 1
      lib/manage/do_remove.c
  5. 1 1
      lib/manage/do_rename.c
  6. 1 1
      lib/manage/option.c

+ 1 - 1
general/g.list/main.c

@@ -409,7 +409,7 @@ static void make_list(struct elist **el, int *lcount, int *lalloc,
 
 
     if (strcmp(alias, "raster") == 0)
     if (strcmp(alias, "raster") == 0)
 	type = TYPE_RAST;
 	type = TYPE_RAST;
-    else if (strcmp(alias, "3draster") == 0)
+    else if (strcmp(alias, "raster_3d") == 0)
 	type = TYPE_RAST3D;
 	type = TYPE_RAST3D;
     else if (strcmp(alias, "vector") == 0)
     else if (strcmp(alias, "vector") == 0)
 	type = TYPE_VECT;
 	type = TYPE_VECT;

+ 1 - 1
lib/gis/parser_standard_options.c

@@ -826,7 +826,7 @@ struct Option *G_define_standard_option(int opt)
 	Opt->key_desc = "name";
 	Opt->key_desc = "name";
 	Opt->required = NO;
 	Opt->required = NO;
 	Opt->answer = "raster";
 	Opt->answer = "raster";
-	Opt->options = "raster,vector,3draster";
+	Opt->options = "raster,vector,raster_3d";
 	Opt->description = _("Type of the input map");
 	Opt->description = _("Type of the input map");
 	break;
 	break;
     case G_OPT_T_TYPE:
     case G_OPT_T_TYPE:

+ 1 - 1
lib/gpde/test/test_arrays.c

@@ -857,7 +857,7 @@ int test_array_3d(void)
     N_free_array_3d(tmp);
     N_free_array_3d(tmp);
 
 
     sprintf(buff,
     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);
     system(buff);
 
 
     N_free_array_3d(data1);
     N_free_array_3d(data1);

+ 1 - 1
lib/manage/do_remove.c

@@ -73,7 +73,7 @@ int M_do_remove(int n, const char *old)
 		G_warning(_("Raster map <%s> not found"), old);
 		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)
 	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 		G_warning(_("3D raster map <%s> not found"), old);
 	}
 	}

+ 1 - 1
lib/manage/do_rename.c

@@ -71,7 +71,7 @@ int M_do_rename(int n, const char *old, const char *new)
 		G_warning(_("Raster map <%s> not found"), old);
 		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)
 	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 		G_warning(_("3D raster map <%s> not found"), old);
 	}
 	}

+ 1 - 1
lib/manage/option.c

@@ -47,7 +47,7 @@ struct Option* M_define_option(int n, const char *desc, int multiple)
     G_asprintf(&str, _("%s to be %s"),
     G_asprintf(&str, _("%s to be %s"),
 	       list[n].text, desc);
 	       list[n].text, desc);
     p->description = str;
     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");
 	p->guisection = _("Raster");
     else if (strcmp(p->key, "vector") == 0 ||
     else if (strcmp(p->key, "vector") == 0 ||
              strcmp(p->key, "oldvector") == 0 ||
              strcmp(p->key, "oldvector") == 0 ||