Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Conversation

lindakarlovska
Copy link
Contributor

@lindakarlovska lindakarlovska commented Jul 18, 2021

This PR follows up the changes that are about to be merged - #1729, #1689, #1675.

So far, it is based on my local merged branch which already knows these changes. But I think even without the mentor's testing it makes sense to start working on this as later we can rebase it.

This PR aims at the basic integration of the new Map Display into the center AuiNotebook pane. Apart from this integration, it repairs existing event handlers and methods. It does not add any new ones.

As we have basically several small things for coding, I have eventually decided to solve them in this one PR. Some of them require changing of one, two rows, so it probably does not make sense to have more than one PR.

Tasks are as follow:

  • Remove methods related to the depreciated Map Display wx.Frame.

  • Fix behaviour when adding or switching to a new location (now it does not close previously opened map displays)

  • Make a newly added AuiNotebook tab active when adding a new Display tab.

  • Edit an existing closing event for the Display tab. This event should close the related AuiNotebook tab.

  • Edit an existing event for the switching between Display tabs. This event should make the related AuiNotebook tab active.

  • Fix an existing RenameDisplay event handler.

  • Fix adding and removing of the 3D View pane. Decide where should this tab go when launching 3D for the first time.

…notebook tabs - base working suggestion, probably will be needed to make some general methods like GetRelatedLmgrPage etc. (GetCurrentPage is not sufficient)
@lindakarlovska lindakarlovska marked this pull request as draft July 18, 2021 10:24
@lindakarlovska lindakarlovska added GUI wxGUI related gsoc Reserved for Google Summer of Code student(s) labels Jul 18, 2021
@lindakarlovska lindakarlovska changed the title wxGUI: Single-Window layout: coding of basic functions wxGUI: Single-Window GUI: Integrate new map display wx.Panels into a AuiNotebook center pane #1735 Jul 19, 2021
@lindakarlovska lindakarlovska self-assigned this Jul 19, 2021
Linda Kladivova added 2 commits July 21, 2021 19:19
@petrasovaa petrasovaa self-requested a review July 21, 2021 19:46
@lindakarlovska lindakarlovska marked this pull request as ready for review July 21, 2021 19:54
Copy link
Contributor

@petrasovaa petrasovaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok to me, just some minor comments.

Comment on lines 313 to 320
arts = [
aui.AuiDefaultTabArt,
aui.AuiSimpleTabArt,
aui.VC71TabArt,
aui.FF2TabArt,
aui.VC8TabArt,
aui.ChromeTabArt,
]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's just pick one here and set it directly.

Copy link
Contributor Author

@lindakarlovska lindakarlovska Jul 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


# make a new page in the bookcontrol for the layer tree (on page 0 of
# the notebook)
self.pg_panel = wx.Panel(self.notebookLayers, id=wx.ID_ANY, style=wx.EXPAND)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style=wx.EXPAND doesn't look correct to me, is that in the documentation somewhere?

…pears), style for display panel corrected, one ArtProvider for mapnotebook chosen
Copy link
Contributor

@petrasovaa petrasovaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can merge it as soon as the flake8 and black CI are checked.

@petrasovaa petrasovaa merged commit 0537933 into OSGeo:master Jul 30, 2021
@neteler neteler added this to the 8.0.0 milestone Dec 9, 2021
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gsoc Reserved for Google Summer of Code student(s) GUI wxGUI related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants