[GRASS-SVN] r63627 - in grass/branches/releasebranch_7_0: . general/g.rename lib/manage lib/python/pygrass/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 19 12:31:35 PST 2014
Author: neteler
Date: 2014-12-19 12:31:35 -0800 (Fri, 19 Dec 2014)
New Revision: 63627
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.rename/g.rename.html
grass/branches/releasebranch_7_0/lib/manage/option.c
grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py
Log:
completion of r63625
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626
Modified: grass/branches/releasebranch_7_0/general/g.rename/g.rename.html
===================================================================
--- grass/branches/releasebranch_7_0/general/g.rename/g.rename.html 2014-12-19 20:29:57 UTC (rev 63626)
+++ grass/branches/releasebranch_7_0/general/g.rename/g.rename.html 2014-12-19 20:31:35 UTC (rev 63627)
@@ -23,8 +23,8 @@
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
Modified: grass/branches/releasebranch_7_0/lib/manage/option.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/option.c 2014-12-19 20:29:57 UTC (rev 63626)
+++ grass/branches/releasebranch_7_0/lib/manage/option.c 2014-12-19 20:31:35 UTC (rev 63627)
@@ -50,8 +50,8 @@
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");
Modified: grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py 2014-12-19 20:29:57 UTC (rev 63626)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py 2014-12-19 20:31:35 UTC (rev 63627)
@@ -18,8 +18,8 @@
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 @@
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',
More information about the grass-commit
mailing list