chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor out buildEventList

Browse Source
This commit is contained in:
Phil Olynyk 2019-08-16 22:17:47 -04:00
parent f5f0d62611
commit b518461f8c
1 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -2005,8 +2005,8 @@ int ResmedLoader::Open(const QString & dirpath)
ResMedDay & resday = rdi.value(); ResMedDay & resday = rdi.value();
resday.date = date; resday.date = date;
checkSummaryDay( resday, date, mach );
checkSummaryDay( resday, date, mach );
} }
sessionCount = 0; sessionCount = 0;
@ -2386,6 +2386,30 @@ bool ResmedLoader::LoadBRP(Session *sess, const QString & path)
return true; return true;
} }
void buildEventList( EventStoreType est, EventDataType t_min, EventDataType t_max, EDFSignal &es,
EventDataType *min, EventDataType *max, double tt, EventList *el, Session * sess, ChannelID code ) {
EventDataType tmp = EventDataType(est) * es.gain;
if ((tmp >= t_min) && (tmp <= t_max)) {
if (tmp < *min)
*min = tmp;
if (tmp > *max)
*max = tmp;
el->AddEvent(tt, est);
} else {
// Out of bounds value, start a new eventlist
if (el->count() > 1) {
// that should be in session, not the eventlist.. handy for debugging though
el->setDimension(es.physical_dimension);
el = sess->AddEventList(code, EVL_Event, es.gain, es.offset, 0, 0);
} else
el->clear(); // reuse the object
}
}
// Convert EDFSignal data to OSCAR's Time-Delta Event format // Convert EDFSignal data to OSCAR's Time-Delta Event format
void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es, ChannelID code, void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es, ChannelID code,
long recs, qint64 duration, EventDataType t_min, EventDataType t_max, bool square) long recs, qint64 duration, EventDataType t_min, EventDataType t_max, bool square)
@ -2448,46 +2472,48 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
if (last != c) { if (last != c) {
if (square) { if (square) {
tmp = EventDataType(last) * es.gain; buildEventList( last, t_min, t_max, es, &min, &max, tt, el, sess, code );
// tmp = EventDataType(last) * es.gain;
if ((tmp >= t_min) && (tmp <= t_max)) { //
if (tmp < min) // if ((tmp >= t_min) && (tmp <= t_max)) {
min = tmp; // if (tmp < min)
// min = tmp;
if (tmp > max) //
max = tmp; // if (tmp > max)
// max = tmp;
el->AddEvent(tt, last); //
} else { // el->AddEvent(tt, last);
// Out of bounds value, start a new eventlist // } else {
if (el->count() > 1) { // // Out of bounds value, start a new eventlist
// that should be in session, not the eventlist.. handy for debugging though // if (el->count() > 1) {
el->setDimension(es.physical_dimension); // // that should be in session, not the eventlist.. handy for debugging though
// el->setDimension(es.physical_dimension);
el = sess->AddEventList(code, EVL_Event, es.gain, es.offset, 0, 0); //
} else // el = sess->AddEventList(code, EVL_Event, es.gain, es.offset, 0, 0);
el->clear(); // reuse the object // } else
} // el->clear(); // reuse the object
// }
} }
tmp = EventDataType(c) * es.gain; buildEventList( c, t_min, t_max, es, &min, &max, tt, el, sess, code );
// tmp = EventDataType(c) * es.gain;
if ((tmp >= t_min) && (tmp <= t_max)) { //
if (tmp < min) // if ((tmp >= t_min) && (tmp <= t_max)) {
min = tmp; // if (tmp < min)
if (tmp > max) // min = tmp;
max = tmp; // if (tmp > max)
// max = tmp;
el->AddEvent(tt, c); //
} else { // el->AddEvent(tt, c);
if (el->count() > 1) { // } else {
el->setDimension(es.physical_dimension); // if (el->count() > 1) {
// el->setDimension(es.physical_dimension);
// Create and attach new EventList //
el = sess->AddEventList(code, EVL_Event, es.gain, es.offset, 0, 0); // // Create and attach new EventList
} else // el = sess->AddEventList(code, EVL_Event, es.gain, es.offset, 0, 0);
el->clear(); // } else
} // el->clear();
// }
} }
tt += rate; tt += rate;