[GRASS-SVN] r58471 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-12-16 03:28:54 -0800 (Mon, 16 Dec 2013)
New Revision: 58471

Modified:
   grass/trunk/gui/wxpython/gui_core/forms.py
Log:
wxGUI/forms: fix dialogs with more signature file params (i.cluster)


Modified: grass/trunk/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/forms.py	2013-12-16 11:09:03 UTC (rev 58470)
+++ grass/trunk/gui/wxpython/gui_core/forms.py	2013-12-16 11:28:54 UTC (rev 58471)
@@ -311,7 +311,7 @@
                 
                 self.data[win.Insert] = { 'group' : group,
                                           'subgroup' : subgroup}
-            
+                
             elif name == 'LocationSelect':
                 pDbase = self.task.get_param('dbase', element = 'element', raiseError = False)
                 if pDbase:
@@ -1637,7 +1637,7 @@
         pColumn = []
         pGroup = None
         pSubGroup = None
-        pSigFile = None
+        pSigFile = []
         pDbase = None
         pLocation = None
         pMapset = None
@@ -1677,7 +1677,7 @@
             elif prompt == 'subgroup':
                 pSubGroup = p
             elif prompt == 'sigfile':
-                pSigFile = p
+                pSigFile.append(p)
             elif prompt == 'dbase':
                 pDbase = p
             elif prompt == 'location':
@@ -1688,10 +1688,13 @@
         # collect ids
         pColumnIds = []
         for p in pColumn:
-            pColumnIds +=  p['wxId']
+            pColumnIds += p['wxId']
         pLayerIds = []
         for p in pLayer:
-            pLayerIds +=  p['wxId']
+            pLayerIds += p['wxId']
+        pSigFileIds = []
+        for p in pSigFile:
+            pSigFileIds += p['wxId']
         
         # set wxId-bindings
         if pMap:
@@ -1714,8 +1717,8 @@
         
         if pGroup and pSubGroup:
             if pSigFile:
-                pGroup['wxId-bind'] = copy.copy(pSigFile['wxId']) + pSubGroup['wxId']
-                pSubGroup['wxId-bind'] = pSigFile['wxId']
+                pGroup['wxId-bind'] = pSigFileIds + pSubGroup['wxId']
+                pSubGroup['wxId-bind'] = pSigFileIds
             else:
                 pGroup['wxId-bind'] = pSubGroup['wxId']