Explorar o código

wxGUI: fix dialog with more 'layer' options
(merge from devbr6, https://trac.osgeo.org/grass/changeset/34629)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34630 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa %!s(int64=16) %!d(string=hai) anos
pai
achega
2fd84a7cc8
Modificáronse 1 ficheiros con 6 adicións e 3 borrados
  1. 6 3
      gui/wxpython/gui_modules/menuform.py

+ 6 - 3
gui/wxpython/gui_modules/menuform.py

@@ -1308,6 +1308,7 @@ class cmdPanel(wx.Panel):
         #
         pMap = None
         pLayer = None
+        pLayerList = []
         pDriver = None
         pDatabase = None
         pTable = None
@@ -1323,7 +1324,9 @@ class cmdPanel(wx.Panel):
                 if name in ('map', 'input'):
                     pMap = p
             elif prompt == 'layer':
-                pLayer = p
+                pLayerList.append(p['wxId'])
+                if not pLayer: # TODO: check all 'layer' options
+                    pLayer = p
             elif prompt == 'dbcolumn':
                 pColumn.append(p['wxId'])
             elif prompt == 'dbdriver':
@@ -1336,10 +1339,10 @@ class cmdPanel(wx.Panel):
         if pMap:
             pMap['wxId-bind'] = copy.copy(pColumn)
             if pLayer:
-                pMap['wxId-bind'].append(pLayer['wxId'])
+                pMap['wxId-bind'] += pLayerList
         
         if pLayer:
-            pLayer['wxId-bind'] = pColumn
+            p['wxId-bind'] = pColumn
 
         if pDriver and pTable:
             pDriver['wxId-bind'] = [pTable['wxId'], ]