[GRASS-SVN] r48430 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-09-23 10:57:26 -0700 (Fri, 23 Sep 2011)
New Revision: 48430

Modified:
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI/menuform: don't overwrite pMap variable


Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2011-09-23 17:45:46 UTC (rev 48429)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2011-09-23 17:57:26 UTC (rev 48430)
@@ -205,12 +205,12 @@
         
         if not pMap:
             pMap = self.task.get_param('input', raiseError = False)
-
+        
         if pMap:
             map = pMap.get('value', '')
         else:
             map = None
-
+        
         # avoid running db.describe several times
         cparams = dict()
         cparams[map] = { 'dbInfo' : None,
@@ -254,9 +254,9 @@
                         layer = p.get('default', '')
                     
                     # get map name
-                    pMap = self.task.get_param(p['wxId'][0], element = 'wxId-bind', raiseError = False)
-                    if pMap:
-                        map = pMap.get('value', '')
+                    pMapL = self.task.get_param(p['wxId'][0], element = 'wxId-bind', raiseError = False)
+                    if pMapL:
+                        map = pMapL.get('value', '')
             
             if name == 'TableSelect' or \
                     (name == 'ColumnSelect' and not map):
@@ -274,6 +274,7 @@
             if name == 'LayerSelect':
                 # determine format
                 native = True
+                
                 for id in pMap['wxId']:
                     winVec  = self.parent.FindWindowById(id)
                     if winVec.GetName() == 'VectorFormat' and \