wxGUI: Use Map Display settings in other Map Display applications

doc/gui/wxpython/example/frame.py

@@ -114,13 +114,9 @@ def __init__(
             sb.SbCoordinates,
             sb.SbRegionExtent,
             sb.SbCompRegionExtent,
-            sb.SbShowRegion,
-            sb.SbAlignExtent,
-            sb.SbResolution,
             sb.SbDisplayGeometry,
             sb.SbMapScale,
             sb.SbGoTo,
-            sb.SbProjection,
         ]
         self.statusbar = self.CreateStatusbar(statusbarItems)
 

gui/wxpython/core/workspace.py

@@ -950,7 +950,7 @@ def __init__(self, lmgr, file):
                 )
             )
             # projection statusbar info
-            if mapdisp.GetProperty("projection") and UserSettings.Get(
+            if mapdisp.GetProperty("useDefinedProjection") and UserSettings.Get(
                 group="display", key="projection", subkey="proj4"
             ):
                 self.indent += 4

gui/wxpython/gcp/mapdisplay.py

@@ -103,16 +103,13 @@ def __init__(
             sb.SbCoordinates,
             sb.SbRegionExtent,
             sb.SbCompRegionExtent,
-            sb.SbShowRegion,
-            sb.SbResolution,
             sb.SbDisplayGeometry,
             sb.SbMapScale,
-            sb.SbProjection,
             sbgcp.SbGoToGCP,
             sbgcp.SbRMSError,
         ]
         self.statusbar = self.CreateStatusbar(statusbarItems)
-        self.statusbarManager.SetMode(8)  # goto GCP
+        self.statusbarManager.SetMode(5)  # goto GCP
 
         #
         # Init map display (buffered DC & set default cursor)

gui/wxpython/gcp/toolbars.py

@@ -126,6 +126,12 @@ def _toolbarData(self):
                 ("zoomback", BaseIcons["zoomBack"], self.parent.OnZoomBack),
                 ("zoomtomap", BaseIcons["zoomExtent"], self.parent.OnZoomToMap),
                 (None,),
+                (
+                    "mapDispSettings",
+                    BaseIcons["mapDispSettings"],
+                    self.parent.OnMapDisplayProperties,
+                ),
+                (None,),
                 ("settings", icons["settings"], self.parent.OnSettings),
                 ("help", icons["help"], self.parent.OnHelp),
                 (None,),

gui/wxpython/gui_core/mapdisp.py

@@ -160,17 +160,17 @@ def GetToolSwitcher(self):
 
     def SetProperty(self, name, value):
         """Sets property"""
-        if self.HasProperty("projection"):
-            self.statusbarManager.SetProperty(name, value)
+        if hasattr(self.mapWindowProperties, name):
+            setattr(self.mapWindowProperties, name, value)
         else:
-            self.mapWindowProperties.useDefinedProjection = value
+            self.statusbarManager.SetProperty(name, value)
 
     def GetProperty(self, name):
         """Returns property"""
-        if self.HasProperty("projection"):
-            return self.statusbarManager.GetProperty(name)
+        if hasattr(self.mapWindowProperties, name):
+            return getattr(self.mapWindowProperties, name)
         else:
-            return self.mapWindowProperties.useDefinedProjection
+            return self.statusbarManager.GetProperty(name)
 
     def HasProperty(self, name):
         """Checks whether object has property"""
@@ -484,6 +484,16 @@ def OnZoomToDefault(self, event):
         """Set display geometry to match default region settings"""
         self.MapWindow.ZoomToDefault()
 
+    def OnMapDisplayProperties(self, event):
+        """Show Map Display Properties dialog"""
+        from mapdisp.properties import MapDisplayPropertiesDialog
+
+        dlg = MapDisplayPropertiesDialog(
+            parent=self, mapframe=self, properties=self.mapWindowProperties
+        )
+        dlg.CenterOnParent()
+        dlg.Show()
+
 
 class SingleMapPanel(MapPanelBase):
     """Panel with one map window.

gui/wxpython/gui_core/toolbars.py

@@ -79,6 +79,7 @@
         img="layer-raster-histogram", label=_("Create histogram with d.histogram")
     ),
     "settings": MetaIcon(img="settings", label=_("Settings")),
+    "mapDispSettings": MetaIcon(img="map-settings", label=_("Map Display Settings")),
 }
 
 

gui/wxpython/iclass/frame.py

@@ -195,13 +195,9 @@ def __init__(
             sb.SbCoordinates,
             sb.SbRegionExtent,
             sb.SbCompRegionExtent,
-            sb.SbShowRegion,
-            sb.SbAlignExtent,
-            sb.SbResolution,
             sb.SbDisplayGeometry,
             sb.SbMapScale,
             sb.SbGoTo,
-            sb.SbProjection,
         ]
         self.statusbar = self.CreateStatusbar(statusbarItems)
         self._addPanes()

gui/wxpython/iclass/toolbars.py

@@ -112,6 +112,11 @@ def _toolbarData(self):
                 (None,),
                 ("zoomBack", icons["zoomBack"], self.parent.OnZoomBack),
                 ("zoomToMap", icons["zoomExtent"], self.parent.OnZoomToMap),
+                (
+                    "mapDispSettings",
+                    icons["mapDispSettings"],
+                    self.parent.OnMapDisplayProperties,
+                ),
             )
         )
 

gui/wxpython/image2target/ii2t_mapdisplay.py

@@ -105,19 +105,16 @@ def __init__(
             sb.SbCoordinates,
             sb.SbRegionExtent,
             sb.SbCompRegionExtent,
-            sb.SbShowRegion,
-            sb.SbResolution,
             sb.SbDisplayGeometry,
             sb.SbMapScale,
-            sb.SbProjection,
             sbgcp.SbGoToGCP,
             sbgcp.SbRMSError,
         ]
 
         # create statusbar and its manager
         self.statusbar = self.CreateStatusbar(statusbarItems)
 
-        self.statusbarManager.SetMode(8)  # goto GCP
+        self.statusbarManager.SetMode(5)  # goto GCP
 
         #
         # Init map display (buffered DC & set default cursor)

gui/wxpython/image2target/ii2t_toolbars.py

@@ -126,6 +126,12 @@ def _toolbarData(self):
                 ("zoomback", BaseIcons["zoomBack"], self.parent.OnZoomBack),
                 ("zoomtomap", BaseIcons["zoomExtent"], self.parent.OnZoomToMap),
                 (None,),
+                (
+                    "mapDispSettings",
+                    BaseIcons["mapDispSettings"],
+                    self.parent.OnMapDisplayProperties,
+                ),
+                (None,),
                 ("settings", icons["settings"], self.parent.OnSettings),
                 ("help", icons["help"], self.parent.OnHelp),
                 (None,),

gui/wxpython/mapdisp/frame.py

@@ -1555,16 +1555,6 @@ def OnZoomMenu(self, event):
         self.PopupMenu(zoommenu)
         zoommenu.Destroy()
 
-    def OnMapDisplayProperties(self, event):
-        """Show Map Display Properties dialog"""
-        from mapdisp.properties import MapDisplayPropertiesDialog
-
-        dlg = MapDisplayPropertiesDialog(
-            parent=self, giface=self._giface, properties=self.mapWindowProperties
-        )
-        dlg.CenterOnParent()
-        dlg.Show()
-
     def SetProperties(
         self,
         render=False,
@@ -1579,7 +1569,7 @@ def SetProperties(
         if self.statusbarManager:
             self.statusbarManager.SetMode(mode)
             self.StatusbarUpdate()
-            self.SetProperty("projection", projection)
+        self.mapWindowProperties.useDefinedProjection = projection
         self.mapWindowProperties.showRegion = showCompExtent
         self.mapWindowProperties.alignExtent = alignExtent
         self.mapWindowProperties.resolution = constrainRes

gui/wxpython/mapdisp/properties.py

@@ -140,9 +140,9 @@ def mapWindowPropertyChanged(self):
 class ChBResolution(PropertyItem):
     """Checkbox to select used display resolution."""
 
-    def __init__(self, parent, giface, mapWindowProperties):
+    def __init__(self, parent, mapframe, mapWindowProperties):
         PropertyItem.__init__(self, mapWindowProperties)
-        self.giface = giface
+        self.mapFrame = mapframe
         self.name = "resolution"
         self.widget = wx.CheckBox(
             parent=parent,
@@ -180,16 +180,16 @@ def _onToggleCheckBox(self, event):
 
         # redraw map if auto-rendering is enabled
         if self._properties.autoRender:
-            self.giface.updateMap.emit()
+            self.mapFrame.GetWindow().UpdateMap()
 
 
 class ChBShowRegion(PropertyItem):
     """Checkbox to enable and disable showing of computational region."""
 
-    def __init__(self, parent, giface, mapWindowProperties):
+    def __init__(self, parent, mapframe, mapWindowProperties):
         PropertyItem.__init__(self, mapWindowProperties)
-        self.giface = giface
-        self.name = "region"
+        self.mapFrame = mapframe
+        self.name = "showRegion"
         self.widget = wx.CheckBox(
             parent=parent, id=wx.ID_ANY, label=_("Show computational extent")
         )
@@ -229,15 +229,15 @@ def _onToggleCheckBox(self, event):
 
         # redraw map if auto-rendering is enabled
         if self._properties.autoRender:
-            self.giface.updateMap.emit(render=False)
+            self.mapFrame.GetWindow().UpdateMap(render=False)
 
 
 class ChBProjection(PropertyItem):
     """Checkbox to enable user defined projection"""
 
     def __init__(self, parent, mapWindowProperties):
         PropertyItem.__init__(self, mapWindowProperties)
-        self.name = "projection"
+        self.name = "useDefinedProjection"
         self.defaultLabel = _("Display coordinates in different CRS")
         self.widget = wx.CheckBox(parent=parent, id=wx.ID_ANY, label=self.defaultLabel)
         self.widget.SetValue(self.mapWindowProperty)
@@ -283,7 +283,7 @@ class MapDisplayPropertiesDialog(wx.Dialog):
     def __init__(
         self,
         parent,
-        giface,
+        mapframe,
         properties,
         title=_("Map Display Settings"),
         size=(-1, 250),
@@ -294,7 +294,7 @@ def __init__(
         self.parent = parent
         self.title = title
         self.size = size
-        self.giface = giface
+        self.mapframe = mapframe
         self.mapWindowProperties = properties
 
         # notebook
@@ -353,7 +353,7 @@ def _createDisplayPage(self, parent):
 
         # Use computation resolution
         self.compResolution = ChBResolution(
-            panel, self.giface, self.mapWindowProperties
+            panel, self.mapframe, self.mapWindowProperties
         )
         sizer.Add(
             self.compResolution.GetWidget(),
@@ -364,7 +364,7 @@ def _createDisplayPage(self, parent):
 
         # Show computation extent
         self.showCompExtent = ChBShowRegion(
-            panel, self.giface, self.mapWindowProperties
+            panel, self.mapframe, self.mapWindowProperties
         )
         sizer.Add(
             self.showCompExtent.GetWidget(),