From 95981dc3a376256cb6b5825905f7f5f20d13003a Mon Sep 17 00:00:00 2001
From: LoudSnorer <just4me.1947@gmail.com>
Date: Sat, 18 Mar 2023 19:37:13 -0400
Subject: [PATCH] day one issue. Duplicate sessions start/end time listed in
 event tab when there are bookmark or notes. Also add debug info

---
 oscar/SleepLib/day.cpp                          |  3 +++
 oscar/SleepLib/importcontext.cpp                |  3 +++
 oscar/SleepLib/journal.cpp                      |  3 +++
 oscar/SleepLib/loader_plugins/resmed_loader.cpp |  2 +-
 oscar/SleepLib/machine.cpp                      |  4 +++-
 oscar/SleepLib/machine_loader.cpp               |  3 +++
 oscar/SleepLib/session.cpp                      |  3 +++
 oscar/daily.cpp                                 | 11 ++++++-----
 8 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index 0581d0b5..4e92622f 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -7,6 +7,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QMultiMap>
 
 #include <algorithm>
diff --git a/oscar/SleepLib/importcontext.cpp b/oscar/SleepLib/importcontext.cpp
index 3a4fc74f..f735ff03 100644
--- a/oscar/SleepLib/importcontext.cpp
+++ b/oscar/SleepLib/importcontext.cpp
@@ -6,6 +6,9 @@
 * License. See the file COPYING in the main directory of the source code
 * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QMessageBox>
 
diff --git a/oscar/SleepLib/journal.cpp b/oscar/SleepLib/journal.cpp
index eddae8fb..2d073f97 100644
--- a/oscar/SleepLib/journal.cpp
+++ b/oscar/SleepLib/journal.cpp
@@ -7,6 +7,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include "journal.h"
 #include "machine_common.h"
 #include <QDomDocument>
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index ab7a23e0..9517cf45 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -7,7 +7,7 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
-#define TEST_MACROS_ENABLED
+#define TEST_MACROS_ENABLEDoff
 #include <test_macros.h>
 
 #include <QApplication>
diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp
index e0f707b8..a6b9cc04 100644
--- a/oscar/SleepLib/machine.cpp
+++ b/oscar/SleepLib/machine.cpp
@@ -7,6 +7,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QDir>
 #include <QDebug>
@@ -414,7 +417,6 @@ bool Machine::AddSession(Session *s, bool allowOldSessions)
         dit = day.insert(date, profile->addDay(date));
     }
     dd = dit.value();
-
     dd->addSession(s);
 
     if (combine_next_day) {
diff --git a/oscar/SleepLib/machine_loader.cpp b/oscar/SleepLib/machine_loader.cpp
index 6682ea26..890db9ee 100644
--- a/oscar/SleepLib/machine_loader.cpp
+++ b/oscar/SleepLib/machine_loader.cpp
@@ -7,6 +7,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QApplication>
 #include <QFile>
 #include <QDir>
diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp
index 02fa20f1..8f498088 100644
--- a/oscar/SleepLib/session.cpp
+++ b/oscar/SleepLib/session.cpp
@@ -8,6 +8,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include "session.h"
 #include "version.h"
 #include <cmath>
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 2e9fa504..c7f1a14a 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -837,16 +837,17 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
         tree->insertTopLevelItem(cnt++ , start);
         tree->insertTopLevelItem(cnt++ , end);
         for (QList<Session *>::iterator s=day->begin(); s!=day->end(); ++s) {
-            QDateTime st = QDateTime::fromMSecsSinceEpoch((*s)->first()); // Localtime
-            QDateTime et = QDateTime::fromMSecsSinceEpoch((*s)->last()); // Localtime
+            Session* sess = *s;
+            if ( (sess->type() != MT_CPAP) && (sess->type() != MT_OXIMETER) && (sess->type() != MT_POSITION)) continue;
+            QDateTime st = QDateTime::fromMSecsSinceEpoch(sess->first()); // Localtime
+            QDateTime et = QDateTime::fromMSecsSinceEpoch(sess->last()); // Localtime
 
             QTreeWidgetItem * item = new QTreeWidgetItem(QStringList(st.toString("HH:mm:ss")));
-            item->setData(0,Qt::UserRole, (*s)->first());
+            item->setData(0,Qt::UserRole, sess->first());
             start->addChild(item);
 
-
             item = new QTreeWidgetItem(QStringList(et.toString("HH:mm:ss")));
-            item->setData(0,Qt::UserRole, (*s)->last());
+            item->setData(0,Qt::UserRole, sess->last());
             end->addChild(item);
         }
     }