[GRASS-SVN] r63657 - in grass/branches/releasebranch_7_0: . gui/wxpython/iscatt gui/wxpython/vnet lib/python/pygrass/tests lib/python/script scripts/d.rast.edit scripts/r.in.wms scripts/v.out.gps temporal temporal/t.rast.out.vtk
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 20 12:36:32 PST 2014
Author: neteler
Date: 2014-12-20 12:36:32 -0800 (Sat, 20 Dec 2014)
New Revision: 63657
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py
grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py
grass/branches/releasebranch_7_0/lib/python/pygrass/tests/set_mapset.py
grass/branches/releasebranch_7_0/lib/python/script/db.py
grass/branches/releasebranch_7_0/scripts/d.rast.edit/d.rast.edit.py
grass/branches/releasebranch_7_0/scripts/r.in.wms/wms_base.py
grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py
Log:
update g.copy calls to use new element names (#2409) (trunk, r63656)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,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,62828,62831,62838,62845,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,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,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,63628,63630,63634,63644,63650,63652
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,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,62828,62831,62838,62845,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,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,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,63628,63630,63634,63644,63650,63652,63656
Modified: grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/gui/wxpython/iscatt/iscatt_core.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -197,7 +197,7 @@
return 1
return RunCommand("g.copy",
- rast=cat_rast + ',' + rast_name,
+ raster=cat_rast + ',' + rast_name,
getErrorMsg=True,
overwrite=True)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/gui/wxpython/vnet/vnet_core.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -348,7 +348,7 @@
RunCommand("g.copy",
overwrite = True,
- vect = [self.results["vect_map"].GetVectMapName(), mapName])
+ vector = [self.results["vect_map"].GetVectMapName(), mapName])
if len(self.giface.GetLayerList().GetLayersByName(mapName)) == 0:
# TODO: get rid of insert
@@ -429,14 +429,14 @@
mapName, mapSet = ParseMapStr(self.tmpTurnAn.GetVectMapName())
cmdCopy = [
"g.copy",
- "vect=%s,%s" % (params["input"], mapName),
+ "vector=%s,%s" % (params["input"], mapName),
"--overwrite",
]
cmdParams.append("input=" + self.tmpTurnAn.GetVectMapName())
ret, msg, err = RunCommand('g.copy',
getErrorMsg = True,
- vect = "%s,%s" % (params['input'], mapName),
+ vector = "%s,%s" % (params['input'], mapName),
read = True,
overwrite = True)
@@ -514,14 +514,14 @@
mapName, mapSet = ParseMapStr(self.tmpTurnAn.GetVectMapName())
cmdCopy = [
"g.copy",
- "vect=%s,%s" % (params['input'], mapName),
+ "vector=%s,%s" % (params['input'], mapName),
"--overwrite",
]
cmdParams.append("input=" + self.tmpTurnAn.GetVectMapName())
ret, msg, err = RunCommand('g.copy',
getErrorMsg = True,
- vect = "%s,%s" % (params['input'], mapName),
+ vector = "%s,%s" % (params['input'], mapName),
read = True,
overwrite = True)
Modified: grass/branches/releasebranch_7_0/lib/python/pygrass/tests/set_mapset.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/tests/set_mapset.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/tests/set_mapset.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -60,7 +60,7 @@
grasscore.run_command('db.login', user=opts.user)
print("\n\nCopy the map from PERMANENT to user1...\n")
grasscore.run_command('g.copy',
- vect="boundary_municp at PERMANENT,boundary_municp_pg",
+ vector="boundary_municp at PERMANENT,boundary_municp_pg",
overwrite=True)
print("\n\nBuild topology...\n")
grasscore.run_command('v.build', map='boundary_municp_pg', overwrite=True)
@@ -75,10 +75,10 @@
database=os.path.join(db))
print("\n\nCopy the map from PERMANENT to user1...\n")
grasscore.run_command('g.copy',
- vect="boundary_municp at PERMANENT,boundary_municp_sqlite",
+ vector="boundary_municp at PERMANENT,boundary_municp_sqlite",
overwrite=True)
print("\n\nBuild topology...\n")
grasscore.run_command('v.build', map='boundary_municp_sqlite', overwrite=True)
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
Modified: grass/branches/releasebranch_7_0/lib/python/script/db.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/db.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/lib/python/script/db.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -28,7 +28,7 @@
"""Return the list of columns for a database table
(interface to `db.describe -c`). Example:
- >>> run_command('g.copy', vect='firestations,myfirestations')
+ >>> run_command('g.copy', vector='firestations,myfirestations')
0
>>> db_describe('myfirestations') # doctest: +ELLIPSIS
{'nrows': 71, 'cols': [['cat', 'INTEGER', '20'], ... 'ncols': 22}
@@ -68,7 +68,7 @@
If no driver or database are given, then default settings is used
(check db_connection()).
- >>> run_command('g.copy', vect='firestations,myfirestations')
+ >>> run_command('g.copy', vector='firestations,myfirestations')
0
>>> db_table_exist('myfirestations')
True
@@ -121,7 +121,7 @@
Examples:
- >>> run_command('g.copy', vect='firestations,myfirestations')
+ >>> run_command('g.copy', vector='firestations,myfirestations')
0
>>> db_select(sql = 'SELECT cat,CITY FROM myfirestations WHERE cat < 4')
(('1', 'Morrisville'), ('2', 'Morrisville'), ('3', 'Apex'))
@@ -171,7 +171,7 @@
"""Return the name of vector connected to the table.
It returns None if no vectors are connected to the table.
- >>> run_command('g.copy', vect='firestations,myfirestations')
+ >>> run_command('g.copy', vector='firestations,myfirestations')
0
>>> db_table_in_vector('myfirestations')
['myfirestations at user1']
Modified: grass/branches/releasebranch_7_0/scripts/d.rast.edit/d.rast.edit.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.rast.edit/d.rast.edit.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/scripts/d.rast.edit/d.rast.edit.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -490,7 +490,7 @@
atexit.register(self.cleanup)
- run('g.copy', rast = (self.inmap, self.outmap), overwrite = True)
+ run('g.copy', raster = (self.inmap, self.outmap), overwrite = True)
run('r.colors', map = self.outmap, rast = self.inmap)
def cleanup(self):
Modified: grass/branches/releasebranch_7_0/scripts/r.in.wms/wms_base.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.in.wms/wms_base.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/scripts/r.in.wms/wms_base.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -452,7 +452,7 @@
try:
mask_copy = self.opt_output + self.original_mask_suffix
grass.run_command('g.copy', quiet=True,
- rast=mask_copy + ',MASK')
+ raster=mask_copy + ',MASK')
except CalledModuleError:
grass.fatal(_('%s failed') % 'g.copy')
@@ -468,7 +468,7 @@
grass.run_command('g.remove',
quiet = True,
flags = 'fb',
- type = 'rast',
+ type = 'raster',
name = ','.join(maps))
# delete environmental variable which overrides region
@@ -506,7 +506,7 @@
try:
mask_copy = self.opt_output + self.original_mask_suffix
grass.run_command('g.copy', quiet=True,
- rast='MASK,' + mask_copy)
+ raster='MASK,' + mask_copy)
except CalledModuleError:
grass.fatal(_('%s failed') % 'g.copy')
Modified: grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -174,7 +174,7 @@
inmap = tmp_extr
else:
- # g.copy "$GIS_OPT_INPUT,tmp_vogb_extr_$$" # to get a copy of DB into local mapset
+ # g.copy vector="$GIS_OPT_INPUT,tmp_vogb_extr_$$" # to get a copy of DB into local mapset
# INMAP="tmp_vogb_extr_$$"
inmap = input
Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,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,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
089,63091,63093,63170,63327,63345,63391,63393,63554,63556,63590,63616,63628,63644,63650
+ /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,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,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
089,63091,63093,63170,63327,63345,63391,63393,63554,63556,63590,63616,63628,63644,63650,63656
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-12-20 20:33:31 UTC (rev 63656)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-12-20 20:36:32 UTC (rev 63657)
@@ -119,7 +119,7 @@
if id is None:
id = null_map
- grass.run_command("g.copy", rast="%s,%s" % (id, map_name),
+ grass.run_command("g.copy", raster="%s,%s" % (id, map_name),
overwrite=True)
out_name = "%6.6i_%s.vtk" % (count, sp.base.get_name())
More information about the grass-commit
mailing list