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

Improve event flag positioning slightly.

Browse Source 
The timestamp supplied by the DV6 CPAP machine doesn't match events to the flow graph very well.
This change helps a little. Event flags may be before or after the event in the flow graph.
And, once in a long while, it's exactly right!
This commit is contained in:
Guy Scharf 2021-11-27 22:10:40 -07:00
parent a8a56dff02
commit 21fc564578
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
oscar/SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -2450,7 +2450,8 @@ bool load6EventData () {
qint64 duration = rec_ts2 - rec_ts1; qint64 duration = rec_ts2 - rec_ts1;
// We make an ad hoc adjustment to the start time so that the event lines up better with the flow graph // We make an ad hoc adjustment to the start time so that the event lines up better with the flow graph
// TODO: We don't know what is really going on here. Is it sloppiness on the part of the DV6 in recording time stamps? // TODO: We don't know what is really going on here. Is it sloppiness on the part of the DV6 in recording time stamps?
qint64 ti = qint64(rec_ts1 - (duration/2)) * 1000L; // qint64 ti = qint64(rec_ts1 - (duration/2)) * 1000L;
qint64 ti = qint64(rec_ts1 - duration) * 1000L;
if (duration < 0) { if (duration < 0) {
qDebug() << "E.BIN at" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") qDebug() << "E.BIN at" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss")
<< "reports duration of" << duration << "reports duration of" << duration
@ -2481,37 +2482,58 @@ bool load6EventData () {
break; break;
case 2: case 2:
OA->AddEvent(ti, duration); OA->AddEvent(ti, duration);
// qDebug() << "E.BIN - OA" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum(); #ifdef DEBUGDV6
qDebug() << "E.BIN - OA" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 4: case 4:
H->AddEvent(ti, duration); H->AddEvent(ti, duration);
#ifdef DEBUGDV6
qDebug() << "E.BIN - H" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 5: case 5:
RE->AddEvent(ti, duration); RE->AddEvent(ti, duration);
// qDebug() << "E.BIN - RERA" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum(); #ifdef DEBUGDV6
qDebug() << "E.BIN - RERA" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
break; break;
#endif
case 8: // snore case 8: // snore
SN->AddEvent(ti, duration); SN->AddEvent(ti, duration);
// qDebug() << "E.BIN - Snore" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum(); #ifdef DEBUGDV6
qDebug() << "E.BIN - Snore" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 9: // expiratory puff case 9: // expiratory puff
EP->AddEvent(ti, duration); EP->AddEvent(ti, duration);
// qDebug() << "E.BIN - exhale puff" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum(); #ifdef DEBUGDV6
qDebug() << "E.BIN - exhale puff" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 10: // flow limitation case 10: // flow limitation
FL->AddEvent(ti, duration); FL->AddEvent(ti, duration);
// qDebug() << "E.BIN - flow limit" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum(); #ifdef DEBUGDV6
qDebug() << "E.BIN - flow limit" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 11: // periodic breathing case 11: // periodic breathing
PB->AddEvent(ti, duration); PB->AddEvent(ti, duration);
#ifdef DEBUGDV6
qDebug() << "E.BIN - periodic breathing" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 12: // large leaks case 12: // large leaks
LL->AddEvent(ti, duration); LL->AddEvent(ti, duration);
// qDebug() << "E.BIN - large leak" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum(); #ifdef DEBUGDV6
qDebug() << "E.BIN - large leak" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
case 13: // pressure change case 13: // pressure change
break; break;
case 14: // start of session case 14: // start of session
#ifdef DEBUGDV6
qDebug() << "E.BIN - session start" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
#endif
break; break;
default: default:
break; break;