[GRASS-SVN] r68042 - grass/branches/releasebranch_7_0/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-03-12 08:02:24 -0800 (Sat, 12 Mar 2016)
New Revision: 68042

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
Log:
wxGUI/forms: do not force fully qualified map names (keep it on the user, forcing can cause problems to the modeler)
             (merge r68040 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py	2016-03-12 15:31:58 UTC (rev 68041)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py	2016-03-12 16:02:24 UTC (rev 68042)
@@ -2393,20 +2393,6 @@
                                        { 'cmd' : cmd[0],
                                          'key' : key })
                         continue
-                    multiple = task['multiple']
-                    element = task['element']
-                    # to filter out g.copy, g.rename
-                    key_desc = task['key_desc']
-                    # do we need to find mapset for each of multiple maps?
-                    if element in ['cell', 'vector'] and not multiple and len(key_desc) != 2:
-                        # mapname -> mapname at mapset
-                        try:
-                            name, mapset = value.split('@')
-                        except ValueError:
-                            mapset = grass.find_file(value, element)['mapset']
-                            curr_mapset = grass.gisenv()['MAPSET']
-                            if mapset and mapset !=  curr_mapset:
-                                value = value + '@' + mapset
                     
                     self.grass_task.set_param(key, value)
                     cmd_validated.append(key + '=' + value)