[GRASS-SVN] r68958 - grass/trunk/gui/wxpython/mapwin

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-07-14 06:00:36 -0700 (Thu, 14 Jul 2016)
New Revision: 68958

Modified:
   grass/trunk/gui/wxpython/mapwin/decorations.py
Log:
wxGUI: fix trimming legend when it's too close to the edge and -d flagis active

Modified: grass/trunk/gui/wxpython/mapwin/decorations.py
===================================================================
--- grass/trunk/gui/wxpython/mapwin/decorations.py	2016-07-14 12:39:24 UTC (rev 68957)
+++ grass/trunk/gui/wxpython/mapwin/decorations.py	2016-07-14 13:00:36 UTC (rev 68958)
@@ -242,8 +242,8 @@
         OverlayController.__init__(self, renderer, giface)
         self._name = 'legend'
         self._removeLabel = _("Remove legend")
-        # TODO: synchronize with d.legend?
-        self._defaultAt = 'at=5,50,7,10'
+        # default is in the center to avoid trimmed legend on the edge
+        self._defaultAt = 'at=5,50,47,50'
         self._cmd = ['d.legend', self._defaultAt]
 
     def GetPlacement(self, screensize):
@@ -256,8 +256,12 @@
         for param in self._cmd:
             if not param.startswith('at'):
                 continue
-            b, t, l, r = [float(number) for number in param.split(
-                '=')[1].split(',')]  # pylint: disable-msg=W0612
+            # if the at= is the default, we will move the legend from the center to bottom left
+            if param == self._defaultAt:
+                b, t, l, r = 5, 50, 7, 10
+            else:
+                b, t, l, r = [float(number) for number in param.split(
+                    '=')[1].split(',')]  # pylint: disable-msg=W0612
             x = int((l / 100.) * screensize[0])
             y = int((1 - t / 100.) * screensize[1])