[GRASS-SVN] r60935 - grass/branches/releasebranch_7_0/gui/wxpython/core
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jun 23 20:34:19 PDT 2014
Author: annakrat
Date: 2014-06-23 20:34:19 -0700 (Mon, 23 Jun 2014)
New Revision: 60935
Modified:
grass/branches/releasebranch_7_0/gui/wxpython/core/gconsole.py
Log:
wxGUI: add each layer and not throw error when defined output maps are multiple, e.g. in r.series.interp (merge from trunk, r60934)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/gconsole.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/gconsole.py 2014-06-24 03:31:02 UTC (rev 60934)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/gconsole.py 2014-06-24 03:34:19 UTC (rev 60935)
@@ -654,10 +654,15 @@
if prompt in ('raster', 'vector', '3d-raster') and p.get('value', None):
if p.get('age', 'old') == 'new' or \
name in ('r.colors', 'r3.colors', 'v.colors', 'v.proj', 'r.proj'):
- lname = p.get('value')
- if '@' not in lname:
- lname += '@' + grass.gisenv()['MAPSET']
- self.mapCreated.emit(name=lname, ltype=prompt)
+ # if multiple maps (e.g. r.series.interp), we need add each
+ if p.get('multiple', False):
+ lnames = p.get('value').split(',')
+ else:
+ lnames = [p.get('value')]
+ for lname in lnames:
+ if '@' not in lname:
+ lname += '@' + grass.gisenv()['MAPSET']
+ self.mapCreated.emit(name=lname, ltype=prompt)
if name == 'r.mask':
self.updateMap.emit()
More information about the grass-commit
mailing list