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.

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

ROI additions #64

Merged
merged 29 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0444187
renamed ROIs
niksirbi Mar 16, 2023
e287eb2
Changed layout of elements on the ROI tab
niksirbi Mar 16, 2023
51cc9d0
Changed ROI button names
niksirbi Mar 16, 2023
87466e9
added button for clearing ROIs
niksirbi Mar 16, 2023
c2ef956
refactored ROI button style
niksirbi Mar 16, 2023
b43a2de
added clear ROIs functionality into callback
niksirbi Mar 16, 2023
1fb8bd8
replace clear ROIs button with button for deleting selected rows
niksirbi Mar 20, 2023
58a4bbc
consistent variable names for ROI buttons
niksirbi Mar 20, 2023
d594b30
updated ROI button text and layout
niksirbi Mar 20, 2023
bcd5f6c
initialise ROI buttons as disabled by default
niksirbi Mar 20, 2023
af33ef2
enable ROI buttons only when it makes sense to use them
niksirbi Mar 20, 2023
3011c67
fix trivial typoin TODO
niksirbi Mar 20, 2023
145f0f2
renamed and modified callbacks for disabling ROI buttons
niksirbi Mar 28, 2023
859ffea
separated save rois callback from the one updating the roi status alert
niksirbi Mar 28, 2023
6684594
refactored callback for updating roi status alert
niksirbi Mar 28, 2023
dd33698
added loading indicator to roi status alert
niksirbi Mar 28, 2023
37d000e
Merge branch 'main' into roi-additions
niksirbi Mar 29, 2023
4a5f5fb
Update wazp/callbacks/roi.py
niksirbi Mar 29, 2023
1e327f2
fix ROI tags in input config
niksirbi Mar 29, 2023
6b9392b
remove TODO regarding ROI colormap
niksirbi Mar 29, 2023
51eccb6
Make messages to user less verbose
niksirbi Mar 29, 2023
049abb8
removed unnecessary buttons and tooltips
niksirbi Mar 29, 2023
d807fd0
removed instructions
niksirbi Mar 29, 2023
ac4ddac
raise better exceptions when frames cannot be counted or extracted
niksirbi Mar 29, 2023
4272c18
improve exception handling when videos cannot be opened and smarter f…
niksirbi Mar 29, 2023
f088209
Make frame indexing more explicit. Display max frame index.
niksirbi Mar 29, 2023
d1c47d3
ensure that success message is always displayed when saving ROis
niksirbi Mar 30, 2023
df086f7
make sure to enable load button after rois are saved for the first time
niksirbi Mar 30, 2023
e74d088
Merge branch 'roi-additions' of https://github.com/SainsburyWellcomeC…
niksirbi Mar 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sample_project/input_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ model_str: DLC_resnet50_jwasp_femaleandmaleSep12shuffle1_1000000
dashboard_export_data_path: ./sample_project/output
ROI_tags:
- enclosure
- left_box
- top_box
- right_box
- bottom_box
- nectar1_box
- control_box
- water_only_box
- nectar2_box
- tube
event_tags:
- experiment_start
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ ROIs:
path: M348.0491395793499,93.62497131931165L356.4009560229445,232.82191204588906L361.9688336520076,480.5924665391969L361.9688336520076,625.3572848948373L361.9688336520076,850.8563288718926L373.1045889101338,959.4299426386231L378.67246653919693,1042.9481070745694L400.9439770554493,1073.5714340344166L690.4736137667304,1073.5714340344166L843.5902485659656,1048.5159847036325L1163.7432122370938,1037.3802294455063L1302.9401529636712,1012.3247801147224L1344.6992351816443,995.6211472275331L1366.9707456978967,917.6708604206498L1378.106500956023,811.881185468451L1389.2422562141492,736.7148374760992L1389.2422562141492,625.3572848948373L1350.2671128107074,491.72822179732304L1336.3474187380498,374.802791586998L1325.2116634799236,288.50068833652006L1322.427724665392,196.63070745697894L1289.0204588910133,65.78558317399617Z
- drawn_on_frame: 38000
line_color: '#E15F99'
name: left_box
name: nectar1_box
path: M484.23300516875133,565.133184774723L483.3063124386091,605.9076649009826L487.01308335917815,624.4415195038279L489.7931615496049,634.6351395353927L495.3533179304585,639.268603186104L532.4210271361491,639.268603186104L558.3684235801323,635.5618322655349L562.0751945007014,628.1482904243968L560.2218090404169,604.054279440698L557.4417308499901,570.6933411555766L557.4417308499901,563.2797993144385Z
- drawn_on_frame: 38000
line_color: '#1CA71C'
name: top_box
name: control_box
path: M756.6806678305767,278.34419881335197L761.314131481288,311.7051370984735L767.8009805922838,337.6525335424568L770.5810587827106,343.2126899233104L800.235226147263,337.6525335424568L832.6694717022423,336.7258408123146L834.5228571625267,322.8254498601806L826.1826225912464,286.68443338463237L825.2559298611042,267.22388605164485L826.1826225912464,275.5641206229252Z
- drawn_on_frame: 38000
line_color: '#FB0D0D'
name: right_box
name: water-only_box
niksirbi marked this conversation as resolved.
Show resolved Hide resolved
path: M1061.562576047381,566.5456378875958L1071.756196078946,619.3671235057049L1078.2430451899418,633.2675144578387L1104.190441633925,630.487436267412L1143.1115362999,628.6340508071274L1145.891614490327,623.0738944262739L1143.1115362999,602.6866543631442L1136.6246871889043,573.0324869985917L1131.991223538193,554.4986323957464Z
- drawn_on_frame: 38000
line_color: '#DA16FF'
name: bottom_box
name: nectar2_box
path: M812.2822316391125,845.4801496604169L809.5021534486857,922.3956462622248L859.5435608763679,920.5422608019403L881.7841863997821,911.2753335005176L884.564264590209,894.5948643579569L885.4909573203512,861.2339260728354L882.7108791299245,835.2865296288521Z
- drawn_on_frame: 38000
line_color: '#222A2A'
Expand Down
Loading