wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget #1689

lindakarlovska · 2021-06-29T08:38:37Z

This PR builds status bars based on wx.StatusBar for SwipeMapFrame, IClassMapFrame, Image2Target Frame, Photo2Image Frame, and GCP manager MapFrame.
Some general methods related to a status bar and toolbars moved to gui_core class MapFrameBase.

lindakarlovska · 2021-07-07T09:57:50Z

@petrasovaa I have moved some methods to MapFrameBase, so we can expect a small conflict with #1704. After merging #1704, I am gonna look at this PR again and test it.

lindakarlovska · 2021-07-07T10:16:03Z

We could also make CreateStatusbar and IsPaneShown methods part of the MapFrameBase. What do you think? sbManager could be also initialized in the Base class. But I am not sure if we can assume that any Map Display will always have Statusbar. But probably yes because there is already "statusbarManager" used in some MapFrameBase methods. However, there is also the thing that CreateStatusbar methods are the same for swipe, mapdisplay, iclass but there is a small difference for GCP regarding statusbarItems. (But we could override this method in GCP class, it should not be a problem).
Or we do not have to put any methods aside, I do not have any strong opinion about it.

petrasovaa · 2021-07-07T14:00:28Z

We could also make CreateStatusbar and IsPaneShown methods part of the MapFrameBase. What do you think? sbManager could be also initialized in the Base class. But I am not sure if we can assume that any Map Display will always have Statusbar. But probably yes because there is already "statusbarManager" used in some MapFrameBase methods. However, there is also the thing that CreateStatusbar methods are the same for swipe, mapdisplay, iclass but there is a small difference for GCP regarding statusbarItems. (But we could override this method in GCP class, it should not be a problem).

Or we do not have to put any methods aside, I do not have any strong opinion about it.

I think it makes sense to assume all derived classes have statusbar, so I think creating status bar could be moved. Initializing it with items sounds more like individual derived classes should do I think.

gui/wxpython/mapdisp/frame.py

petrasovaa · 2021-07-08T03:17:37Z

gui/wxpython/mapswipe/frame.py

@@ -267,72 +253,76 @@ def OnAutoRenderChanged(self, value):
        style ^= wx.SP_LIVE_UPDATE
        self.splitter.SetWindowStyle(style)

-    def AddToolbars(self):
+    def AddToolbar(self, name):


Not sure why not keep AddToolbars as it was. The ifs there don't make much sense, also passing the toolbar names in constructor is not particularly useful unless you create different mapswipe tools with different toolbars.

Well, I just wanted to unify names and functionality since I call AddToolbar in ShowAllToolbars method in the base class.

It is true that we do not need ShowAllToolbars method for Map Swipe but everything which in the base class could be generally usable in all childs. So, if we let AddToolbars the ShowAllToolbars method will need to override.

Ok, that makes sense, so feel free to put it back. Perhaps the names of toolbars don't need to be in the constructor since they are fixed anyway,

Also for that case when AddToolbar would be used more times (while adding/removing), then you need to adjust the code to not create a new toolbar every time.

gui/wxpython/gcp/mapdisplay.py

petrasovaa · 2021-07-08T03:25:31Z

The same probably needs to be done for image2target/ii2t_mapdisplay.py, photo2image/ip2i_mapdisplay.py.

gui/wxpython/gui_core/mapdisp.py

petrasovaa

I think this looks good. I still want to test it little bit more though. Not sure about merging it now, it shouldn't go into release.

petrasovaa

Please check the order of toolbars. I just tested mapswipe and the order is different than it used to be.

lindakarlovska · 2021-07-14T16:26:36Z

Please check the order of toolbars. I just tested mapswipe and the order is different than it used to be.

Should be okay now.

…#1689 merge)

