[GRASS-SVN] r63649 - in grass/branches/releasebranch_7_0: . gui/wxpython/gmodeler lib/python/script lib/python/temporal raster3d/r3.in.bin/test_suite raster3d/r3.out.netcdf/test_suite scripts/d.rast.edit scripts/d.rast.leg scripts/d.shade scripts/db.in.ogr scripts/i.in.spotvgt scripts/i.pansharpen scripts/r.buffer.lowmem scripts/r.colors.stddev scripts/r.fillnulls scripts/r.grow scripts/r.in.wms scripts/r.mask scripts/r.out.xyz scripts/r.reclass.area scripts/r.unpack/test_suite scripts/v.dissolve scripts/v.out.gps scripts/v.rast.stats scripts/v.to.lines scripts/v.unpack temporal temporal/t.rast.accumulate temporal/t.rast.neighbors temporal/t.rast.out.vtk temporal/t.rast.to.rast3 temporal/t.rast.to.rast3/testsuite temporal/t.vect.what.strds tools
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 20 06:41:23 PST 2014
Author: neteler
Date: 2014-12-20 06:41:23 -0800 (Sat, 20 Dec 2014)
New Revision: 63649
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py
grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
grass/branches/releasebranch_7_0/lib/python/script/db.py
grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py
grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh
grass/branches/releasebranch_7_0/scripts/d.rast.edit/d.rast.edit.py
grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py
grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py
grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py
grass/branches/releasebranch_7_0/scripts/i.in.spotvgt/i.in.spotvgt.py
grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
grass/branches/releasebranch_7_0/scripts/r.buffer.lowmem/r.buffer.lowmem.py
grass/branches/releasebranch_7_0/scripts/r.colors.stddev/r.colors.stddev.py
grass/branches/releasebranch_7_0/scripts/r.fillnulls/r.fillnulls.py
grass/branches/releasebranch_7_0/scripts/r.grow/r.grow.py
grass/branches/releasebranch_7_0/scripts/r.in.wms/wms_base.py
grass/branches/releasebranch_7_0/scripts/r.mask/r.mask.py
grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py
grass/branches/releasebranch_7_0/scripts/r.reclass.area/r.reclass.area.py
grass/branches/releasebranch_7_0/scripts/r.unpack/test_suite/test.r.unpack.sh
grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.py
grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py
grass/branches/releasebranch_7_0/scripts/v.rast.stats/v.rast.stats.py
grass/branches/releasebranch_7_0/scripts/v.to.lines/v.to.lines.py
grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py
grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py
grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py
grass/branches/releasebranch_7_0/tools/thumbnails.py
Log:
update g.region/g.rename calls to use new element names (#2409) (trunk, r63644)
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
+ /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
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -326,13 +326,13 @@
dlg.Destroy()
if rast:
- self._gconsole.RunCmd(['g.remove', '-f', 'type=rast',
+ self._gconsole.RunCmd(['g.remove', '-f', 'type=raster',
'name=%s' %','.join(rast)])
if rast3d:
- self._gconsole.RunCmd(['g.remove', '-f', 'type=rast3d',
+ self._gconsole.RunCmd(['g.remove', '-f', 'type=raster_3d',
'name=%s' %','.join(rast3d)])
if vect:
- self._gconsole.RunCmd(['g.remove', '-f', 'type=vect',
+ self._gconsole.RunCmd(['g.remove', '-f', 'type=vector',
'name=%s' %','.join(vect)])
self.SetStatusText(_("%d maps deleted from current mapset") % \
@@ -786,7 +786,7 @@
x = width/2 - 200 + self._randomShift()
y = height/2 + self._randomShift()
for p in params['params']:
- if p.get('prompt', '') in ('raster', 'vector', 'raster3d') and \
+ if p.get('prompt', '') in ('raster', 'vector', 'raster_3d') and \
(p.get('value', None) or \
(p.get('age', 'old') != 'old' and p.get('required', 'no') == 'yes')):
data = layer.FindData(p.get('name', ''))
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -709,11 +709,11 @@
rast, vect, rast3d, msg = self.GetIntermediateData()
if rast:
- log.RunCmd(['g.remove', '-f', 'type=rast', 'name=%s' %','.join(rast)])
+ log.RunCmd(['g.remove', '-f', 'type=raster', 'name=%s' %','.join(rast)])
if rast3d:
- log.RunCmd(['g.remove', '-f', 'type=rast3d', 'name=%s' %','.join(rast3d)])
+ log.RunCmd(['g.remove', '-f', 'type=raster_3d', 'name=%s' %','.join(rast3d)])
if vect:
- log.RunCmd(['g.remove', '-f', 'type=vect', 'name=%s' %','.join(vect)])
+ log.RunCmd(['g.remove', '-f', 'type=vector', 'name=%s' %','.join(vect)])
def GetIntermediateData(self):
"""Get info about intermediate data"""
Modified: grass/branches/releasebranch_7_0/lib/python/script/db.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/db.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/lib/python/script/db.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -32,7 +32,7 @@
0
>>> db_describe('myfirestations') # doctest: +ELLIPSIS
{'nrows': 71, 'cols': [['cat', 'INTEGER', '20'], ... 'ncols': 22}
- >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
0
:param str table: table name
@@ -72,7 +72,7 @@
0
>>> db_table_exist('myfirestations')
True
- >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
0
:param str table: table name
@@ -130,7 +130,7 @@
>>> db_select(table = 'myfirestations') # doctest: +ELLIPSIS
(('1', '24', 'Morrisville #3', ... 'HS2A', '1.37'))
- >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
0
:param str sql: SQL statement to perform (or None)
@@ -176,7 +176,7 @@
>>> db_table_in_vector('myfirestations')
['myfirestations at user1']
>>> db_table_in_vector('mfirestations')
- >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
0
:param str table: name of table to query
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/aggregation.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -171,7 +171,7 @@
if new_map.metadata.get_min() is None and \
new_map.metadata.get_max() is None:
if not register_null:
- gscript.run_command("g.remove", flags='f', type='rast',
+ gscript.run_command("g.remove", flags='f', type='raster',
name=output)
return None
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-20 14:41:23 UTC (rev 63649)
@@ -124,7 +124,7 @@
bottom=0 top=100 west=0 east=180 south=0 north=90 \
cols=18 rows=9 depths=10
-for map in `g.list type=raster3d pattern=test_in_bin_float*` ; do
+for map in `g.list type=raster_3d pattern=test_in_bin_float*` ; do
r3.out.ascii input=${map} output=${map}.txt precision=0
done
@@ -132,7 +132,7 @@
diff $i test_out_bin_float.ref
done
-g.remove -f type=raster3d pattern=test_in*
-g.remove -f type=raster3d pattern=test_out*
+g.remove -f type=raster_3d pattern=test_in*
+g.remove -f type=raster_3d pattern=test_out*
rm test_in_*.txt
rm test_out_*.bin
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh 2014-12-20 14:41:23 UTC (rev 63649)
@@ -31,4 +31,4 @@
r3.info volume_time_float
ncdump -h test_time_float.nc
-g.remove -f type=rast3 name=volume_float,volume_double,volume_time_double,volume_time_float
+g.remove -f type=raster_3d name=volume_float,volume_double,volume_time_double,volume_time_float
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 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/d.rast.edit/d.rast.edit.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -495,7 +495,7 @@
def cleanup(self):
grass.try_remove(self.tempfile)
- run('g.remove', flags = 'f', type = 'rast', name = self.tempmap)
+ run('g.remove', flags = 'f', type = 'raster', name = self.tempmap)
def finalize(self):
self.save_map()
@@ -529,7 +529,7 @@
run('g.region', raster = self.inmap)
run('r.patch', input = (self.tempmap, self.outmap), output = self.outmap, overwrite = True)
run('r.colors', map = self.outmap, rast = self.inmap)
- run('g.remove', flags = 'f', type = 'rast', name = self.tempmap)
+ run('g.remove', flags = 'f', type = 'raster', name = self.tempmap)
def read_header(self, infile):
wind = {}
@@ -635,7 +635,7 @@
run('r.mapcalc', expression = "%s = %d" % (self.tempmap, val))
run('r.colors', map = self.tempmap, rast = self.inmap)
run('r.out.ppm', input = self.tempmap, out = self.tempfile)
- run('g.remove', flags = 'f', type = 'rast', name = self.tempmap)
+ run('g.remove', flags = 'f', type = 'raster', name = self.tempmap)
tempimg = wx.Image(self.tempfile)
grass.try_remove(self.tempfile)
Modified: grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -155,7 +155,7 @@
# lflags += 'n'
make_frame(f, 0, 90, 70, 100)
- grass.run_command('d.legend', flags = lflags, rast = lmap, lines = nlines, at = leg_at)
+ grass.run_command('d.legend', flags = lflags, raster = lmap, lines = nlines, at = leg_at)
#draw map
make_frame(f, 0, 100, 0, 70)
Modified: grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -47,15 +47,6 @@
def main():
options, unused = gcore.parser()
- env = gcore.gisenv()
- mon = env.get('MONITOR', None)
- if not mon:
- # os is needed only here
- import os
- if not 'GRASS_RENDER_IMMEDIATE' in os.environ:
- gcore.fatal(_("No graphics device selected."
- " Use d.mon to select graphics device."))
-
drape_map = options['drapemap']
relief_map = options['reliefmap']
brighten = options['brighten']
Modified: grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -107,7 +107,7 @@
else:
# remove the vector part
grass.run_command('v.db.connect', quiet = True, map = output, layer = '1', flags = 'd')
- grass.run_command('g.remove', quiet = True, flags = 'f', type = 'vect', name = output)
+ grass.run_command('g.remove', flags = 'f', quiet = True, type = 'vector', name = output)
# get rid of superfluous auto-added cat column (and cat_ if present)
nuldev = file(os.devnull, 'w+')
Modified: grass/branches/releasebranch_7_0/scripts/i.in.spotvgt/i.in.spotvgt.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.in.spotvgt/i.in.spotvgt.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/i.in.spotvgt/i.in.spotvgt.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -180,7 +180,7 @@
grass.message(_("Remapping digital numbers to NDVI..."))
tmpname = "%s_%s" % (name, pid)
grass.mapcalc("$tmpname = 0.004 * $name - 0.1", tmpname = tmpname, name = name)
- grass.run_command('g.remove', type = 'rast', name = name, quiet = True, flags = 'f')
+ grass.run_command('g.remove', type = 'raster', name = name, quiet = True, flags = 'f')
grass.run_command('g.rename', raster = (tmpname, name), quiet = True)
# write cmd history:
Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -175,7 +175,7 @@
pr.wait()
# Cleanup
- grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+ grass.run_command('g.remove', flags='f', quiet=True, type='raster',
name='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
elif sharpen == "ihs":
@@ -206,7 +206,7 @@
blue="%s_blue" % out)
# Cleanup
- grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+ grass.run_command('g.remove', flags='f', quiet=True, type='raster',
name=panmatch)
elif sharpen == "pca":
@@ -307,7 +307,7 @@
pb.wait()
# Cleanup
- grass.run_command('g.remove', flags='f', quiet=True, type="rast",
+ grass.run_command('g.remove', flags='f', quiet=True, type="raster",
pattern='tmp%s*,%s' % (pid, panmatch))
# Could add other sharpening algorithms here, e.g. wavelet transformation
@@ -349,7 +349,7 @@
input="{n}_red,{n}_blue,{n}_green".format(n=out))
# Cleanup
- grass.run_command('g.remove', flags="f", type="rast",
+ grass.run_command('g.remove', flags="f", type="raster",
pattern="tmp%s*" % pid, quiet=True)
@@ -432,7 +432,7 @@
# create reclass of target from reclass rules file
result = grass.core.find_file(matched, element='cell')
if result['fullname']:
- grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+ grass.run_command('g.remove', flags='f', quiet=True, type='raster',
name=matched)
grass.run_command('r.reclass', input=original, out=matched,
rules=outfile.name)
Modified: grass/branches/releasebranch_7_0/scripts/r.buffer.lowmem/r.buffer.lowmem.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.buffer.lowmem/r.buffer.lowmem.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.buffer.lowmem/r.buffer.lowmem.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -58,9 +58,9 @@
# what to do in case of user break:
def cleanup():
if grass.find_file(temp_src)['file']:
- grass.run_command('g.remove', quiet = True, flags = 'bf', type = 'rast', name = temp_src)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'raster', name = temp_src)
if grass.find_file(temp_dist)['file']:
- grass.run_command('g.remove', quiet = True, flags = 'bf', type = 'rast', name = temp_dist)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'raster', name = temp_dist)
def main():
global temp_dist, temp_src
Modified: grass/branches/releasebranch_7_0/scripts/r.colors.stddev/r.colors.stddev.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.colors.stddev/r.colors.stddev.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.colors.stddev/r.colors.stddev.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -40,7 +40,8 @@
def cleanup():
if tmpmap:
- grass.run_command('g.remove', type='rast', name=tmpmap, quiet=True, flags='f')
+ grass.run_command('g.remove', flags = 'f', type = 'raster',
+ name = tmpmap, quiet = True)
def main():
global tmpmap
Modified: grass/branches/releasebranch_7_0/scripts/r.fillnulls/r.fillnulls.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.fillnulls/r.fillnulls.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.fillnulls/r.fillnulls.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -101,9 +101,9 @@
def cleanup():
#delete internal mask and any TMP files:
if len(tmp_vmaps) > 0:
- grass.run_command('g.remove', quiet=True, flags='bf', type='vect', name=tmp_vmaps)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'vector', name = tmp_vmaps)
if len(tmp_rmaps) > 0:
- grass.run_command('g.remove', quiet=True, flags='bf', type='rast', name=tmp_rmaps)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'raster', name = tmp_rmaps)
if usermask and mapset:
if grass.find_file(usermask, mapset = mapset)['file']:
grass.run_command('g.rename', quiet = True, raster = (usermask, 'MASK'), overwrite = True)
@@ -253,7 +253,7 @@
# remove temporary map to not overfill disk
try:
- grass.run_command('g.remove', flags='fb', type='vect',
+ grass.run_command('g.remove', flags='fb', type='vector',
name=holename + '_pol', quiet=quiet)
except CalledModuleError:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
@@ -360,7 +360,7 @@
pass
try:
grass.run_command('g.remove', quiet=quiet,
- flags='fb', type='rast',
+ flags='fb', type='raster',
name=(holename,
holename + '_grown',
holename + '_edges',
@@ -373,7 +373,7 @@
pass
try:
grass.run_command('g.remove', quiet=quiet, flags='fb',
- type='vect', name=holename)
+ type='vector', name=holename)
except CalledModuleError:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
Modified: grass/branches/releasebranch_7_0/scripts/r.grow/r.grow.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.grow/r.grow.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.grow/r.grow.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -70,7 +70,8 @@
def cleanup():
for map in [temp_dist, temp_val]:
if map:
- grass.run_command('g.remove', quiet=True, flags='bf', type='rast', name=map)
+ grass.run_command('g.remove', flags = 'fb', quiet = True,
+ type='rast', name = map)
def main():
global temp_dist, temp_val
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 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.in.wms/wms_base.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -467,9 +467,9 @@
if maps:
grass.run_command('g.remove',
quiet = True,
- flags = 'bf',
+ flags = 'fb',
type = 'rast',
- name = ','.join(maps))
+ name = ','.join(maps))
# delete environmental variable which overrides region
if 'GRASS_REGION' in os.environ.keys():
Modified: grass/branches/releasebranch_7_0/scripts/r.mask/r.mask.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.mask/r.mask.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.mask/r.mask.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -75,9 +75,11 @@
def cleanup():
if tmp:
- grass.run_command('g.remove', type='rast', name=tmp, quiet=True, flags='f')
+ grass.run_command('g.remove', flags = 'f', type = 'raster',
+ name = tmp, quiet = True)
if tmp_hull:
- grass.run_command('g.remove', type='vect', name=tmp_hull, quiet=True, flags='f')
+ grass.run_command('g.remove', flags = 'f', type = 'vector',
+ name = tmp_hull, quiet = True)
def main():
raster = options['raster']
@@ -98,7 +100,8 @@
if remove:
# -> remove
if exists:
- grass.run_command('g.remove', quiet=True, type='rast', name='MASK', flags='f')
+ grass.run_command('g.remove', flags = 'f', quiet = True,
+ type = 'raster', name = 'MASK')
grass.message(_("Raster MASK removed"))
else:
grass.fatal(_("No existing MASK to remove"))
@@ -109,7 +112,8 @@
grass.fatal(_("MASK already found in current mapset. Delete first or overwrite."))
else:
grass.warning(_("MASK already exists and will be overwritten"))
- grass.run_command('g.remove', quiet=True, type='rast', name='MASK', flags='f')
+ grass.run_command('g.remove', flags = 'f', quiet = True,
+ type = 'raster', name = 'MASK')
if raster:
# check if input raster exists
Modified: grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -4,12 +4,12 @@
# MODULE: r.out.xyz
# AUTHOR: M. Hamish Bowman, Dept. Marine Science, Otago Univeristy,
# New Zealand
-# Converted to Python by Glynn Clements
+# Converted to Python by Glynn Clements
# PURPOSE: Export a raster map as x,y,z values based on cell centers
# This is a simple wrapper script for "r.stats -1ng"
#
# COPYRIGHT: (c) 2006 Hamish Bowman, and the GRASS Development Team
-# (c) 2008 Glynn Clements, and the GRASS Development Team
+# (c) 2008 Glynn Clements, and the GRASS Development Team
# This program is free software under the GNU General Public
# License (>=v2). Read the file COPYING that comes with GRASS
# for details.
@@ -40,15 +40,12 @@
def main():
# if no output filename, output to stdout
output = options['output']
- sep = options['separator']
parameters = dict(flags="1gn",
- input=options['input'])
+ input=options['input'],
+ separator=options['separator'])
if output:
parameters.update(output=output)
- # windows don't like pipe so we don't include it in the command explicitly
- if sep != '|':
- parameters.update(separator=sep)
ret = 0
try:
Modified: grass/branches/releasebranch_7_0/scripts/r.reclass.area/r.reclass.area.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.reclass.area/r.reclass.area.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.reclass.area/r.reclass.area.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -221,10 +221,10 @@
TMPRAST.reverse() # reclassed map first
for mapp in TMPRAST:
if method == 'rmarea':
- grass.run_command("g.remove", flags='f', type='vect', name=mapp,
+ grass.run_command("g.remove", flags='f', type='vector', name=mapp,
quiet=True)
else:
- grass.run_command("g.remove", flags='f', type='rast', name=mapp,
+ grass.run_command("g.remove", flags='f', type='raster', name=mapp,
quiet=True)
if __name__ == "__main__":
Modified: grass/branches/releasebranch_7_0/scripts/r.unpack/test_suite/test.r.unpack.sh
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-12-20 14:41:23 UTC (rev 63649)
@@ -21,7 +21,7 @@
r.pack --o --v -c input=test_double output=test_double_uncompressed.pack
# Remove generated maps and re-import
-g.remove -f type=rast name=test_int,test_float,test_double
+g.remove -f type=raster name=test_int,test_float,test_double
# Second we check the import with r.unpack
r.unpack --o --v input=test_int.pack
@@ -42,5 +42,5 @@
#r.out.ascii --o input=test_float_uncompressed output=test_float_uncompressed.ref dp=1
#r.out.ascii --o input=test_double_uncompressed output=test_double_uncompressed.ref dp=1
-g.remove -f type=rast name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
+g.remove -f type=raster name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
rm *.pack
Modified: grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -43,7 +43,7 @@
def cleanup():
nuldev = file(os.devnull, 'w')
- grass.run_command('g.remove', type='vect', name='%s_%s' % (output, tmp), quiet=True, flags='f', stderr=nuldev)
+ grass.run_command('g.remove', flags = 'f', type = 'vector', name = '%s_%s' % (output, tmp), quiet = True, stderr = nuldev)
def main():
global output, tmp
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 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -100,10 +100,12 @@
# only try to remove map if it exists to avoid ugly warnings
if tmp_vogb:
if grass.find_file(tmp_vogb, element = 'vector')['name']:
- grass.run_command('g.remove', type='vect', name=tmp_vogb, quiet=True, flags='f')
+ grass.run_command('g.remove', flags = 'f', type = 'vector',
+ name = tmp_vogb, quiet = True)
if tmp_extr:
if grass.find_file(tmp_extr, element = 'vector')['name']:
- grass.run_command('g.remove', type='vect', name=tmp_vogb, quiet=True, flags='f')
+ grass.run_command('g.remove', flags = 'f', type = 'vector',
+ name = tmp_vogb, quiet = True)
tmp = None
tmp_proj = None
Modified: grass/branches/releasebranch_7_0/scripts/v.rast.stats/v.rast.stats.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.rast.stats/v.rast.stats.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/v.rast.stats/v.rast.stats.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -70,8 +70,10 @@
def cleanup():
if rastertmp:
- grass.run_command('g.remove', type='rast', name=rastertmp, quiet=True, flags='f')
- grass.run_command('g.remove', type='rast', name='MASK', quiet=True, flags='f', stderr=nuldev)
+ grass.run_command('g.remove', flags='f', type='raster',
+ name=rastertmp, quiet=True)
+ grass.run_command('g.remove', flags='f', type='raster',
+ name='MASK', quiet=True, stderr=nuldev)
if mask_found:
grass.message(_("Restoring previous MASK..."))
grass.run_command('g.rename', raster=(tmpname + "_origmask", 'MASK'),
@@ -293,7 +295,7 @@
grass.warning(_("Failed to upload statistics to attribute table of vector map <%s>.") % vector)
exitcode = 1
finally:
- grass.run_command('g.remove', flags='f', type='rast',
+ grass.run_command('g.remove', flags='f', type='raster',
name='MASK', quiet=True, stderr=nuldev)
sys.exit(exitcode)
Modified: grass/branches/releasebranch_7_0/scripts/v.to.lines/v.to.lines.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.to.lines/v.to.lines.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/v.to.lines/v.to.lines.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -95,31 +95,31 @@
option='add', input=input, out=input_tmp,
quiet=quiet)
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=input_tmp, quiet=quiet,
- flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=input_tmp, quiet=quiet)
grass.fatal(_("Error creating layer 2"))
try:
grass.run_command('v.db.addtable', map=input_tmp, layer="2",
columns="left integer,right integer",
quiet=quiet)
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=input_tmp, quiet=quiet,
- flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=input_tmp, quiet=quiet)
grass.fatal(_("Error creating new table for layer 2"))
try:
grass.run_command('v.to.db', map=input_tmp, option="sides",
columns="left,right", layer="2", quiet=quiet)
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=input_tmp, quiet=quiet,
- flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=input_tmp, quiet=quiet)
grass.fatal(_("Error populating new table for layer 2"))
try:
grass.run_command('v.type', input=input_tmp, output=out_type,
from_type='boundary', to_type='line',
quiet=quiet, layer="2")
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=remove_names,
- quiet=quiet, flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error converting polygon to line"))
report = grass.read_command('v.category', flags='g', input=out_type,
option='report', quiet=quiet).split('\n')
@@ -134,8 +134,8 @@
type='centroid', layer=2, quiet=quiet,
cats='{mi}-{ma}'.format(mi=min_cat, ma=max_cat))
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=remove_names,
- quiet=quiet, flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error removing centroids"))
try:
@@ -144,8 +144,8 @@
grass.run_command('v.db.droptable', map=out_type, layer=1,
flags='f', quiet=True)
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=remove_names,
- quiet=quiet, flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error removing table from layer 1"))
# TODO: when this except is happaning, it seems that never, so it seems wrong
except:
@@ -155,14 +155,14 @@
output=output, layer="2,1", quiet=quiet,
overwrite=overwrite)
except CalledModuleError:
- grass.run_command('g.remove', type='vect', name=remove_names,
- quiet=quiet, flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error adding categories"))
- grass.run_command('g.remove', type='vect', name=remove_names, quiet=quiet,
- flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=remove_names, quiet=quiet)
if point:
- grass.run_command('g.remove', type='vect', name=out_temp, quiet=quiet,
- flags='f')
+ grass.run_command('g.remove', flags='f', type='vector',
+ name=out_temp, quiet=quiet)
if __name__ == "__main__":
Modified: grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -91,7 +91,8 @@
grass.fatal(_("Vector map <%s> already exists") % map_name)
elif overwrite == '1' and gfile['file']:
grass.warning(_("Vector map <%s> already exists and will be overwritten") % map_name)
- grass.run_command('g.remove', quiet=True, flags='f', type='vect', name=map_name)
+ grass.run_command('g.remove', flags='f', quiet=True, type='vector',
+ name=map_name)
shutil.rmtree(new_dir, True)
# extract data
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
+ /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
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -501,7 +501,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.remove", flags='f', type="rast", name=map.get_name(), quiet=True)
+ grass.run_command("g.remove", flags='f', type="raster", name=map.get_name(), quiet=True)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -186,7 +186,7 @@
else:
names += ",%s" % (map.get_name())
- grass.run_command("g.remove", flags='f', type='rast', name=names, quiet=True)
+ grass.run_command("g.remove", flags='f', type='raster', name=names, quiet=True)
dbif.close()
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 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -146,8 +146,8 @@
count += 1
if use_granularity:
- grass.run_command("g.remove", flags='f', type='rast', name=null_map)
- grass.run_command("g.remove", flags='f', type='rast', name=map_name)
+ grass.run_command("g.remove", flags='f', type='raster', name=null_map)
+ grass.run_command("g.remove", flags='f', type='raster', name=map_name)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -151,7 +151,7 @@
except CalledModuleError:
grass.fatal(_("Unable to create 3D raster map <%s>" % output))
- grass.run_command("g.remove", flags='f', type='rast', name=null_map)
+ grass.run_command("g.remove", flags='f', type='raster', name=null_map)
title = _("Space time voxel cube")
descr = _("This space time voxel cube was created with t.rast.to.rast3")
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -68,7 +68,7 @@
"""Remove generated data"""
#self.runModule("t.remove", flags="rf", type="strds",
# inputs="precip_i,precip_f,precip_d")
- #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
+ #self.runModule('g.remove', type='raster', pattern='prec_*', flags='f')
self.del_temp_region()
def otest_3m(self):
@@ -257,13 +257,13 @@
def tearDown(self):
"""Remove generated data"""
#self.runModule("t.remove", flags="rf", type="strds", inputs="precip_d")
- #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
+ #self.runModule('g.remove', type='raster', pattern='prec_*', flags='f')
self.del_temp_region()
def otest_years(self):
"""Convert STRDS into 3d raster map, granularity5 years"""
- self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ self.runModule("t.register", flags="i", type="raster", input="precip_d",
maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
start="2000-01-01", increment="5 years")
@@ -291,7 +291,7 @@
def otest_months(self):
"""Convert STRDS into 3d raster map, granularity 6 months"""
- self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ self.runModule("t.register", flags="i", type="raster", input="precip_d",
maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
start="2000-01-01", increment="6 months")
@@ -319,7 +319,7 @@
def otest_days(self):
"""Convert STRDS into 3d raster map, granularity 7 days"""
- self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ self.runModule("t.register", flags="i", type="raster", input="precip_d",
maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
start="2000-01-01", increment="7 days")
@@ -348,7 +348,7 @@
def otest_hours(self):
"""Convert STRDS into 3d raster map, granularity 7 days"""
- self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ self.runModule("t.register", flags="i", type="raster", input="precip_d",
maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
start="2000-01-01", increment="3 hours")
@@ -377,7 +377,7 @@
def otest_minutes(self):
"""Convert STRDS into 3d raster map, granularity 7 days"""
- self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ self.runModule("t.register", flags="i", type="raster", input="precip_d",
maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
start="2000-01-01", increment="17 minutes")
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -188,7 +188,7 @@
if aggreagated_map_name:
try:
- grass.run_command("g.remove", flags='f', type='rast',
+ grass.run_command("g.remove", flags='f', type='raster',
name=aggreagated_map_name)
except CalledModuleError:
dbif.close()
Modified: grass/branches/releasebranch_7_0/tools/thumbnails.py
===================================================================
--- grass/branches/releasebranch_7_0/tools/thumbnails.py 2014-12-20 14:36:14 UTC (rev 63648)
+++ grass/branches/releasebranch_7_0/tools/thumbnails.py 2014-12-20 14:41:23 UTC (rev 63649)
@@ -30,10 +30,10 @@
if tmp_img:
grass.try_remove(tmp_img)
if tmp_grad_rel:
- grass.run_command('g.remove', flags = 'f', type = 'rast',
+ grass.run_command('g.remove', flags = 'f', type = 'raster',
name = tmp_grad_rel, quiet = True)
if tmp_grad_abs:
- grass.run_command('g.remove', flags = 'f', type = 'rast',
+ grass.run_command('g.remove', flags = 'f', type = 'raster',
name = tmp_grad_abs, quiet = True)
# def rotate(src, dst):
More information about the grass-commit
mailing list