wxGUI: fix workspace (opacity and command layers)

(merge from devbr6, https://trac.osgeo.org/grass/changeset/33188)


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

gui/wxpython/gui_modules/render.py

@@ -194,7 +194,7 @@ class Layer(object):
                 cmdStr = ''
                 for cmd in self.cmdlist:
                     cmdStr += ' '.join(cmd) + ';'
-                return cmdStr
+                return cmdStr.rstrip(';')
             else:
                 return ' '.join(self.cmdlist)
         else:
@@ -1022,7 +1022,7 @@ class Map(object):
         """
 
         Debug.msg (3, "Map.ChangeLayer(): layer=%s" % layer.name)
-
+        
         if kargs.has_key('type'):
             layer.SetType(kargs['type']) # check type
         

gui/wxpython/gui_modules/workspace.py

@@ -235,7 +235,7 @@ class ProcessWorkspaceFile(HandlerBase):
                     "type"     : self.layerType,
                     "name"     : self.layerName,
                     "checked"  : int(self.layerChecked),
-                    "opacity"  : None,
+                    "opacity"  : 1.0,
                     "cmd"      : None,
                     "group"    : self.inTag['group'],
                     "display"  : self.displayIndex,
@@ -246,7 +246,7 @@ class ProcessWorkspaceFile(HandlerBase):
                 self.layers[-1]["opacity"] = float(self.layerOpacity)
             if self.cmd:
                 self.layers[-1]["cmd"] = self.cmd
-
+            
             self.layerType = self.layerName = self.Checked = \
                 self.Opacity = self.cmd = None
 
@@ -404,10 +404,10 @@ class WriteWorkspaceFile(object):
                 maplayer = None
 
             checked = int(item.IsChecked())
-            cmd = mapTree.GetPyData(item)[0]['cmd']
             if type == 'command':
+                cmd = mapTree.GetPyData(item)[0]['maplayer'].GetCmd(string=True)
                 self.file.write('%s<layer type="%s" name="%s" checked="%d">\n' % \
-                               (' ' * self.indent, type, ' '.join(cmd), checked));
+                               (' ' * self.indent, type, cmd, checked));
                 self.file.write('%s</layer>\n' % (' ' * self.indent));
             elif type == 'group':
                 name = mapTree.GetItemText(item)
@@ -419,6 +419,7 @@ class WriteWorkspaceFile(object):
                 self.indent -= 4
                 self.file.write('%s</group>\n' % (' ' * self.indent));
             else:
+                cmd = mapTree.GetPyData(item)[0]['maplayer'].GetCmd(string=False)
                 name = mapTree.GetItemText(item)
                 # remove 'opacity' part
                 if '(opacity' in name:

gui/wxpython/gui_modules/wxgui_utils.py

@@ -649,17 +649,16 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         self.first = False
 
         if ltype != 'group':
-            if lopacity:
-                opacity = int(lopacity * 100)
-            else:
-                opacity = 100
-            
             if lcmd and len(lcmd) > 1:
                 cmd = lcmd
                 render = False
                 name = utils.GetLayerNameFromCmd(lcmd)
             else:
                 cmd = []
+                if ltype == 'command' and lname:
+                    for c in lname.split(';'):
+                        cmd.append(c.split(' '))
+                
                 render = False
                 name = None
 
@@ -695,7 +694,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
             maplayer = self.Map.AddLayer(pos=pos,
                                          type=ltype, command=self.GetPyData(layer)[0]['cmd'], name=name,
                                          l_active=checked, l_hidden=False,
-                                         l_opacity=opacity, l_render=render)
+                                         l_opacity=lopacity, l_render=render)
             self.GetPyData(layer)[0]['maplayer'] = maplayer
 
             # run properties dialog if no properties given
@@ -718,13 +717,13 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         if lname:
             if ltype == 'group':
                 self.SetItemText(layer, lname)
-            elif ltype != 'command':
+            elif ltype == 'command':
+                ctrl.SetValue(lname)
+            else:
                 name = lname + ' (opacity: ' + \
                        str(self.GetPyData(layer)[0]['maplayer'].GetOpacity()) + '%)'
                 self.SetItemText(layer, name)
-            else:
-                ctrl.SetValue(lname)
-            
+                
         # updated progress bar range (mapwindow statusbar)
         if checked is True:
             self.mapdisplay.onRenderGauge.SetRange(len(self.Map.GetListOfLayers(l_active=True)))