wxGUI: Move SbMask widget to main window statusbar #2089

lindakarlovska · 2022-01-13T15:14:07Z

It moves statusbar Mask widget to the main statusbar. It is also changing the way Mask is updated - now it is updated using signals and method RefreshMask.

petrasovaa · 2022-01-14T04:06:26Z

gui/wxpython/main_window/frame.py

@@ -351,6 +369,7 @@ def _createConsole(self, parent):
        )

        self._gconsole.mapCreated.connect(self.OnMapCreated)
+        self._gconsole.updateMap.connect(self.RefreshMask)


Should be mapCreated?

gui/wxpython/main_window/frame.py

petrasovaa · 2022-01-14T04:36:10Z

You also need to refresh it initially, it doesn't seem to show up when you start GUI and mask exists.
Currently the signals you use don't seem to be sufficient, it doesn't update when I would expect it to do, I would need to look at it more. Don't forget also about the GConsole in forms.py.

lindakarlovska · 2022-01-14T08:11:11Z

You also need to refresh it initially, it doesn't seem to show up when you start GUI and mask exists. Currently the signals you use don't seem to be sufficient, it doesn't update when I would expect it to do, I would need to look at it more. Don't forget also about the GConsole in forms.py.

I agree. I was also thinking about GSConsole in forms.py - I think we should add r.mask to r.colours and other items in a list. But the problem is that the map returned from r.mask is the map from which the mask was created - not the resulting MASK. So we would probably need to update a bit a way r.mask works?..

lindakarlovska · 2022-01-19T17:08:54Z

I have prepared the list of situations when the Mask red button should be refreshed - or better said situations when we need to check whether the MASK file exists. Please @petrasovaa check it and add something if missing:

GRASS launched - the mask is refreshed internally in its constructor
The Mask is created by the r.mask module - in this case, Mask red button should be refreshed as well as Data Catalog
The Mask is removed by removing the MASK layer from the Data Catalog tree - in this case, Mask red button should be refreshed as well as Data Catalog
The Mask is removed by clicking on the red Mask button - in this case, Mask red button should be refreshed as well as Data Catalog
The mapset without MASK has been switched - a new mapset may contain the MASK so the Mask red button should be refreshed
The mapset with MASK has been switched - a new mapset may not contain the MASK so the Mask red button should be refreshed

Probably all, but I am not sure about workspaces...

petrasovaa · 2022-01-20T02:17:11Z

I have prepared the list of situations when the Mask red button should be refreshed - or better said situations when we need to check whether the MASK file exists. Please @petrasovaa check it and add something if missing:

Any raster/vector module that creates a raster layer can create MASK layer, probably not how most people would do that, but possible.

petrasovaa · 2022-01-20T03:42:33Z

I suggest these changes, that should cover most cases

diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py
index 3670b38a2..4184abc83 100644
--- a/gui/wxpython/lmgr/frame.py
+++ b/gui/wxpython/lmgr/frame.py
@@ -223,7 +223,6 @@ class GMFrame(wx.Frame):
 
         self._giface.mapCreated.connect(self.OnMapCreated)
         self._giface.updateMap.connect(self._updateCurrentMap)
-        self._giface.updateMap.connect(self.mask.Refresh)
         self._giface.currentMapsetChanged.connect(self.OnMapsetChanged)
 
         # minimal frame size
@@ -428,7 +427,7 @@ class GMFrame(wx.Frame):
         )
 
         self._gconsole.mapCreated.connect(self.OnMapCreated)
-        self._gconsole.mapCreated.connect(self.mask.Refresh)
+        self._gconsole.updateMap.connect(self.mask.Refresh)
         self._gconsole.Bind(
             EVT_IGNORED_CMD_RUN, lambda event: self.RunSpecialCmd(event.cmd)
         )
