From 21fc5645787c5b457cb79148046f98d800a64990 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sat, 27 Nov 2021 22:10:40 -0700
Subject: [PATCH] Improve event flag positioning slightly. 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!

---
 .../loader_plugins/intellipap_loader.cpp      | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
index 4fbc65e7..f155be8a 100644
--- a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
@@ -2450,7 +2450,8 @@ bool load6EventData () {
             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
             // 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) {
                 qDebug() << "E.BIN at" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss")
                          << "reports duration of" << duration
@@ -2481,37 +2482,58 @@ bool load6EventData () {
                     break;
                 case 2:
                     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;
                 case 4:
                     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;
                 case 5:
                     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;
+#endif
                 case 8:     // snore
                     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;
                 case 9:     // expiratory puff
                     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;
                 case 10:    // flow limitation
                     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;
                 case 11:    // periodic breathing
                     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;
                 case 12:    // large leaks
                     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;
                 case 13:    // pressure change
                     break;
                 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;
                 default:
                     break;