Explorar o código

wxGUI/mapswipe: fix https://trac.osgeo.org/grass/ticket/1817

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54142 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová %!s(int64=12) %!d(string=hai) anos
pai
achega
687106eda6
Modificáronse 1 ficheiros con 6 adicións e 4 borrados
  1. 6 4
      gui/wxpython/mapswipe/frame.py

+ 6 - 4
gui/wxpython/mapswipe/frame.py

@@ -279,7 +279,7 @@ class SwipeMapFrame(DoubleMapFrame):
         else:
             self.Render(self.GetSecondWindow())
 
-    def OnZoomToMap(self, event):
+    def ZoomToMap(self):
         """!
         Set display extents to match selected raster (including NULLs)
         or vector map.
@@ -289,12 +289,15 @@ class SwipeMapFrame(DoubleMapFrame):
         # needed again, don't know why
         self.firstMap.region = self.secondMap.region
 
+    def OnZoomToMap(self, event):
+        """!Zoom to map"""
+        self.ZoomToMap()
+
     def OnZoomBack(self, event):
         self.GetFirstWindow().ZoomBack()
         self.secondMap.region = self.firstMap.region
         self.Render(self.GetSecondWindow())
 
-
     def OnSelectRasters(self, event):
         """!Choose raster maps and rerender."""
         dlg = SwipeMapDialog(self, first = self.rasters['first'], second = self.rasters['second'])
@@ -311,6 +314,7 @@ class SwipeMapFrame(DoubleMapFrame):
                     message += _("Map <%s> not found.") % maps[1]
                 GError(parent = self, message = message)
                 dlg.Destroy()
+            self.ZoomToMap()
 
         dlg.Destroy()
         self.OnRender(event = None)
@@ -321,7 +325,6 @@ class SwipeMapFrame(DoubleMapFrame):
         if raster['fullname']:
             self.rasters['first'] = raster['fullname']
             self.SetLayer(name = raster['fullname'], mapInstance = self.GetFirstMap())
-            self.OnZoomToMap(event = None)
             return True
 
         return False
@@ -332,7 +335,6 @@ class SwipeMapFrame(DoubleMapFrame):
         if raster['fullname']:
             self.rasters['second'] = raster['fullname']
             self.SetLayer(name = raster['fullname'], mapInstance = self.GetSecondMap())
-            self.OnZoomToMap(event = None)
             return True
 
         return False