diff --git a/gui/wxpython/lmgr/statusbar.py b/gui/wxpython/lmgr/statusbar.py
index 62a263447..993581a28 100644
--- a/gui/wxpython/lmgr/statusbar.py
+++ b/gui/wxpython/lmgr/statusbar.py
@@ -38,8 +38,14 @@ class SbMask:
         self.widget.Bind(wx.EVT_BUTTON, self.OnRemoveMask)
         self.widget.SetForegroundColour(wx.Colour(255, 0, 0))
         self.widget.SetToolTip(tip=_("Left mouse click to remove the MASK"))
+        self.giface.updateMap.connect(self.Refresh)
+        self.giface.grassdbChanged.connect(self._dbChanged)
         self.Refresh()
 
+    def _dbChanged(self, map=None, newname=None):
+        if map == "MASK" or newname == "MASK":
+            self.Refresh()
+
     def Show(self):
         """Invokes showing of underlying widget.
 
diff --git a/gui/wxpython/main_window/frame.py b/gui/wxpython/main_window/frame.py
index 44bfdc304..c46bf56c1 100644
--- a/gui/wxpython/main_window/frame.py
+++ b/gui/wxpython/main_window/frame.py
@@ -166,7 +166,6 @@ class GMFrame(wx.Frame):
 
         self._giface.mapCreated.connect(self.OnMapCreated)
         self._giface.updateMap.connect(self._updateCurrentMap)
-        self._giface.updateMap.connect(self.mask.Refresh)
         self._giface.currentMapsetChanged.connect(self.OnMapsetChanged)
 
         # use default window layout ?

lindakarlovska · 2022-01-20T08:25:00Z

I suggest these changes, that should cover most cases

diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py
index 3670b38a2..4184abc83 100644
--- a/gui/wxpython/lmgr/frame.py
+++ b/gui/wxpython/lmgr/frame.py
@@ -223,7 +223,6 @@ class GMFrame(wx.Frame):
 
         self._giface.mapCreated.connect(self.OnMapCreated)
         self._giface.updateMap.connect(self._updateCurrentMap)
-        self._giface.updateMap.connect(self.mask.Refresh)
         self._giface.currentMapsetChanged.connect(self.OnMapsetChanged)
 
         # minimal frame size
@@ -428,7 +427,7 @@ class GMFrame(wx.Frame):
         )
 
         self._gconsole.mapCreated.connect(self.OnMapCreated)
-        self._gconsole.mapCreated.connect(self.mask.Refresh)
+        self._gconsole.updateMap.connect(self.mask.Refresh)
         self._gconsole.Bind(
             EVT_IGNORED_CMD_RUN, lambda event: self.RunSpecialCmd(event.cmd)
         )
diff --git a/gui/wxpython/lmgr/statusbar.py b/gui/wxpython/lmgr/statusbar.py
index 62a263447..993581a28 100644
--- a/gui/wxpython/lmgr/statusbar.py
+++ b/gui/wxpython/lmgr/statusbar.py
@@ -38,8 +38,14 @@ class SbMask:
         self.widget.Bind(wx.EVT_BUTTON, self.OnRemoveMask)
         self.widget.SetForegroundColour(wx.Colour(255, 0, 0))
         self.widget.SetToolTip(tip=_("Left mouse click to remove the MASK"))
+        self.giface.updateMap.connect(self.Refresh)
+        self.giface.grassdbChanged.connect(self._dbChanged)
         self.Refresh()
 
+    def _dbChanged(self, map=None, newname=None):
+        if map == "MASK" or newname == "MASK":
+            self.Refresh()
+
     def Show(self):
         """Invokes showing of underlying widget.
 
diff --git a/gui/wxpython/main_window/frame.py b/gui/wxpython/main_window/frame.py
index 44bfdc304..c46bf56c1 100644
--- a/gui/wxpython/main_window/frame.py
+++ b/gui/wxpython/main_window/frame.py
@@ -166,7 +166,6 @@ class GMFrame(wx.Frame):
 
         self._giface.mapCreated.connect(self.OnMapCreated)
         self._giface.updateMap.connect(self._updateCurrentMap)
-        self._giface.updateMap.connect(self.mask.Refresh)
         self._giface.currentMapsetChanged.connect(self.OnMapsetChanged)
 
         # use default window layout ?

I agree with that, in addition, I suggest adding self.giface.currentMapsetChanged.connect(self.Refresh) to the lgmr/statusbar.py

lindakarlovska · 2022-01-20T11:04:05Z

I suggest these changes, that should cover most cases

diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py
index 3670b38a2..4184abc83 100644
--- a/gui/wxpython/lmgr/frame.py
+++ b/gui/wxpython/lmgr/frame.py
@@ -223,7 +223,6 @@ class GMFrame(wx.Frame):
 
         self._giface.mapCreated.connect(self.OnMapCreated)
         self._giface.updateMap.connect(self._updateCurrentMap)
-        self._giface.updateMap.connect(self.mask.Refresh)
         self._giface.currentMapsetChanged.connect(self.OnMapsetChanged)
 
         # minimal frame size
@@ -428,7 +427,7 @@ class GMFrame(wx.Frame):
         )
 
         self._gconsole.mapCreated.connect(self.OnMapCreated)
-        self._gconsole.mapCreated.connect(self.mask.Refresh)
+        self._gconsole.updateMap.connect(self.mask.Refresh)
         self._gconsole.Bind(
             EVT_IGNORED_CMD_RUN, lambda event: self.RunSpecialCmd(event.cmd)
         )
diff --git a/gui/wxpython/lmgr/statusbar.py b/gui/wxpython/lmgr/statusbar.py
index 62a263447..993581a28 100644
--- a/gui/wxpython/lmgr/statusbar.py
+++ b/gui/wxpython/lmgr/statusbar.py
@@ -38,8 +38,14 @@ class SbMask:
         self.widget.Bind(wx.EVT_BUTTON, self.OnRemoveMask)
         self.widget.SetForegroundColour(wx.Colour(255, 0, 0))
         self.widget.SetToolTip(tip=_("Left mouse click to remove the MASK"))
+        self.giface.updateMap.connect(self.Refresh)
+        self.giface.grassdbChanged.connect(self._dbChanged)
         self.Refresh()
 
+    def _dbChanged(self, map=None, newname=None):
+        if map == "MASK" or newname == "MASK":
+            self.Refresh()
+
     def Show(self):
         """Invokes showing of underlying widget.
 
diff --git a/gui/wxpython/main_window/frame.py b/gui/wxpython/main_window/frame.py
index 44bfdc304..c46bf56c1 100644
--- a/gui/wxpython/main_window/frame.py
+++ b/gui/wxpython/main_window/frame.py
@@ -166,7 +166,6 @@ class GMFrame(wx.Frame):
 
         self._giface.mapCreated.connect(self.OnMapCreated)
         self._giface.updateMap.connect(self._updateCurrentMap)
-        self._giface.updateMap.connect(self.mask.Refresh)
         self._giface.currentMapsetChanged.connect(self.OnMapsetChanged)
 
         # use default window layout ?

I agree with that, in addition, I suggest adding self.giface.currentMapsetChanged.connect(self.Refresh) to the lgmr/statusbar.py

There is also the thing with the Data Catalog grassdb update. It is not ideal but I would suggest adding a few rows to gconsole.py. And also after removing the MASK using the button, we should also emit grassdbChanged signal... , please look at 3f74719

lindakarlovska · 2022-01-20T14:06:25Z

I have just finished the last part regarding status bar repositioning, I think we are almost at the end. :-)

petrasovaa · 2022-01-24T04:19:25Z

gui/wxpython/main_window/frame.py

+    def _createStatusbar(self):
+        """Create main window statusbar"""
+        self.statusbar = wx.StatusBar(self, id=wx.ID_ANY)
+        self.statusbar.SetMinHeight(24)
+        self.statusbar.SetFieldsCount(2)
+        self.statusbar.SetStatusWidths([-1, 100])
+        self.mask = SbMask(self.statusbar, self._giface)
+        self._repositionStatusbar()
+
+    def _repositionStatusbar(self):
+        """Reposition widgets in main window statusbar"""
+        rect1 = self.statusbar.GetFieldRect(1)
+        rect1.x += 1
+        rect1.y += 1
+        self.mask.GetWidget().SetRect(rect1)
+
+    def OnSize(self, event):
+        """Adjust main window statusbar on changing size"""
+        self._repositionStatusbar()
+
+    def SetStatusText(self, *args):
+        """Overide wx.StatusBar method"""
+        self.statusbar.SetStatusText(*args)
+


I would move this into lmgr/statusbar.py, similarly to the SbManager, frame.py is already big.

Good point. :-) I made the class SbMain which encapsulates the creation as well as statusbar reposition..

gui/wxpython/lmgr/statusbar.py

petrasovaa · 2022-01-24T04:28:00Z

gui/wxpython/lmgr/statusbar.py

+            dlg.Destroy()
+            return
+        RunCommand("r.mask", flags="r")
+        self.giface.updateMap.emit(render=False)


I think we need to emit updateMap whenever the status changes, maybe in Refresh(). Otherwise map display won't refresh.

I am not sure. I think it is sufficient to emit updateMap just in gconsole.py. In this case, it refreshes when using the module - so when creating and removing mask through r.mask.
After currentMapsetChanged I think we do not need to update a map and after grassdbChanged a map is updated automatically. Which other possible scenarios are in your mind?

try also running r.mask from command console

… to update map display from SbMask

petrasovaa

I rewrote some of the signals, let me know if you agree and please test, before that rerendering of map display didn't work.

gui/wxpython/lmgr/frame.py

lindakarlovska · 2022-01-25T16:58:27Z

I rewrote some of the signals, let me know if you agree and please test, before that rerendering of map display didn't work.

Nice, it makes greater sense like that. I have tested it by running r.mask from the command console and I've also tested all other cases and checked the map rendering, data catalog updating, mask button updating. All seem to be working fine.

petrasovaa

Almost there!

gui/wxpython/lmgr/statusbar.py

Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

…eo#2089) Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

mask moved to main statusbar, signals incorporated, draft - not finished

99780e6

lindakarlovska marked this pull request as draft January 13, 2022 15:14

lindakarlovska added GUI wxGUI related enhancement New feature or request labels Jan 13, 2022

lindakarlovska added this to the 8.2.0 milestone Jan 13, 2022

petrasovaa reviewed Jan 14, 2022

View reviewed changes

gui/wxpython/main_window/frame.py Outdated Show resolved Hide resolved

lindakladivova added 3 commits January 18, 2022 11:58

RefreshMask moved to SbMask

c0ee45a

Mask refreshed when being initialized

3cbf16d

black, flake

c375360

Refresh mask when mapset is switched

587f524

lindakladivova added 3 commits January 20, 2022 02:29

signals connected in statusbar.py

2db3e70

update datacatalog when creating and removing mask

3f74719

black

cf35e07

lindakarlovska requested a review from petrasovaa January 20, 2022 11:05

mask_layer as variable

d0cd420

lindakarlovska marked this pull request as ready for review January 20, 2022 12:00

lindakladivova added 3 commits January 20, 2022 06:04

simplification

70dd320

statusbar repositioning, editing the size of single-Window GMFrame

6959188

preserve better the ratio in Map Display statusbar

d6b1c32

petrasovaa reviewed Jan 24, 2022

View reviewed changes

file description

86e6f44

lindakladivova and others added 4 commits January 24, 2022 13:46

updateMap not needed

2784d1c

statusbar creation and some management moved to a new SbMain class

24df8ba

authors

f7dff15

remove unnecessary updateMap from gconsole, use grasdbChanged instead…

f6334d8

… to update map display from SbMask

petrasovaa reviewed Jan 25, 2022

View reviewed changes

gui/wxpython/lmgr/frame.py Outdated Show resolved Hide resolved

bind wx.EVT_SIZE inside the SbMain

86360aa

lindakarlovska requested a review from petrasovaa January 25, 2022 17:46

petrasovaa reviewed Jan 26, 2022

View reviewed changes

gui/wxpython/lmgr/statusbar.py Outdated Show resolved Hide resolved

gui/wxpython/lmgr/statusbar.py Outdated Show resolved Hide resolved

gui/wxpython/lmgr/statusbar.py Outdated Show resolved Hide resolved

lindakarlovska and others added 4 commits January 26, 2022 07:35

Update gui/wxpython/lmgr/statusbar.py

bfdb6b5

Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

Update gui/wxpython/lmgr/statusbar.py

97d9d8e

Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

grass -> gs adjusted in statusbar.py

83c1e07

black

37d8c45

petrasovaa approved these changes Jan 28, 2022

View reviewed changes

petrasovaa merged commit 251bce4 into OSGeo:main Jan 28, 2022

ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022

wxGUI: Move SbMask widget to main window/layer manager statusbar (OSG…

3825525

…eo#2089) Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023

wxGUI: Move SbMask widget to main window/layer manager statusbar (OSG…

49d145f

…eo#2089) Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

neteler pushed a commit to nilason/grass that referenced this pull request Nov 7, 2023

wxGUI: Move SbMask widget to main window/layer manager statusbar (OSG…

ba76865

…eo#2089) Co-authored-by: Anna Petrasova <kratochanna@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wxGUI: Move SbMask widget to main window statusbar #2089

wxGUI: Move SbMask widget to main window statusbar #2089

lindakarlovska commented Jan 13, 2022 •

edited

Loading

petrasovaa Jan 14, 2022

petrasovaa commented Jan 14, 2022

lindakarlovska commented Jan 14, 2022

lindakarlovska commented Jan 19, 2022

petrasovaa commented Jan 20, 2022

petrasovaa commented Jan 20, 2022

lindakarlovska commented Jan 20, 2022

lindakarlovska commented Jan 20, 2022

lindakarlovska commented Jan 20, 2022

petrasovaa Jan 24, 2022

lindakarlovska Jan 24, 2022

petrasovaa Jan 24, 2022

lindakarlovska Jan 24, 2022

petrasovaa Jan 25, 2022

petrasovaa left a comment

lindakarlovska commented Jan 25, 2022

petrasovaa left a comment

wxGUI: Move SbMask widget to main window statusbar #2089

wxGUI: Move SbMask widget to main window statusbar #2089

Conversation

lindakarlovska commented Jan 13, 2022 • edited Loading

petrasovaa Jan 14, 2022

Choose a reason for hiding this comment

petrasovaa commented Jan 14, 2022

lindakarlovska commented Jan 14, 2022

lindakarlovska commented Jan 19, 2022

petrasovaa commented Jan 20, 2022

petrasovaa commented Jan 20, 2022

lindakarlovska commented Jan 20, 2022

lindakarlovska commented Jan 20, 2022

lindakarlovska commented Jan 20, 2022

petrasovaa Jan 24, 2022

Choose a reason for hiding this comment

lindakarlovska Jan 24, 2022

Choose a reason for hiding this comment

petrasovaa Jan 24, 2022

Choose a reason for hiding this comment

lindakarlovska Jan 24, 2022

Choose a reason for hiding this comment

petrasovaa Jan 25, 2022

Choose a reason for hiding this comment

petrasovaa left a comment

Choose a reason for hiding this comment

lindakarlovska commented Jan 25, 2022

petrasovaa left a comment

Choose a reason for hiding this comment

lindakarlovska commented Jan 13, 2022 •

edited

Loading