浏览代码

completion of https://trac.osgeo.org/grass/changeset/63624

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63626 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 年之前
父节点
当前提交
043e8c7d45
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 2 2
      general/g.rename/g.rename.html
  2. 2 2
      lib/manage/option.c
  3. 4 4
      lib/python/pygrass/gis/__init__.py

+ 2 - 2
general/g.rename/g.rename.html

@@ -23,8 +23,8 @@ choose for possible renaming:
        raster   raster map(s) to be renamed
     raster_3d   3D raster map(s) to be renamed
        vector   vector map(s) to be renamed
-    oldvector   old  (GRASS 5.0) vector map(s) to be renamed
-  asciivector   ASCII vector map(s) to be renamed
+   old_vector   old  (GRASS 5.0) vector map(s) to be renamed
+ ascii_vector   ASCII vector map(s) to be renamed
        labels   paint label file(s) to be renamed
        region   region definition(s) to be renamed
         group   imagery group(s) to be renamed

+ 2 - 2
lib/manage/option.c

@@ -50,8 +50,8 @@ struct Option* M_define_option(int n, const char *desc, int multiple)
     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 ||
-	     strcmp(p->key, "asciivector") == 0)
+             strcmp(p->key, "old_vector") == 0 ||
+	     strcmp(p->key, "ascii_vector") == 0)
 	p->guisection = _("Vector");
     else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
 	p->guisection = _("Region");

+ 4 - 4
lib/python/pygrass/gis/__init__.py

@@ -18,8 +18,8 @@ from grass.pygrass.errors import GrassError
 ETYPE = {'raster': libgis.G_ELEMENT_RASTER,
          'raster_3d': libgis.G_ELEMENT_RASTER3D,
          'vector': libgis.G_ELEMENT_VECTOR,
-         'oldvector': libgis.G_ELEMENT_OLDVECTOR,
-         'asciivector': libgis.G_ELEMENT_ASCIIVECTOR,
+         'old_vector': libgis.G_ELEMENT_OLDVECTOR,
+         'ascii_vector': libgis.G_ELEMENT_ASCIIVECTOR,
          'icon': libgis.G_ELEMENT_ICON,
          'labels': libgis.G_ELEMENT_LABEL,
          'sites': libgis.G_ELEMENT_SITE,
@@ -309,11 +309,11 @@ class Mapset(object):
     def glist(self, type, pattern=None):
         """Return a list of grass types like:
 
-            * 'asciivector',
+            * 'ascii_vector',
             * 'group',
             * 'icon',
             * 'labels',
-            * 'oldvector',
+            * 'old_vector',
             * 'raster',
             * 'raster_3d',
             * 'region',