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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 59 commits into from
Dec 16, 2021
Merged

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

merged 59 commits into from
Dec 16, 2021

Commits on Dec 8, 2021

  1. resolve conflicts

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    dfb068d View commit details
    Browse the repository at this point in the history

  2. showing map displays

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    7028d32 View commit details
    Browse the repository at this point in the history

  3. renaming corrected

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    a847d10 View commit details
    Browse the repository at this point in the history

  4. reorganization, map frame inherits from layertree as originally

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    57ee1ea View commit details
    Browse the repository at this point in the history

  5. closing event corrected

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    8fa60e6 View commit details
    Browse the repository at this point in the history

  6. OnCloseWindow moved to lmgr and closingDisplay signal removed

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4d7dc3f View commit details
    Browse the repository at this point in the history

  7. Focus is bind to map frame not map panel

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    965719c View commit details
    Browse the repository at this point in the history

  8. step backwards, OnCloseWindow preserved in mapdisp frame, new frame m… 

    …ixin class added
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    aebe27b View commit details
    Browse the repository at this point in the history

  9. _onMapDisplayClosed removed

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    cc22736 View commit details
    Browse the repository at this point in the history

  10. corrections

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    a31d230 View commit details
    Browse the repository at this point in the history

  11. inheritance oreder changed, some method removed from mixin

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    2ae1bde View commit details
    Browse the repository at this point in the history

  12. closing corrected

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    37d1440 View commit details
    Browse the repository at this point in the history

  13. renaming map frame variables to mappanel for better clarity

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    67845af View commit details
    Browse the repository at this point in the history

  14. move frame stuff to new mapdisplay class

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    e0c1271 View commit details
    Browse the repository at this point in the history

  15. FrameMixin moved to guicore/mapdisp

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    9df815c View commit details
    Browse the repository at this point in the history

  16. mapdisplay is the attribute of layertree, show Map Display goes to Cr… 

    …eateNewMapDisplay method
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    79b9108 View commit details
    Browse the repository at this point in the history

  17. Renaming of display tabs corrected

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    a461d09 View commit details
    Browse the repository at this point in the history

  18. switching tabs when switching map displays corrected

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    7fda15f View commit details
    Browse the repository at this point in the history

  19. not needed

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    e05f3be View commit details
    Browse the repository at this point in the history

  20. wxGUI: attempt for creating new classes in order to not affect standa… 

    …lone frame as MapSwipe and others
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    7ddee0d View commit details
    Browse the repository at this point in the history

  21. delegation removed - not working solution

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    73185f8 View commit details
    Browse the repository at this point in the history

  22. creation of the Map Display frame is also part of the MapDisplay class

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    e11b379 View commit details
    Browse the repository at this point in the history

  23. black

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    1e62e5c View commit details
    Browse the repository at this point in the history

  24. black

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    327a82c View commit details
    Browse the repository at this point in the history

  25. frame vs panel

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4452ae9 View commit details
    Browse the repository at this point in the history

  26. OnFullScreen method created in FrameMixin and MapDisplay frame instan… 

    …ce is now created in CreateNewMapDisplay as originally
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    46c4ef1 View commit details
    Browse the repository at this point in the history

  27. OnFullScreen move to MapDisplay

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    0645377 View commit details
    Browse the repository at this point in the history

  28. no need to pass parameter to _initShortcuts method

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    c4031c6 View commit details
    Browse the repository at this point in the history

  29. ShowFullScreen resembles the original method and statusbar is also sh… 

    …own/hidden
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    cac609d View commit details
    Browse the repository at this point in the history

  30. d.mon made as a panel - still WIP

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    858c90b View commit details
    Browse the repository at this point in the history

  31. d.mon - corrections

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    eaa85a3 View commit details
    Browse the repository at this point in the history

  32. Panel class removed

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    b9461e1 View commit details
    Browse the repository at this point in the history

  33. edits

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    0830504 View commit details
    Browse the repository at this point in the history

  34. rdigit and vdigit as panel - WIP

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    5343ac8 View commit details
    Browse the repository at this point in the history

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

    …#1689 merge)
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    7c86e73 View commit details
    Browse the repository at this point in the history

  36. building panels for mapswipe and iclass frames, gcp stuff a bit edite… 

    …d, general problem with frame closings
    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    972c5b6 View commit details
    Browse the repository at this point in the history

  37. I override wrong file by the mistake

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    442b099 View commit details
    Browse the repository at this point in the history

  38. style and size

    Linda Kladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    d94fc60 View commit details
    Browse the repository at this point in the history

  39. corrections from rebase

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    d0afc62 View commit details
    Browse the repository at this point in the history

  40. black

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    c8841e2 View commit details
    Browse the repository at this point in the history

  41. minor edits

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    0a605a3 View commit details
    Browse the repository at this point in the history

  42. last tools - ii2t, ip2i - adapted, now it is ready for testing (closi… 

    …ng events need to correct)
    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    f32775b View commit details
    Browse the repository at this point in the history

  43. changes in ExampleMapFrame also addressed

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    fe5a920 View commit details
    Browse the repository at this point in the history

  44. g.gui.example has also undergone changes

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    5fc0295 View commit details
    Browse the repository at this point in the history

  45. readme edited

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    ef0ad45 View commit details
    Browse the repository at this point in the history

  46. Edits of description, now no Frame classes of any of these GUI tools … 

    …exist (checked by grep)
    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    8f4e30e View commit details
    Browse the repository at this point in the history

  47. closing events fixed, now working for all frames (tested)

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4b5a209 View commit details
    Browse the repository at this point in the history

  48. small reorganization

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    a0bfdcd View commit details
    Browse the repository at this point in the history

  49. docstrings

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    1cad717 View commit details
    Browse the repository at this point in the history

  50. list of classes updated

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    1fdd73b View commit details
    Browse the repository at this point in the history

  51. example frame corrected and tested - now works well

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    742b657 View commit details
    Browse the repository at this point in the history

  52. mapswipe script reorganization and updating list of classes

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    642d6f2 View commit details
    Browse the repository at this point in the history

  53. g.gui.example - small edits

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    42dbca2 View commit details
    Browse the repository at this point in the history

  54. black

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    11fc57b View commit details
    Browse the repository at this point in the history

  55. flake8

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    3939ec4 View commit details
    Browse the repository at this point in the history

  56. flake8, black

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    3722b0e View commit details
    Browse the repository at this point in the history

  57. spaces

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4515ad0 View commit details
    Browse the repository at this point in the history

  58. mapswipe and iclass event handlers adapted in Single-Window GUI

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4880a3e View commit details
    Browse the repository at this point in the history

  59. conflicts

    lindakladivova committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4e6847c View commit details
    Browse the repository at this point in the history