diff --git a/gui/wxpython/gcp/mapdisplay.py b/gui/wxpython/gcp/mapdisplay.py index e7596e5e984..e1e390d533c 100644 --- a/gui/wxpython/gcp/mapdisplay.py +++ b/gui/wxpython/gcp/mapdisplay.py @@ -30,7 +30,6 @@ from gui_core.mapdisp import SingleMapPanel from gui_core.wrap import Menu from mapwin.buffered import BufferedMapWindow -from mapwin.base import MapWindowProperties import mapdisp.statusbar as sb import gcp.statusbar as sbgcp @@ -78,9 +77,7 @@ def __init__( ) self._giface = giface - # properties are shared in other objects, so defining here - self.mapWindowProperties = MapWindowProperties() - self.mapWindowProperties.setValuesFromUserSettings() + self.mapWindowProperties.alignExtent = True # diff --git a/gui/wxpython/gui_core/mapdisp.py b/gui/wxpython/gui_core/mapdisp.py index d18655191df..bbba102430a 100644 --- a/gui/wxpython/gui_core/mapdisp.py +++ b/gui/wxpython/gui_core/mapdisp.py @@ -28,6 +28,7 @@ from gui_core.toolbars import ToolSwitcher from gui_core.wrap import NewId from mapdisp import statusbar as sb +from mapwin.base import MapWindowProperties from grass.script import core as grass @@ -87,6 +88,14 @@ def __init__( self.toolbars = {} self.iconsize = (16, 16) + # properties are shared in other objects, so defining here + self.mapWindowProperties = MapWindowProperties() + self.mapWindowProperties.setValuesFromUserSettings() + # update statusbar when user-defined projection changed + self.mapWindowProperties.useDefinedProjectionChanged.connect( + self.StatusbarUpdate + ) + # # Fancy gui # diff --git a/gui/wxpython/iclass/frame.py b/gui/wxpython/iclass/frame.py index 2c2f9e1c10a..e57e6b50d26 100644 --- a/gui/wxpython/iclass/frame.py +++ b/gui/wxpython/iclass/frame.py @@ -49,7 +49,6 @@ from core.gcmd import RunCommand, GMessage, GError from gui_core.dialogs import SetOpacityDialog from gui_core.wrap import Menu -from mapwin.base import MapWindowProperties from dbmgr.vinfo import VectorDBInfo from iclass.digit import IClassVDigitWindow, IClassVDigit @@ -113,8 +112,7 @@ def __init__( else: self.giface = StandaloneMapDisplayGrassInterface(self) self.tree = None - self.mapWindowProperties = MapWindowProperties() - self.mapWindowProperties.setValuesFromUserSettings() + # show computation region by defaut self.mapWindowProperties.showRegion = True diff --git a/gui/wxpython/image2target/ii2t_mapdisplay.py b/gui/wxpython/image2target/ii2t_mapdisplay.py index c8972242e82..1016afb678b 100644 --- a/gui/wxpython/image2target/ii2t_mapdisplay.py +++ b/gui/wxpython/image2target/ii2t_mapdisplay.py @@ -30,7 +30,6 @@ from gui_core.mapdisp import SingleMapPanel from gui_core.wrap import Menu from mapwin.buffered import BufferedMapWindow -from mapwin.base import MapWindowProperties import mapdisp.statusbar as sb import gcp.statusbar as sbgcp @@ -78,9 +77,7 @@ def __init__( ) self._giface = giface - # properties are shared in other objects, so defining here - self.mapWindowProperties = MapWindowProperties() - self.mapWindowProperties.setValuesFromUserSettings() + self.mapWindowProperties.alignExtent = True # diff --git a/gui/wxpython/mapdisp/frame.py b/gui/wxpython/mapdisp/frame.py index 48d85b9b1fd..0eaccab4b72 100644 --- a/gui/wxpython/mapdisp/frame.py +++ b/gui/wxpython/mapdisp/frame.py @@ -37,7 +37,6 @@ from core.debug import Debug from core.settings import UserSettings from gui_core.mapdisp import SingleMapPanel, FrameMixin -from mapwin.base import MapWindowProperties from gui_core.query import QueryDialog, PrepareQueryResults from mapwin.buffered import BufferedMapWindow from mapwin.decorations import ( @@ -130,10 +129,6 @@ def __init__( # Emitted when closing display by closing its window. self.closingVNETDialog = Signal("MapPanel.closingVNETDialog") - # properties are shared in other objects, so defining here - self.mapWindowProperties = MapWindowProperties() - self.mapWindowProperties.setValuesFromUserSettings() - # # Add toolbars # diff --git a/gui/wxpython/mapswipe/frame.py b/gui/wxpython/mapswipe/frame.py index ecb39cc1fee..68006fbfd85 100644 --- a/gui/wxpython/mapswipe/frame.py +++ b/gui/wxpython/mapswipe/frame.py @@ -24,7 +24,6 @@ from gui_core.mapdisp import DoubleMapPanel, FrameMixin from gui_core.dialogs import GetImageHandlers from gui_core.wrap import Slider -from mapwin.base import MapWindowProperties from core.render import Map from mapdisp import statusbar as sb from core.debug import Debug @@ -68,8 +67,6 @@ def __init__( self.sliderH = Slider(self, id=wx.ID_ANY, style=wx.SL_HORIZONTAL) self.sliderV = Slider(self, id=wx.ID_ANY, style=wx.SL_VERTICAL) - self.mapWindowProperties = MapWindowProperties() - self.mapWindowProperties.setValuesFromUserSettings() self.mapWindowProperties.autoRenderChanged.connect(self.OnAutoRenderChanged) self.firstMapWindow = SwipeBufferedWindow( parent=self.splitter, diff --git a/gui/wxpython/mapwin/base.py b/gui/wxpython/mapwin/base.py index 897ed029c7a..774489dabef 100644 --- a/gui/wxpython/mapwin/base.py +++ b/gui/wxpython/mapwin/base.py @@ -104,7 +104,9 @@ def useDefinedProjection(self): @useDefinedProjection.setter def useDefinedProjection(self, value): - self._useDefinedProjection = value + if value != self._useDefinedProjection: + self._useDefinedProjection = value + self.useDefinedProjectionChanged.emit(value=value) @property def epsg(self): diff --git a/gui/wxpython/photo2image/ip2i_mapdisplay.py b/gui/wxpython/photo2image/ip2i_mapdisplay.py index f512a635f5f..23bca159302 100644 --- a/gui/wxpython/photo2image/ip2i_mapdisplay.py +++ b/gui/wxpython/photo2image/ip2i_mapdisplay.py @@ -25,7 +25,6 @@ from gui_core.mapdisp import SingleMapPanel from gui_core.wrap import Menu from mapwin.buffered import BufferedMapWindow -from mapwin.base import MapWindowProperties import mapdisp.statusbar as sb import gcp.statusbar as sbgcp @@ -72,9 +71,7 @@ def __init__( ) self._giface = giface - # properties are shared in other objects, so defining here - self.mapWindowProperties = MapWindowProperties() - self.mapWindowProperties.setValuesFromUserSettings() + self.mapWindowProperties.alignExtent = True #