-
Notifications
You must be signed in to change notification settings - Fork 112
Add option to group cameras from sessions #2125
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
Draft
justinvshen
wants to merge
81
commits into
liezl/add-gui-elements-for-sessions
Choose a base branch
from
justin/group-cameras-from-sessions
base: liezl/add-gui-elements-for-sessions
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
81 commits
Select commit
Hold shift + click to select a range
ffe5582
Imports
Jvshen 3023b10
Add a button to add camera to group
Jvshen 23c9dd6
Add camera to group function
Jvshen 16c7d88
Create Camera Groups table model
Jvshen 0b963be
Create camera groups table
Jvshen 7182b07
Create camera groups table
Jvshen e646a92
Add camera groups table model to class attributes
Jvshen fca9e8f
Add camera groups table function and adding and deleteing a camera gr…
Jvshen baa283b
Add table model for camera groups
Jvshen 5ce4bc4
Merge branch 'liezl/add-gui-elements-for-sessions' of https://github.…
Jvshen 3844141
Update sessions dock to be able to add and delete camera groups and a…
Jvshen d61ea3c
Initialize camera_groups state variables in App class
Jvshen 4233131
Update on_data_update to sync camera_groups between labels metadata a…
Jvshen 8bb6b99
Add setCameraGroupName method to enable renaming camera groups in table
Jvshen b508503
Add CameraGroup class, AddCameraGroup, DeleteCameraGroup,
Jvshen 1292cdc
Add camera group methods to CommandContext for executing camera group…
Jvshen c0c28a4
Change naming and remove unnecessary code
Jvshen ca06614
Add import
Jvshen d6bf553
Refactor: Rename function CameraGroup to CameraCategory in CommandCon…
Jvshen 695500d
Refactor: Rename function CameraGroup to CameraCategory in command cl…
Jvshen 0cc94e6
Refactor: Rename function CameraGroupsTableModel to CameraCategoriesT…
Jvshen 83e2dff
Refactor: Rename function CameraGroup to CameraCategory in docks
Jvshen b16c1af
Add CameraCategory class to cameras.py
Jvshen 1032c83
Add camera_categories attribute
Jvshen 6836608
Add YAML config for Export Labels Package dialog
Jvshen 07de332
Add menu item for Export Labels Package dialog
Jvshen 271ddf1
Add ExportLabelsPackage command for handling dialog-based exports
Jvshen 74c7160
Add execute function for ExportLabelsPackage in CommandContext
Jvshen b9ce559
Add dialog function for collecting export options
Jvshen 8de15b0
Move export labels dialog into command class and remove export_labels.py
Jvshen 9e6a698
Format change
Jvshen fd1a93f
Add Camera_category option to exporting
Jvshen 6cf5f0e
formatting
Jvshen 63aae15
Make ExportLabelsPackage be a subclass of ExportDatasetWithImages
Jvshen 8c1839b
Spacing and formatting
Jvshen f980680
Dialog for exporting labels
Jvshen 918bc9d
make_cattr for cameraCategory
Jvshen 4bdec1b
Filter labels to include frames from cameras in camera categories
Jvshen 4a8afa3
Testing to see if labels store and retrieve camera categories correctly
Jvshen 64c0ec1
add camera category filter to export labels dialog
Jvshen 54b943b
remove old export labels package button
Jvshen 8caa652
remove unused import
Jvshen 0544830
remove extra do_action method
Jvshen 956d3c3
Add back navigation commands comment
Jvshen c67e634
remove since Labels.camera_categories now always exists
Jvshen 240da9b
Set, add, and populate combobox with available camera categories
Jvshen 986d6a4
Formatting
Jvshen a2f83f8
Remove unused method
Jvshen 8f550f7
Remove "camera_categories"
Jvshen 5be482b
Change to category
Jvshen e634f51
Formatting
Jvshen 957cbdf
WIP: Change add_camera_to_category workflow
Jvshen e7e8936
Formatting
Jvshen 6fd57c8
Make changes to add camera to categories
roomrys 6bb48f9
Make changes to add camera to categories
roomrys 48fcf7f
Reset selection after command
roomrys 5ed8c4e
Fix selected_camera_category not being selected
roomrys 64805b1
Link Delete Category button straight to command
roomrys 34eec48
Remove unused update model method
roomrys 2939eb0
Move create category code to commands
roomrys 1eda317
Rename methods to more appropriate names
roomrys acdf642
Disable delete category button when there is no selected category
roomrys e947165
Delegate code to commands instead of dock
roomrys 3b42451
Reorganize method in SessionsDock
roomrys 637ca42
Add remove from category button
Jvshen 721eb32
Add defaults for removeCameraFromCateogory
Jvshen 9ccf2e0
Raise error if camera category or camera is not selected
Jvshen f4a9045
Add remove from categoyr to update_gui_state
Jvshen 47e0168
Delegate table update to command topic when rename
roomrys 3d56c4b
Rename variable
roomrys 7ae86ea
Add failing camera category load (or save) test
roomrys f98714e
Redo to_dict and from_dict methods (standalone)
roomrys 115dadf
Test standalone to_dict and from_dict methods
roomrys dc90117
Redo to and from dict for Labels integration
roomrys fad7446
Typehint and docstring CameraCategory.make_cattr
roomrys c208d50
Fix CameraCategory (de)serialization with Labels
roomrys 5a04419
Test CameraCategory (de)serialization with Labels
roomrys c8e6daa
Lint
roomrys 612ae83
[wip] Filter exported labels by camera category
roomrys 2fa7ebe
[wip] Add test for export labels with category
roomrys f795e62
Add tests for executing exportlabelspackage and verifying cameras and…
Jvshen 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 hidden or 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 |
---|---|---|
@@ -0,0 +1,18 @@ | ||
main: | ||
|
||
- name: export_type | ||
label: Export Type | ||
type: list | ||
options: Labeled frames,Labeled + suggested frames (recommended),Labeled + predicted + suggested frames | ||
default: training | ||
help: > | ||
User Labels: Only user-labeled frames | ||
Training: User-labeled and suggested frames | ||
Full: All frames including unlabeled ones | ||
|
||
- name: camera_category | ||
label: Camera Category | ||
type: list | ||
options: all | ||
default: all | ||
help: Select which camera category to export, or 'All Cameras' to export everything |
This file contains hidden or 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.
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.
Remove before merging