wxGUI/mapwin: fix correct horizontal raster legend position after app…

…ly new legend setting (#1080)
OSGeo · Dec 3, 2020 · 47579af · 47579af
1 parent b7bfe26
commit 47579af
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/gui/wxpython/mapwin/decorations.py b/gui/wxpython/mapwin/decorations.py
@@ -267,8 +267,30 @@ def __init__(self, renderer, giface):
         self._activateLabel = _("Raster legend properties")
         # default is in the center to avoid trimmed legend on the edge
         self._defaultAt = 'at=5,50,47,50'
+        self._actualAt = self._defaultAt
         self._cmd = ['d.legend', self._defaultAt]
 
+    def SetCmd(self, cmd):
+        """Overriden method
+
+        Required for setting default or actual raster legend position.
+        """
+        hasAt = False
+        for i in cmd:
+            if i.startswith("at="):
+                hasAt = True
+                # reset coordinates, 'at' values will be used, see GetCoords
+                self._coords = None
+                break
+        if not hasAt:
+            if self._actualAt != self._defaultAt:
+                cmd.append(self._actualAt)
+            else:
+                cmd.append(self._defaultAt)
+        self._cmd = cmd
+
+    cmd = property(fset=SetCmd, fget=OverlayController.GetCmd)
+
     def GetPlacement(self, screensize):
         if not hasPIL:
             self._giface.WriteWarning(
@@ -330,6 +352,7 @@ def ResizeLegend(self, begin, end, screenSize):
                 break
 
         self._coords = None
+        self._actualAt = atStr
         self.Show()
 
     def StartResizing(self):