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: Integrate Grapical Modeler into single window layout #3003

Merged
merged 57 commits into from
Apr 9, 2024
Merged

wxGUI: Integrate Grapical Modeler into single window layout #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
a23851c
first step, split 'frame' into 'panel' and 'canvas' modules
landam Jun 4, 2023
10809a9
gmodeler dockable
landam Jun 4, 2023
04306ce
fix menu, WIP
landam Jun 5, 2023
f6545f3
black applied
landam Jun 5, 2023
94c1d2d
Merge branch 'main' into gmodeler_panel
landam Nov 6, 2023
b7096fc
merge manually #3188
landam Nov 6, 2023
281db48
merge manually #2991
landam Nov 6, 2023
d0ca042
fix indetation error
landam Nov 6, 2023
0b67f5a
log in main statusbar
landam Nov 6, 2023
15d5447
close page WIP
landam Nov 6, 2023
b5e7fe4
fix page closing
landam Nov 6, 2023
14101cd
base class wip
landam Nov 7, 2023
a710fb3
remove currentDisplay
landam Nov 7, 2023
de66788
WIP
landam Nov 7, 2023
9438c1c
undock/dock
landam Nov 7, 2023
1ea3826
rename methods map -> main
landam Nov 7, 2023
4e45154
add missing module
landam Nov 8, 2023
1d8ee1f
+_pgnumDict()
landam Nov 8, 2023
abcdc9b
rename notebook to _mainnotebook to avoid variable override
landam Nov 8, 2023
b591ca7
new icon modeler-settings, add model properies into toolbar'
landam Nov 8, 2023
dcad156
black applied
landam Nov 8, 2023
a6089f3
fix multiwindow layout
landam Nov 8, 2023
0fb7a94
remove unused import
landam Nov 8, 2023
3f90773
remove unused import
landam Nov 8, 2023
a182199
remove unused import
landam Nov 8, 2023
4b7e5f5
disable E1101
landam Nov 8, 2023
c1a7959
black applied
landam Nov 8, 2023
38611d8
pylint: change from inline solution to .pyintrc
landam Nov 8, 2023
f49a473
fix pyint ignored-classes
landam Nov 8, 2023
5a1ba75
Merge branch 'main' into gmodeler_panel
landam Mar 2, 2024
0be08d3
merge manually a71b72a
landam Mar 2, 2024
4284066
merge manually f393525
landam Mar 2, 2024
e5c9482
merge manually e07531f
landam Mar 2, 2024
610d042
merge manually 0ad33cc
landam Mar 2, 2024
4f45ead
merge manually 76c1ac5
landam Mar 2, 2024
d816fdd
disable ModelChanged() in OnSize() when window is dockable
landam Mar 2, 2024
bbeb272
use IsDockable() instead of _dockable
landam Mar 2, 2024
33e8219
hide shortcuts when window is dockable
landam Mar 2, 2024
eb91883
menu initial implementation
landam Mar 3, 2024
a19672d
one word menu item
landam Mar 3, 2024
14e9835
fix menu replace
landam Mar 3, 2024
dc25c86
menu index simplified
landam Mar 3, 2024
ccc39f8
unique menu shortcuts
landam Mar 3, 2024
410159f
Merge branch 'main' into gmodeler_panel
landam Mar 3, 2024
82e8817
fix menu for undocked windows
landam Mar 3, 2024
33b1119
reuse menu objects if already existing
landam Mar 3, 2024
83a4a4c
mapDispDocking renamed to docking
landam Mar 22, 2024
78ad9a7
fix 'MapPanel' object has no attribute '_saved_output_img_size'
landam Mar 22, 2024
714f76a
Merge branch 'main' into gmodeler_panel
landam Mar 22, 2024
a3125d3
Merge branch 'main' into gmodeler_panel
landam Apr 3, 2024
d387432
ignore security alert - consider using safer ast.literal_eval
landam Apr 3, 2024
59be93e
nosec: fix rule id
landam Apr 3, 2024
846a383
fix missing imports (TextEntryDialogs)
landam Apr 3, 2024
cd78874
address issues reported by flake8
landam Apr 5, 2024
174335e
variables are expected to be dict
landam Apr 5, 2024
c1c010f
update .flake8
landam Apr 5, 2024
aa03ca0
Merge branch 'main' into gmodeler_panel
landam Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ per-file-ignores =
gui/wxpython/gcp/g.gui.gcp.py: F841
gui/wxpython/gcp/manager.py: E501, F841, E722
gui/wxpython/gcp/mapdisplay.py: F841
gui/wxpython/gmodeler/*: F841, E722, W605, F405, F403, E402
gui/wxpython/gmodeler/*: E501
gui/wxpython/gui_core/*: F841, E266, E722, W605
gui/wxpython/gui_core/dialogs.py: E501, E722, F841, W605
gui/wxpython/gui_core/forms.py: E501, E722, F841
Expand Down
Binary file added gui/icons/grass/modeler-settings.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gui/wxpython/.pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ ignore-on-opaque-inference=yes
# List of class names for which member attributes should not be checked (useful
# for classes with dynamically set attributes). This supports the use of
# qualified names.
ignored-classes=optparse.Values,thread._local,_thread._local
ignored-classes=optparse.Values,thread._local,_thread._local,main_window.page.MainPageBase

# List of module names for which member attributes should not be checked
# (useful for modules/projects where namespaces are manipulated during runtime
Expand Down