-
Notifications
You must be signed in to change notification settings - Fork 96
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
(4a -> 4) Add menu to assign an Instance
to an InstanceGroup
#1747
Merged
roomrys
merged 29 commits into
liezl/add-gui-elements-for-sessions
from
ramiz/add-gui-set-instance-group
May 1, 2024
Merged
Changes from 17 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
1efb2ca
added dropdown.py file for setting instance to instance group
ramizhajj1 49b613d
Implement session menu and instance group functionality
ramizhajj1 8a0312f
Merge branch with liezl/add-gui-elements-for-sessions to add Instance…
ramizhajj1 2c0ed1e
Update sleap/gui/app.py
ramizhajj1 3396e43
Update sleap/gui/app.py
ramizhajj1 3ce4a58
Update sleap/gui/app.py
ramizhajj1 29bfa1b
Update sleap/gui/app.py
ramizhajj1 5200479
Update sleap/gui/app.py
ramizhajj1 012dc9a
Update sleap/gui/app.py
ramizhajj1 1a52cd0
Update sleap/gui/app.py
ramizhajj1 5a728ce
Update sleap/gui/app.py
ramizhajj1 f3fd4d8
Update sleap/gui/app.py
ramizhajj1 d88b821
Modified errors in code based on suggestions
ramizhajj1 24396a7
Merge branch 'liezl/add-gui-elements-for-sessions' into ramiz/add-gui…
ramizhajj1 f481cf1
Merge branch 'ramiz/add-gui-set-instance-group' of https://github.com…
ramizhajj1 2cba392
Merge branch 'ramiz/add-gui-set-instance-group' of https://github.com…
ramizhajj1 f862e70
Add instance group management to sessions menu and update related com…
ramizhajj1 ee0fc3c
Add Delete Instance Group
ramizhajj1 060ef5b
Merge branch 'liezl/add-gui-elements-for-sessions' into ramiz/add-gui…
roomrys 2e1288a
Modify code
ramizhajj1 b203e65
Modify files
ramizhajj1 fbf2a63
Merge branch 'liezl/add-gui-elements-for-sessions' into ramiz/add-gui…
roomrys c2f2aae
FIx obvious errors (but no debug tests yet)
roomrys 62769c0
Test `SetSelectedInstanceGroup` class
roomrys 78b8c5e
Add fixes for `SetSelectedInstances` test
roomrys fdd7c65
Test AddInstanceGroup class
roomrys d39b9f2
Change AddInstanceGroup to pass tests
roomrys 3859b79
Add test for DeleteInstanceGroup class
roomrys 22e3bdb
Better the DeleteInstanceGroup error message
roomrys File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -86,7 +86,6 @@ | |||||
from sleap.skeleton import Skeleton | ||||||
from sleap.util import parse_uri_path | ||||||
|
||||||
|
||||||
logger = getLogger(__name__) | ||||||
|
||||||
|
||||||
|
@@ -810,9 +809,33 @@ def new_instance_menu_action(): | |||||
self.commands.deleteFrameLimitPredictions, | ||||||
) | ||||||
|
||||||
### Tracks Menu ### | ||||||
### Sessions Menu ### | ||||||
|
||||||
sessionsMenu = self.menuBar().addMenu("Sessions") | ||||||
self.session_menu = sessionsMenu.addMenu("Set Session Instance") | ||||||
add_menu_check_item( | ||||||
sessionsMenu, "sync session", "Synchronize Session Settings" | ||||||
).setToolTip( | ||||||
"If enabled, changes to the session settings will be synchronized across all instances." | ||||||
) | ||||||
add_menu_item( | ||||||
sessionsMenu, | ||||||
"clear session", | ||||||
"Clear Current Session", | ||||||
self.commands.clearCurrentSession, | ||||||
) | ||||||
|
||||||
tracksMenu.addSeparator() | ||||||
roomrys marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
tracksMenu = self.menuBar().addMenu("Tracks") | ||||||
self.inst_groups_menu = sessionsMenu.addMenu("Set Instance Group") | ||||||
add_menu_item( | ||||||
self.inst_groups_menu, | ||||||
"set group", | ||||||
"Set Instance Group", | ||||||
self.commands.setInstanceGroup | ||||||
) | ||||||
|
||||||
self.track_menu = tracksMenu.addMenu("Set Instance Track") | ||||||
add_menu_check_item( | ||||||
tracksMenu, "propagate track labels", "Propagate Track Labels" | ||||||
|
@@ -826,6 +849,8 @@ def new_instance_menu_action(): | |||||
"Transpose Instance Tracks", | ||||||
self.commands.transposeInstance, | ||||||
) | ||||||
|
||||||
|
||||||
|
||||||
tracksMenu.addSeparator() | ||||||
|
||||||
|
@@ -1120,6 +1145,35 @@ def _update_gui_state(self): | |||||
|
||||||
# Update menus | ||||||
|
||||||
def _update_sessions_menu(self, frame_idx): | ||||||
"""Update the instance groups menu based on the selected frame index in the session.""" | ||||||
session = self.state.get("session") | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can just use:
Suggested change
which follows convention (and makes our code easier to search) |
||||||
if session is None: | ||||||
return | ||||||
|
||||||
|
||||||
frame_idx = self.state["frame_idx"] | ||||||
frame_group = session.frame_groups.get(frame_idx, None) | ||||||
if frame_group is not None: | ||||||
for inst_group_ind, instance_group in enumerate(frame_group.instance_groups): | ||||||
if inst_group_ind < 9: | ||||||
key_command = Qt.SHIFT + Qt.Key_0 + inst_group_ind + 1 | ||||||
else: | ||||||
key_command = "" | ||||||
|
||||||
self.inst_groups_menu.addAction( | ||||||
instance_group.name, | ||||||
lambda x=instance_group: self.commands.setInstanceGroup(x), | ||||||
shortcut=key_command | ||||||
) | ||||||
|
||||||
self.inst_groups_menu.addAction( | ||||||
"New Instance Group", | ||||||
self.commands.addInstanceGroup, | ||||||
shortcut=Qt.SHIFT + Qt.Key_0 | ||||||
) | ||||||
ramizhajj1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
self.inst_groups_menu.setEnabled(has_selected_instance) | ||||||
self.track_menu.setEnabled(has_selected_instance) | ||||||
self.delete_tracks_menu.setEnabled(has_tracks) | ||||||
self._menu_actions["clear selection"].setEnabled(has_selected_instance) | ||||||
|
@@ -1772,4 +1826,4 @@ def main(args: Optional[list] = None, labels: Optional[Labels] = None): | |||||
else: | ||||||
app.exec_() | ||||||
|
||||||
pass | ||||||
pass |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what this is for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove - unable to open GUI: