Closed nick-sebasco closed 1 year ago
This is great. Will check through.
On Thu, 11 May 2023, 04:41 nick-sebasco, @.***> wrote:
This is a bug fix for "Multiple contours per mouse are flattened to 1 contour per mouse (instead of a list of contours)".
Before: [image: contour_bug_before] https://user-images.githubusercontent.com/119430052/237625675-e201af51-3064-4049-83ba-e217b2ffb403.PNG
After: [image: contour_bug_after] https://user-images.githubusercontent.com/119430052/237626337-1a6606ae-94d9-4061-9e74-c38bd9f7f4a4.PNG
You can view, comment on, or merge this pull request online at:
https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15 Commit Summary
- b4a67f6 https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/b4a67f65839fc01e774ce7e14e60259a33276a48 Changes from Nick Sebasco for his Kumar Lab work.
- 3245e7e https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/3245e7e109c52c893f50079081fa3e913e5c7d13 Added new files.
- 8847d2e https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/8847d2e9696b911ed734557a40002e6105f006b2 Added requirements.
- 07f891d https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/07f891d5f1a4d1816d5a881cd095a2956914cdab Reverting file to get app to run
- 4d24205 https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/4d24205e86aa64caa3a186b38ec45754e9b22993 Edits to allow moment-based features to appear in cached features (both per_frame and windowfeatures*
- 9ea3e49 https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/9ea3e4995ef4810343c2c3c5a532df9cd40e36be Adding prototyping code for validating the moments
- fe7304f https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/fe7304f580b9a5c5ec3971d9a28a7897ea778c3e setting up test class, trying to figure out how to sort seg data.
- eef835d https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/eef835da37133ab39b2e922933d6c924689645e6 Fixed sorting bug. Segmentation now overlays correctly.
- 3edcb80 https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/commits/3edcb80143881756c435e337b76080c7d8f13030 Fixed the contour bug issue.
File Changes
(34 files https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files)
- M .gitignore https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-bc37d034bad564583790a46f19d807abfe519c5671395fd494d8cce506c42947 (2)
- A docs/notes.txt https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-789a4de5014d3527873a4b0eed9c90e0fd8d61f547cf867a47b9d8e28619cc20 (4)
- A docs/work_history.md https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-8521aebaf127798eb2829d5791a26cdbffe3f19c72d26374da9f92682580433a (53)
- M requirements.txt https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-4d7c51b1efe9043e44439a949dfd92e5827321b34082903477fd04876edb7552 (38)
- M src/feature_extraction/base_features/init.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-91bd234b2d6d94e2af569328081e4e28ec513562fa78715da196936e99b230f9 (1)
- A src/feature_extraction/base_features/_ef.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-a0c67a7b9401c4267a5cea7e0dec4ed69b5ab1e193686db906eae74cee397c32 (1)
- M src/feature_extraction/base_features/base_group.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-13d046b4894598ee372a4b2d36f919cccc098b13e1444991f96af6f58264ddf0 (3)
- A src/feature_extraction/base_features/ellipse_fitting.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-7af16dc6d3df746259872b7f607f92df47aeaa86013f0557bed6853aa859ce58 (67)
- A src/feature_extraction/base_features/hu_moments.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-8d6a4a574bd7a0f9f9f973d8b24250e6de4d054f8d959cef8c29970d4e555f28 (39)
- A src/feature_extraction/base_features/moments.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-12e59f325ddf60a108ac50e318a4e7e5f8c8562a163f7a6cfcb6ce5af1da5cb8 (94)
- M src/feature_extraction/base_features/pairwise_distances.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-a2b9e69b07e63e52736505e55e3a07dcd48b6d19a2641c7b5e2d1f4b2c548f82 (1)
- M src/feature_extraction/feature_base_class.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-f169f26f0cf79c67134e2801c7cb878038c68aefb115ca01b567ec4ead78e458 (2)
- M src/feature_extraction/features.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-efa31271a3b1f077497129d18730c3e5ccf522ed1b42f025e56d9c1b6d48c98f (3)
- A src/feature_extraction/social_features/signal_processing.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-6f63a9aceef5283ff0556089f54ed1317b9a73d7f0b77fdabc97cc45eadb0290 (31)
- M src/pose_estimation/init.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-0d6a8509269712df6a279b25f59c3f1f5986052a301097dbd1c571e36c1c3456 (10)
- M src/pose_estimation/pose_est.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-46e358aef83c6b8e76c708a99b1006a3099215439d875c7e669e3e19e12f6131 (1)
- A src/pose_estimation/pose_est_v6.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-531f896804868979f6ff167779ab2643976d1ba55ee8204c260222587b51cef7 (101)
- M src/ui/central_widget.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-b634aa6c97bf15f4f707690713f53ea5104319a9a83d848565b7348d6f4b1c0e (5)
- M src/ui/main_control_widget.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-7589039cc25c04927c035a055b847c9d51d91502aad57a4dae5fcce2b387e534 (3)
- M src/ui/main_window.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-0729192efcb23689752beadd7d38502a383d42f1bbdc3ef9e81da48bc6e7c181 (15)
- M src/ui/player_widget.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-ad9a766f50daae0e7176ea47b4bb4b3d5d39ae6020253d6d261bfc713143c8ff (52)
- M src/video_stream/init.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-2a4f93e612b914872084f303cf6d8a720a4db8a07d669cfb099e6923540067f8 (2)
- M src/video_stream/frame_annotation.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-762f4d01cd9e313fb4f338f00064c69a8ec70927d99614c88f0522e8f1453386 (71)
- A tests/UI_tests/test_temporal_widget.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-f03132e811efbe66e4cf2bca650d2549291234b57e2b81e88cbe65fd663cb147 (0)
- A tests/init.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-001e61d97d9dee27d0c5aa1f23ba6c1972cd8a2e8320bac839656b0ab935b84d (0)
- A tests/feature_tests/moment_protyping.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-d4d8b557ae8d2a3609fdf693d1828253a53c4ff07d5e7c9a28d3a3c8d62e3da5 (109)
- A tests/feature_tests/seg_test_utils.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-b9a2ab0e8d0f5d628d3e2824c9eedd376b642215b629d3a4f5328a9720d4994b (68)
- A tests/feature_tests/temporal.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-dd8703832f477d381d0e4617140cae37ce850e3681749e15d9a45f0fc76fb630 (142)
- A tests/feature_tests/test_hu_moments.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-bbb0efc002d0d174b5ae08e9e354fbeade78d692592cbad726bf879ce09e413d (32)
- A tests/feature_tests/test_moments.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-05bedaf24f6bfdfd23059c7545070d7e6690f376dafe01a8578be91d179a96e1 (121)
- A tests/feature_tests/test_temporal_features.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-2cd3769131fc541e3bbb67ff582327d08cb63fa5c6c827af60ef3d5017fc18b7 (48)
- A tests/test_base_features/test_segmentation.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-8c7cdc96e8f93c2f382af661cdf78a0ea91877995f035e819ecb30fec78692a4 (138)
- A tests/test_pose_ancillary.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-a6e3ab6e02bf47706f041c078f7cbedd4bb59428788e194a5be5bf0c06485cbe (161)
- M tests/test_pose_file.py https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15/files#diff-19bf5046f811c33450b38dcfedbff3ca93cf92065aa92ff7207f8e40522a3c82 (5)
Patch Links:
- https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15.patch
- https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15.diff
— Reply to this email directly, view it on GitHub https://github.com/KumarLabJax/JABS-behavior-classifier/pull/15, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAKB63GAQE32QFKSBMOEBNTXFSQ3ZANCNFSM6AAAAAAX5ZIUB4 . You are receiving this because your review was requested.Message ID: @.***>
This looks good!
Closing because changes exist within https://github.com/KumarLabJax/JABS-behavior-classifier/pull/16
This is a bug fix for "Multiple contours per mouse are flattened to 1 contour per mouse (instead of a list of contours)".
Before:
After: