[GRASS-SVN] r69805 - grass/branches/releasebranch_7_2/gui/wxpython/lmgr

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-11-13 14:12:03 -0800 (Sun, 13 Nov 2016)
New Revision: 69805

Modified:
   grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py
   grass/branches/releasebranch_7_2/gui/wxpython/lmgr/layertree.py
Log:
wxGUI: fix layer order when loading workspace, see #3196 (merge from trunk, r69775)

Modified: grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py	2016-11-13 22:00:24 UTC (rev 69804)
+++ grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py	2016-11-13 22:12:03 UTC (rev 69805)
@@ -1458,7 +1458,6 @@
         for layer in gxwXml.layers:
             display = layer['display']
             maptree = self.notebookLayers.GetPage(display).maptree
-
             newItem = maptree.AddLayer(ltype=layer['type'],
                                        lname=layer['name'],
                                        lchecked=layer['checked'],
@@ -1466,7 +1465,8 @@
                                        lcmd=layer['cmd'],
                                        lgroup=layer['group'],
                                        lnviz=layer['nviz'],
-                                       lvdigit=layer['vdigit'])
+                                       lvdigit=layer['vdigit'],                                       
+                                       loadWorkspace=True)
 
             if 'selected' in layer:
                 selectList.append((maptree, newItem, layer['selected']))

Modified: grass/branches/releasebranch_7_2/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/lmgr/layertree.py	2016-11-13 22:00:24 UTC (rev 69804)
+++ grass/branches/releasebranch_7_2/gui/wxpython/lmgr/layertree.py	2016-11-13 22:12:03 UTC (rev 69805)
@@ -1275,7 +1275,8 @@
         event.Skip()
 
     def AddLayer(self, ltype, lname=None, lchecked=None, lopacity=1.0,
-                 lcmd=None, lgroup=None, lvdigit=None, lnviz=None, multiple=True):
+                 lcmd=None, lgroup=None, lvdigit=None, lnviz=None,
+                 multiple=True, loadWorkspace=False):
         """Add new item to the layer tree, create corresponding MapLayer instance.
         Launch property dialog if needed (raster, vector, etc.)
 
@@ -1288,6 +1289,7 @@
         :param lvdigit: vector digitizer settings (eg. geometry attributes)
         :param lnviz: layer Nviz properties
         :param bool multiple: True to allow multiple map layers in layer tree
+        :param bool loadWorkspace: True if called when loading workspace
         """
         if lname and not multiple:
             # check for duplicates
@@ -1323,36 +1325,36 @@
             ctrl.SetToolTipString(_("Click to edit layer settings"))
             self.Bind(wx.EVT_BUTTON, self.OnLayerContextMenu, ctrl)
         # add layer to the layer tree
-        if selectedLayer and selectedLayer != self.GetRootItem():
-            if self.GetLayerInfo(selectedLayer, key='type') == 'group' \
-                    and self.IsExpanded(selectedLayer):
-                # add to group (first child of self.layer_selected) if group
-                # expanded
-                layer = self.PrependItem(parent=selectedLayer,
-                                         text='', ct_type=1, wnd=ctrl)
-            else:
-                # prepend to individual layer or non-expanded group
-                if lgroup == -1:
-                    # -> last child of root (loading from workspace)
-                    layer = self.AppendItem(parentId=self.root,
-                                            text='', ct_type=1, wnd=ctrl)
-                elif lgroup > -1:
-                    # -> last child of group (loading from workspace)
-                    parent = self.FindItemByIndex(index=lgroup)
-                    if not parent:
-                        parent = self.root
-                    layer = self.AppendItem(parentId=parent,
-                                            text='', ct_type=1, wnd=ctrl)
-                elif lgroup is None:
+        if loadWorkspace:
+            # when loading workspace, we always append
+            if lgroup == -1:
+                # -> last child of root (loading from workspace)
+                layer = self.AppendItem(parentId=self.root,
+                                        text='', ct_type=1, wnd=ctrl)
+            elif lgroup > -1:
+                # -> last child of group (loading from workspace)
+                parent = self.FindItemByIndex(index=lgroup)
+                if not parent:
+                    parent = self.root
+                layer = self.AppendItem(parentId=parent,
+                                        text='', ct_type=1, wnd=ctrl)
+        else:
+            if selectedLayer and selectedLayer != self.GetRootItem():
+                if selectedLayer and self.GetLayerInfo(selectedLayer, key='type') == 'group' \
+                        and self.IsExpanded(selectedLayer):
+                    # add to group (first child of self.layer_selected) if group
+                    # expanded
+                    layer = self.PrependItem(parent=selectedLayer,
+                                             text='', ct_type=1, wnd=ctrl)
+                else:
                     # -> previous sibling of selected layer
                     parent = self.GetItemParent(selectedLayer)
                     layer = self.InsertItem(
-                        parentId=parent, input=self.GetPrevSibling(
-                            selectedLayer),
-                        text='', ct_type=1, wnd=ctrl)
-        else:  # add first layer to the layer tree (first child of root)
-            layer = self.PrependItem(
-                parent=self.root, text='', ct_type=1, wnd=ctrl)
+                                parentId=parent, input=self.GetPrevSibling(selectedLayer),
+                                text='', ct_type=1, wnd=ctrl)
+            else:  # add first layer to the layer tree (first child of root)
+                layer = self.PrependItem(
+                    parent=self.root, text='', ct_type=1, wnd=ctrl)
 
         # layer is initially unchecked as inactive (beside 'command')
         # use predefined value if given