Commit e7ed534
committed
Bugfixes and Updates (LARGE)
--KEY THINGS--
* `nigeLab.libs.DiskData` re-work
+ Now, clear reason for three obj.type_ categories:
- 'MatFile' : Files that should not grow or shrink once they have been allocated on the disk (such as from the already-known number of samples in the record)
- 'Hybrid': "Vector" style file that can be expanded along columns. This should be used for data streams such as RawData or DigIO.
- 'Event': "Matrix" style file that can be expanded along rows. This should be used for things like 'Spikes' or 'ScoredEvents'.
+ Split `subsref` and `subsasgn` into more modular design to make it clearer what logic is in those methods.
+ Initialization for all three types of input arguments (single, two inputs, or three inputs) should all work now (previously, it didn't seem the single-input case worked).
+ Now no longer creates a matfile (.diskfile_); instead, uses hdf5 handling for everything.
* Bug with doRawExtraction should be resolved
+ May need to re-run extraction for STREAMS (it was incorrectly using 8-bit values that resulted in empty streams which otherwise contained data)
-----------------------------
* `nigeLab.defaults`
+ Add flag to skip UI Prompt for videos in `+defaults/Videos`
+ Update `+defaults/doActions` so each struct field that corresponds to a `doMethod` has a third field: `batch`
- This field is checked for example if it is expected that many important Blocks may need to have a particular field (such as .Videos) but that not every Block in a Tank is expected to have it. Instead of throwing an error, `checkActionIsValid` will return a flag as false if the .Status of .Fields listed in .batch are not completed.
* `nigeLab.libs`
+ Update .empty() methods of `.VidStreamsType` and `.VideosFieldType`
+ `nigeLab.libs.VidStreamsType` and `nigeLab.libs.VideosFieldType` should now initialize correctly.
- Unfortunately, once they started initializing correctly, it caused the _Obj.mat files to expand in size by an order of magnitude. Re-worked how data pointers are handled for these classes, so they should no longer be as inefficient
* `nigeLab.Block`
+ Update a bunch of the Block methods that referenced deprecated parameters fields (`VideoPars` and `SortPars`).
+ Remove deprecated methods:
- `nigeLab.Block/getFileType()`
- `nigeLab.Block/getFieldType()`
- `nigeLab.Block/getFieldTypeIndex()`
+ Corresponding methods are implemented in `nigeLab.nigelObj`
+ `nigelab.Block/doVidInfoExtraction` is now working more-or-less as intended.
+ `nigeLab.Block/getStatus()` this method is a mess and needs to be moved to `nigelObj` soon. Basically, we want it to behave the same way when we call it at all levels otherwise it gets too confusing.
- For now, just put some shitty code in there to make it work for the time-being.
* `nigeLab.Tank`
+ Add `varargin` to `nigeLab.Tank/runFun()` method, which allows it to supply input
Additions
* `nigeLab.nigelObj/getFieldInfo()` and `nigeLab.libs.nigelButtonArray`
+ Were supposed to work in combination to make mouse-over and clickable things happen for DashBoard but I think it's too messy and didn't want to waste time on it. Regardless, they exist (and that's why).
* Added `.empty` methods to a few other Classes so their validation doesn't screw up other working classes.
Update
Update
* Bugfix again on doRawExtraction
* Add parsing from Buccelli & Murphy 2019 FSM to Intan RHS header parse
Update
* Fix initEvents
* Add RHS parsing for intan2Block for modified FSM thing
* Fix doEventDetection and doEventHeaderExtraction1 parent f79a88d commit e7ed534
77 files changed
Lines changed: 7363 additions & 2887 deletions
File tree
- +nigeLab
- +defaults
- +libs
- @DashBoard
- @DiskData
- @VidStreamsType
- @VideosFieldType
- @alignInfo
- @behaviorInfo
- @nigelButton
- @splitMultiAnimalsUI
- @vidInfo
- +sounds
- +utils
- @Animal
- @Block
- private
- @Sort
- @Tank
- @nigelObj
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
38 | | - | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
141 | 155 | | |
142 | 156 | | |
143 | | - | |
| 157 | + | |
144 | 158 | | |
145 | | - | |
146 | | - | |
| 159 | + | |
| 160 | + | |
147 | 161 | | |
148 | 162 | | |
149 | 163 | | |
150 | 164 | | |
151 | 165 | | |
152 | 166 | | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
153 | 172 | | |
154 | 173 | | |
155 | 174 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
| 83 | + | |
83 | 84 | | |
84 | 85 | | |
85 | 86 | | |
| |||
160 | 161 | | |
161 | 162 | | |
162 | 163 | | |
163 | | - | |
164 | | - | |
| 164 | + | |
| 165 | + | |
165 | 166 | | |
166 | 167 | | |
167 | 168 | | |
| |||
172 | 173 | | |
173 | 174 | | |
174 | 175 | | |
175 | | - | |
176 | | - | |
177 | 176 | | |
178 | | - | |
179 | | - | |
180 | | - | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
181 | 184 | | |
182 | 185 | | |
183 | 186 | | |
| |||
197 | 200 | | |
198 | 201 | | |
199 | 202 | | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | 203 | | |
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
207 | | - | |
208 | 207 | | |
209 | 208 | | |
210 | 209 | | |
| |||
219 | 218 | | |
220 | 219 | | |
221 | 220 | | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
222 | 239 | | |
223 | 240 | | |
224 | 241 | | |
225 | 242 | | |
226 | 243 | | |
227 | 244 | | |
228 | | - | |
229 | 245 | | |
230 | 246 | | |
231 | | - | |
232 | | - | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
233 | 250 | | |
234 | 251 | | |
235 | 252 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | | - | |
23 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
| 29 | + | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
61 | 70 | | |
62 | 71 | | |
63 | 72 | | |
| 73 | + | |
| 74 | + | |
64 | 75 | | |
65 | 76 | | |
66 | 77 | | |
0 commit comments