[GRASS-SVN] r59027 - grass/trunk/gui/wxpython/mapdisp

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-02-13 15:23:34 -0800 (Thu, 13 Feb 2014)
New Revision: 59027

Modified:
   grass/trunk/gui/wxpython/mapdisp/frame.py
Log:
wxGUI/legend: fix various problems related to updating legend with different map

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2014-02-13 16:01:32 UTC (rev 59026)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2014-02-13 23:23:34 UTC (rev 59027)
@@ -364,7 +364,7 @@
             self.MapWindow3D.UpdateView(None)
             self.MapWindow3D.overlayActivated.connect(self._activateOverlay)
             self.MapWindow3D.overlayHidden.connect(self._hideOverlay)
-            self.legend.overlayChanged.connect(lambda: self.MapWindow3D.UpdateOverlays())
+            self.legend.overlayChanged.connect(self.MapWindow3D.UpdateOverlays)
         else:
             self.MapWindow = self.MapWindow3D
             os.environ['GRASS_REGION'] = self.Map.SetRegion(windres = True, windres3 = True)
@@ -431,6 +431,7 @@
         # TODO: here we end because self.MapWindow3D is None for a while
         self._giface.updateMap.disconnect(self.MapWindow3D.UpdateMap)
         self._giface.updateMap.connect(self.MapWindow2D.UpdateMap)
+        self.legend.overlayChanged.disconnect(self.MapWindow3D.UpdateOverlays)
 
         self.MapWindow.UpdateMap()
         self._mgr.Update()
@@ -988,7 +989,7 @@
         if overlayId > 100:
             self.OnAddText(None)
         elif overlayId == 0:
-            self.AddLegend(showDialog=True)
+            self.AddLegend(cmd=self.legend.cmd, showDialog=True)
         elif overlayId == 1:
             self.AddBarscale(showDialog=True)
         elif overlayId == 2:
@@ -1051,7 +1052,20 @@
             layers = self._giface.GetLayerList().GetSelectedLayers()
             for layer in layers:
                 if layer.type == 'raster':
-                    self.legend.cmd.append('map=%s' % layer.maplayer.name)
+                    isMap = False
+                    # replace map
+                    for i, legendParam in enumerate(self.legend.cmd[1:]):
+                        idx = i + 1
+                        param, val = legendParam.split('=')
+                        if param == 'map':
+                            self.legend.cmd[idx] = 'map={rast}'.format(rast=layer.maplayer.name)
+                            isMap = True
+                        elif param in ('use', 'range'):
+                            # clear range or use to avoid problems
+                            del self.legend.cmd[idx]
+
+                    if not isMap:  # for the first time
+                        self.legend.cmd.append('map=%s' % layer.maplayer.name)
                     break
 
         if not showDialog and self.legend.CmdIsValid():
@@ -1059,13 +1073,15 @@
             return
 
         # Decoration overlay control dialog
+        # always create new one to avoid problem when switching between maps
         if self.legend.dialog:
             if self.legend.dialog.IsShown():
                 self.legend.dialog.SetFocus()
                 self.legend.dialog.Raise()
             else:
-                self.legend.dialog.Show()
-        else:
+                self.legend.dialog.Destroy()
+                self.legend.dialog = None
+        if not self.legend.dialog:
             GUI(parent=self, giface=self._giface, show=True,
                 modal=False).ParseCommand(self.legend.cmd,
                                           completed=(self.legend.GetOptData, None, None))