wxGUI: Use Map Display settings in other Map Display applications #2155
Conversation
gui/wxpython/gui_core/mapdisp.py
Outdated
| def GetProperty(self, name): | ||
| """Returns property""" | ||
| if self.HasProperty("projection"): | ||
| return self.statusbarManager.GetProperty(name) | ||
| else: | ||
| if not self.HasProperty("projection"): | ||
| return self.mapWindowProperties.useDefinedProjection | ||
| elif not self.HasProperty("resolution"): | ||
| return self.mapWindowProperties.resolution | ||
| elif not self.HasProperty("alignExtent"): | ||
| return self.mapWindowProperties.alignExtent | ||
| elif not self.HasProperty("region"): | ||
| return self.mapWindowProperties.region | ||
| else: | ||
| print("bla") | ||
| return self.statusbarManager.GetProperty(name) |
There was a problem hiding this comment.
This doesn't makes sense, I think I missed this during review of #2087. You call e.g. GetProperty("region") and you get useDefinedProjection. See SetProperty above as well.
There was a problem hiding this comment.
Yes, that's true, thank you @petrasovaa . I was aware of the fact that there is probably a mistake because it crashed but did not have enough time to look at it more precisely. I will do so now. You are right that the problem has already started in #2087.
gui/wxpython/gui_core/mapdisp.py
Outdated
| if self.HasProperty("projection"): | ||
| self.statusbarManager.SetProperty(name, value) | ||
| else: | ||
| if name == "projection": |
There was a problem hiding this comment.
These GetProperty and SetProperty are temporary solutions since we need self.mapFrane.GetProperty("projection") in some statusbar classes such as SbGoTo and so on...
|
I know that we talked on videocall about the "monitor" background (https://github.com/OSGeo/grass/blob/main/gui/icons/grass/monitor-create.png) that would be more suitable for Map Display settings than the "map" background (https://github.com/OSGeo/grass/blob/main/gui/icons/grass/map-settings.png). However, if we use the monitor icon for Map Display Settings we probably need to make it from beginning in Inkscape.. I remember that we took some icons from QGIS but if I looked correctly QGIS does not have any monitor svg icon like that ... So I would probably put it off for another PR where we can also create a new vector icon for "Render map" and add create-monitor.svg to create-monitor.png file. @petrasovaa what do you think? |
Yes, I assumed you would need to create a new one. Unfortunately I found the monitor one only as png: |
gui/wxpython/gui_core/mapdisp.py
Outdated
| if name == "projection": | ||
| return self.mapWindowProperties.useDefinedProjection | ||
| elif name == "resolution": | ||
| return self.mapWindowProperties.resolution | ||
| elif name == "alignExtent": | ||
| return self.mapWindowProperties.alignExtent | ||
| elif name == "region": | ||
| return self.mapWindowProperties.showRegion | ||
| else: | ||
| return self.statusbarManager.GetProperty(name) | ||
|
|
There was a problem hiding this comment.
You could use hasattr/getattr here instead of those ifs.
There was a problem hiding this comment.
I have tried that in the last commit but a bug with useDefinedProjection apparently appeared. The "UseDefinedProjection" toggle button does not work. Now I am going to bed, I will look at it more deeply tomorrow.
|
I have tested all map display apps and everything works good. I think we could merge it. |
This PR prepares for Map Display statusbar refactoring. It removes some statusbar widgets that we do not need to refactor since they are already used in Map Display settings, particularly:
Subsequently, it makes Map Display settings button part of other Map Display panels such as MapSwipe, IClass, Image2Target, Photo2Target and GCP.