Skip to content

Commit ec4aabb

Browse files
cjgabriecjgabrie
committed
Update to BD v1.5 official
1 parent 68093f4 commit ec4aabb

35 files changed

+434
-572
lines changed

‎BehaviorDEPOT_GUI_v1_5.mlapp‎

133 KB
Binary file not shown.

‎BehaviorDEPOTv1.5.mlappinstall‎

291 KB
Binary file not shown.

‎BehaviorDEPOTv1.5.prj‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<deployment-project plugin="plugin.apptool" plugin-version="1.0">
2+
<configuration build-checksum="3472228838" file="C:\BehaviorDEPOT\BehaviorDEPOTv1.5.prj" location="C:\BehaviorDEPOT" name="BehaviorDEPOTv1.5" target="target.mlapps" target-name="Package App">
3+
<param.appname>BehaviorDEPOTv1.5</param.appname>
4+
<param.authnamewatermark>C. Gabriel, Z. Zeidler, B. Jin, L. DeNardo</param.authnamewatermark>
5+
<param.email />
6+
<param.company />
7+
<param.icon />
8+
<param.icons />
9+
<param.summary>BehaviorDEPOT v1.5 application for analyzing top-down rodent DLC tracking and automatic behavior classification</param.summary>
10+
<param.description />
11+
<param.screenshot>C:\Users\chris\AppData\Local\Temp\tp4242d19d_92c3_440d_bb75_befab9f77aa2.png</param.screenshot>
12+
<param.version>1.5</param.version>
13+
<param.products.name>
14+
<item>MATLAB</item>
15+
<item>Curve Fitting Toolbox</item>
16+
<item>Image Processing Toolbox</item>
17+
<item>Parallel Computing Toolbox</item>
18+
<item>Signal Processing Toolbox</item>
19+
<item>Statistics and Machine Learning Toolbox</item>
20+
</param.products.name>
21+
<param.products.id>
22+
<item>1</item>
23+
<item>60</item>
24+
<item>17</item>
25+
<item>80</item>
26+
<item>8</item>
27+
<item>19</item>
28+
</param.products.id>
29+
<param.products.version>
30+
<item>9.12</item>
31+
<item>3.7</item>
32+
<item>11.5</item>
33+
<item>7.6</item>
34+
<item>9.0</item>
35+
<item>12.3</item>
36+
</param.products.version>
37+
<param.platforms />
38+
<param.output>${PROJECT_ROOT}</param.output>
39+
<param.guid>b06ff99d-6e22-40a1-a39b-f0a195828f24</param.guid>
40+
<unset>
41+
<param.email />
42+
<param.company />
43+
<param.icon />
44+
<param.icons />
45+
<param.description />
46+
<param.platforms />
47+
<param.output />
48+
</unset>
49+
<fileset.main>
50+
<file>${PROJECT_ROOT}\BehaviorDEPOT_GUI_v1_5.mlapp</file>
51+
</fileset.main>
52+
<fileset.depfun />
53+
<fileset.resources>
54+
<file>${PROJECT_ROOT}\code</file>
55+
</fileset.resources>
56+
<fileset.package />
57+
<build-deliverables>
58+
<file location="C:\" name="BehaviorDEPOT" optional="false">C:\BehaviorDEPOT</file>
59+
</build-deliverables>
60+
<workflow />
61+
<matlab>
62+
<root>C:\Program Files\MATLAB\R2022a</root>
63+
<toolboxes />
64+
</matlab>
65+
<platform>
66+
<unix>false</unix>
67+
<mac>false</mac>
68+
<windows>true</windows>
69+
<win2k>false</win2k>
70+
<winxp>false</winxp>
71+
<vista>false</vista>
72+
<linux>false</linux>
73+
<solaris>false</solaris>
74+
<osver>10.0</osver>
75+
<os32>false</os32>
76+
<os64>true</os64>
77+
<arch>win64</arch>
78+
<matlab>true</matlab>
79+
</platform>
80+
</configuration>
81+
</deployment-project>

‎code/BehDEPOT_mainscript.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ function BehDEPOT_mainscript(P)
9090
Behavior.(beh_names{i}) = this_classifier(Params, Tracking, Metrics);
9191
end
9292

93-
% %% Intersect Spatial & Temporal Filters
94-
% if Params.do_roi && Params.do_events
95-
% Behavior.Intersect = filterIntersect(Behavior, Params);
96-
% end
97-
9893
%% Save Behavior Data
9994
if P.batchSession == 1
10095
analyzed_folder_name = strcat(P.basedir, addSlash(), P.video_folder_list(j), addSlash(), P.video_folder_list(j), '_analyzed');

‎code/BehDepo_mainscript.m‎

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎code/BehDepo_mainscript_single.m‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎code/functions/calculateMetrics.m‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
%using the smoothed tracking data from Tracking
88

99
function [Metrics, Tracking, Params, P] = calculateMetrics(Tracking, Params, P)
10-
1110
%% Register tracked parts with custom names to known body parts
1211

1312
% known_part_list contains list of tracking points of interest. Additional points can be added.
@@ -26,13 +25,22 @@
2625

2726
% Prompt user to register body parts, then ask if want to save that list for future use
2827
if isempty(P.part_save) || isequal(P.part_save, "No")
29-
part_match_inds = [];
30-
disp('Select corresponding body part for tracked point labels. Select "Other" if part is not listed')
31-
for i_part = 1:length(Params.part_names)
32-
this_part = Params.part_names{i_part};
33-
[indx,~] = listdlg('PromptString',{'Select matching body part for: ', this_part, 'Select "Other" if part not listed'},'SelectionMode','single','ListString',known_part_list);
34-
part_match_inds = [part_match_inds, indx];
35-
end
28+
repeat = true;
29+
while repeat
30+
part_match_inds = [];
31+
disp('Select corresponding body part for tracked point labels. Select "Other" if part is not listed')
32+
for i_part = 1:length(Params.part_names)
33+
this_part = Params.part_names{i_part};
34+
[indx,~] = listdlg('PromptString',{'Select matching body part for: ', this_part, 'Select "Other" if part not listed'},'SelectionMode','single','ListString',known_part_list);
35+
part_match_inds = [part_match_inds, indx];
36+
end
37+
rsp = questdlg('Re-register tracked parts?', 'Confirm Part Tracking', 'Yes', 'No', 'No');
38+
if strcmp(rsp, 'Yes')
39+
repeat = true;
40+
else
41+
repeat = false;
42+
end
43+
end
3644
else
3745
part_match_inds = P.part_match_inds;
3846
end

0 commit comments

Comments
 (0)