…r widget (OSGeo#1689) Builds status bars based on wx.StatusBar for SwipeMapFrame, IClassMapFrame, Image2Target Frame, Photo2Image Frame, and GCP manager MapFrame. Some general methods related to a status bar and toolbars moved to gui_core class MapFrameBase.

…#1689 merge)

…r widget (OSGeo#1689) Builds status bars based on wx.StatusBar for SwipeMapFrame, IClassMapFrame, Image2Target Frame, Photo2Image Frame, and GCP manager MapFrame. Some general methods related to a status bar and toolbars moved to gui_core class MapFrameBase.

lindakarlovska mentioned this pull request Jun 29, 2021

[Bug] wxGUI: Hide statusbar and Hide toolbar does not work properly for Standalone map frames #1691

Closed

lindakarlovska added GUI wxGUI related gsoc Reserved for Google Summer of Code student(s) labels Jun 29, 2021

lindakarlovska mentioned this pull request Jul 7, 2021

wxGUI/mapdisplay: register context menu items, addresses #1691 #1704

Merged

lindakarlovska marked this pull request as ready for review July 7, 2021 13:56

lindakarlovska marked this pull request as draft July 7, 2021 14:04

lindakarlovska force-pushed the wxGUI-refactoring-build-map-swipe-status-bar-based-on-wxStatusBar-widget branch from 3d84d76 to 23c5659 Compare July 7, 2021 14:33

lindakarlovska marked this pull request as ready for review July 7, 2021 16:36

petrasovaa reviewed Jul 8, 2021

View reviewed changes

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

petrasovaa reviewed Jul 8, 2021

View reviewed changes

gui/wxpython/gcp/mapdisplay.py Outdated Show resolved Hide resolved

lindakarlovska marked this pull request as draft July 8, 2021 08:39

lindakarlovska marked this pull request as ready for review July 8, 2021 08:39

petrasovaa reviewed Jul 8, 2021

View reviewed changes

gui/wxpython/gui_core/mapdisp.py Outdated Show resolved Hide resolved

lindakarlovska marked this pull request as draft July 8, 2021 17:25

lindakarlovska marked this pull request as ready for review July 8, 2021 17:25

lindakarlovska marked this pull request as draft July 9, 2021 20:58

lindakarlovska marked this pull request as ready for review July 9, 2021 20:58

lindakarlovska mentioned this pull request Jul 11, 2021

wxGUI: refactoring: Map Display inheriting from wx.Panel #1675

Merged

lindakarlovska requested a review from petrasovaa July 12, 2021 14:02

petrasovaa reviewed Jul 13, 2021

View reviewed changes

petrasovaa requested changes Jul 14, 2021

View reviewed changes

lindakarlovska pushed a commit to lindakarlovska/grass that referenced this pull request Jul 15, 2021

GCP as a panel (tested on local merged branch - will work after OSGeo…

5fd1784

…#1689 merge)

lindakarlovska mentioned this pull request Jul 18, 2021

wxGUI: Single-Window GUI: Integrate new map display wx.Panels into a AuiNotebook center pane #1735 #1732

Merged

7 tasks

petrasovaa merged commit 5f65aaa into OSGeo:master Jul 29, 2021

lindakarlovska pushed a commit to lindakarlovska/grass that referenced this pull request Jul 29, 2021

GCP as a panel (tested on local merged branch - will work after OSGeo…

20b4123

…#1689 merge)

lindakarlovska pushed a commit to lindakarlovska/grass that referenced this pull request Aug 3, 2021

GCP as a panel (tested on local merged branch - will work after OSGeo…

7de37c4

…#1689 merge)

lindakarlovska pushed a commit to lindakarlovska/grass that referenced this pull request Aug 28, 2021

GCP as a panel (tested on local merged branch - will work after OSGeo…

bcce651

…#1689 merge)

lindakarlovska pushed a commit to lindakarlovska/grass that referenced this pull request Dec 8, 2021

GCP as a panel (tested on local merged branch - will work after OSGeo…

7c86e73

…#1689 merge)

neteler added this to the 8.0.0 milestone Dec 9, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget #1689

wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget #1689

lindakarlovska commented Jun 29, 2021 •

edited

Loading

lindakarlovska commented Jul 7, 2021

lindakarlovska commented Jul 7, 2021 •

edited

Loading

petrasovaa commented Jul 7, 2021

petrasovaa Jul 8, 2021

lindakarlovska Jul 8, 2021

lindakarlovska Jul 8, 2021

petrasovaa Jul 8, 2021

petrasovaa Jul 8, 2021

petrasovaa commented Jul 8, 2021

petrasovaa left a comment

petrasovaa left a comment

lindakarlovska commented Jul 14, 2021

wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget #1689

wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget #1689

Conversation

lindakarlovska commented Jun 29, 2021 • edited Loading

lindakarlovska commented Jul 7, 2021

lindakarlovska commented Jul 7, 2021 • edited Loading

petrasovaa commented Jul 7, 2021

petrasovaa Jul 8, 2021

Choose a reason for hiding this comment

lindakarlovska Jul 8, 2021

Choose a reason for hiding this comment

lindakarlovska Jul 8, 2021

Choose a reason for hiding this comment

petrasovaa Jul 8, 2021

Choose a reason for hiding this comment

petrasovaa Jul 8, 2021

Choose a reason for hiding this comment

petrasovaa commented Jul 8, 2021

petrasovaa left a comment

Choose a reason for hiding this comment

petrasovaa left a comment

Choose a reason for hiding this comment

lindakarlovska commented Jul 14, 2021

lindakarlovska commented Jun 29, 2021 •

edited

Loading

lindakarlovska commented Jul 7, 2021 •

edited

Loading