[GRASS-SVN] r69172 - in grass/trunk/gui/wxpython: lmgr mapdisp

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-08-21 02:10:07 -0700 (Sun, 21 Aug 2016)
New Revision: 69172

Modified:
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/mapdisp/main.py
   grass/trunk/gui/wxpython/mapdisp/toolbars.py
Log:
wxGUI: rename AddLegend handler to AddLegendRast


Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2016-08-21 09:01:00 UTC (rev 69171)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2016-08-21 09:10:07 UTC (rev 69172)
@@ -754,9 +754,9 @@
                 self.GetMapDisplay().AddBarscale()
         elif layertype == 'rastleg':
             if len(command) > 1:
-                self.GetMapDisplay().AddLegend(cmd=command)
+                self.GetMapDisplay().AddLegendRast(cmd=command)
             else:
-                self.GetMapDisplay().AddLegend()
+                self.GetMapDisplay().AddLegendRast()
         elif layertype == 'vectleg':
             if len(command) > 1:
                 self.GetMapDisplay().AddLegendVect(cmd=command, showDialog=False)
@@ -1493,7 +1493,7 @@
                     if overlay['cmd'][0] == "d.legend.vect":
                         mapdisplay[i].AddLegendVect(overlay['cmd'])
                     if overlay['cmd'][0] == "d.legend":
-                        mapdisplay[i].AddLegend(overlay['cmd'])
+                        mapdisplay[i].AddLegendRast(overlay['cmd'])
                     if overlay['cmd'][0] == "d.barscale":
                         mapdisplay[i].AddBarscale(overlay['cmd'])
                     if overlay['cmd'][0] == "d.northarrow":

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2016-08-21 09:01:00 UTC (rev 69171)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2016-08-21 09:10:07 UTC (rev 69172)
@@ -1228,8 +1228,8 @@
 
         self.MapWindow.mouse['use'] = 'pointer'
 
-    def AddLegend(self, cmd=None):
-        """Handler for legend map decoration menu selection."""
+    def AddLegendRast(self, cmd=None):
+        """Handler for legend raster map decoration menu selection."""
 
         if cmd:
             show = False
@@ -1248,7 +1248,7 @@
         self.MapWindow.mouse['use'] = 'pointer'
 
     def AddLegendVect(self, cmd=None, showDialog=None):
-        """Handler for legend map decoration menu selection."""
+        """Handler for legend vector map decoration menu selection."""
 
         if cmd:
             show = False

Modified: grass/trunk/gui/wxpython/mapdisp/main.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/main.py	2016-08-21 09:01:00 UTC (rev 69171)
+++ grass/trunk/gui/wxpython/mapdisp/main.py	2016-08-21 09:10:07 UTC (rev 69172)
@@ -198,7 +198,7 @@
                     if cmd in self.oldOverlays:
                         continue
                     if ltype == 'rastleg':
-                        self._giface.GetMapDisplay().AddLegend(cmd=cmd)
+                        self._giface.GetMapDisplay().AddLegendRast(cmd=cmd)
                     elif ltype == 'barscale':
                         self._giface.GetMapDisplay().AddBarscale(cmd=cmd)
                     elif ltype == 'northarrow':

Modified: grass/trunk/gui/wxpython/mapdisp/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/toolbars.py	2016-08-21 09:01:00 UTC (rev 69171)
+++ grass/trunk/gui/wxpython/mapdisp/toolbars.py	2016-08-21 09:10:07 UTC (rev 69172)
@@ -270,7 +270,7 @@
         """
         self._onMenu(
             ((MapIcons["addRasterLegend"],
-              lambda evt: self.parent.AddLegend()),
+              lambda evt: self.parent.AddLegendRast()),
              (MapIcons["addVectorLegend"],
               lambda evt: self.parent.AddLegendVect()),
              (MapIcons["addBarscale"],