[GRASS-SVN] r41121 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-02-19 11:27:50 -0500 (Fri, 19 Feb 2010)
New Revision: 41121

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py
Log:
wxGUI: bugfix #950
(merge r41120 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py	2010-02-19 16:21:32 UTC (rev 41120)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/workspace.py	2010-02-19 16:27:50 UTC (rev 41121)
@@ -155,12 +155,11 @@
             # process all layers/groups in the display
             self.__processLayers(display)
 
-    def __processLayers(self, node):
+    def __processLayers(self, node, inGroup = False):
         """!Process layers/groups of selected display
-
-        @todo Fix group flag
         
         @param node display tree node
+        @param inGroup True when group is defined
         """
         for item in node.getchildren():
             if item.tag == 'group':
@@ -171,10 +170,13 @@
                         "checked" : bool(int(item.get('checked', "0"))),
                         "opacity" : None,
                         "cmd"     : None,
-                        "group"   : False, #### self.inTag['group'], # ???
+                        "group"   : inGroup,
                         "display" : self.displayIndex,
+                        "vdigit"  : None,
                         "nviz"    : None})
                 
+                self.__processLayers(item, inGroup = True) # process items in group
+                
             elif item.tag == 'layer':
                 cmd, selected, vdigit, nviz = self.__processLayer(item)
                 
@@ -184,7 +186,7 @@
                         "checked"  : bool(int(item.get('checked', "0"))),
                         "opacity"  : float(item.get('opacity', '1.0')),
                         "cmd"      : cmd,
-                        "group"    : False, #### self.inTag['group'], # ???
+                        "group"    : inGroup,
                         "display"  : self.displayIndex,
                         "selected" : selected,
                         "vdigit"   : vdigit,