wxGUI/digitizer: fix digitizer - VDigitToolbar.OnTool method was not called #3027
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
petrasovaa
added
bug
tmszi
reviewed
Jun 8, 2023
gui/wxpython/vdigit/toolbars.py
Outdated
| @@ -446,14 +449,15 @@ def OnTool(self, event): | |||
| 3, | |||
| f"VDigitToolbar.OnTool(): id = {event.GetId() if event else event}", | |||
| ) | |||
| if self.toolSwitcher: | |||
There was a problem hiding this comment.
If you try activate Digitize new boundary (Ctrl+B) or Digitize new centroid (Ctrl+C) tool by keyboard shortcut you get error:
Traceback (most recent call last):
File
"/usr/lib64/grass84/gui/wxpython/vdigit/mapwindow.py", line
220, in OnKeyDown
event = self.toolbar.OnTool(tool["event"])
File "/usr/lib64/grass84/gui/wxpython/vdigit/toolbars.py",
line 453, in OnTool
self.toolSwitcher.ToolChanged(event.GetId())
AttributeError
:
'NoneType' object has no attribute 'GetId'
code line should be:
if self.toolSwitcher and event:
tmszi
reviewed
Jun 8, 2023
gui/wxpython/vdigit/toolbars.py
Outdated
| @@ -467,8 +471,7 @@ def OnTool(self, event): | |||
| if self.action["id"] == -1: | |||
| self.action = {"desc": "", "type": "", "id": -1} | |||
|
|
|||
| # set focus | |||
| self.MapWindow.SetFocus() | |||
| event.Skip() | |||
There was a problem hiding this comment.
Same as previous comment.
code line should be:
if event:
event.Skip()
|
All bugs fix patch attached.
|
|
Thanks, I further simplified your code. |
tmszi
reviewed
Jun 19, 2023
There was a problem hiding this comment.
With your simplification commit ef5d9e7 activation Digitize new boundary (Ctrl+B) and Digitize new centroid (Ctrl+C) by keyboard shortcut is not working as expected.
Steps to reproduce:
- Display some vector map
d.vect geology - Activate Vector digitizer for geology vector map
- Change focus on actual map display
- Activate and use Pan tool
- Try activate Digitize new point (Ctrl+P) tool by keyboard shortcut
- Try activate Digitize new boundary (Ctrl+B) tool, or Digitize new centroid (Ctrl+C) tool by keyboard shortcut is not working
|
Thanks, I believe it's all fixed now, I think this is good to be merged. |
nilason
approved these changes
Jun 21, 2023
|
It works as expected. |
petrasovaa
added a commit
that referenced
this pull request
Jun 21, 2023
…called (#3027) Co-authored-by: Tomas Zigo <tomas.zigo@slovanet.sk>
petrasovaa
removed
the
backport to 8.3
|
@petrasovaa are you planning also backport to 8.2? |
Yes, will get back to it, it can't be simply cherry-picked due to conflict. |
landam
pushed a commit
to landam/grass
that referenced
this pull request
Oct 25, 2023
…called (OSGeo#3027) Co-authored-by: Tomas Zigo <tomas.zigo@slovanet.sk>
neteler
pushed a commit
to nilason/grass
that referenced
this pull request
Nov 7, 2023
…called (OSGeo#3027) Co-authored-by: Tomas Zigo <tomas.zigo@slovanet.sk>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The bug could be reproduced by:
Also g.gui.iclass doesn't work.
The toolbar tools were bound to the ToolbarController.OnTool method, this PR replaces the controller's method in runtime by the specific one in digitizer toolbar. Probably there could be a better solution, but this seems to work and the code is changed minimally.
Unrelated change is removing setting focus, seems to help with using keyboard shortcuts.