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

day one issue. Duplicate sessions start/end time listed in event tab when there are bookmark or notes. Also add debug info

Browse Source
This commit is contained in:
LoudSnorer 2023-03-18 19:37:13 -04:00
parent d1504bb644
commit 95981dc3a3
8 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oscar/SleepLib/day.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QMultiMap> #include <QMultiMap>
#include <algorithm> #include <algorithm>

3
oscar/SleepLib/importcontext.cpp
View File

@ -6,6 +6,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QApplication> #include <QApplication>
#include <QMessageBox> #include <QMessageBox>

3
oscar/SleepLib/journal.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include "journal.h" #include "journal.h"
#include "machine_common.h" #include "machine_common.h"
#include <QDomDocument> #include <QDomDocument>

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

@ -7,7 +7,7 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLED #define TEST_MACROS_ENABLEDoff
#include <test_macros.h> #include <test_macros.h>
#include <QApplication> #include <QApplication>

4
oscar/SleepLib/machine.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
@ -414,7 +417,6 @@ bool Machine::AddSession(Session *s, bool allowOldSessions)
dit = day.insert(date, profile->addDay(date)); dit = day.insert(date, profile->addDay(date));
} }
dd = dit.value(); dd = dit.value();
dd->addSession(s); dd->addSession(s);
if (combine_next_day) { if (combine_next_day) {

3
oscar/SleepLib/machine_loader.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QApplication> #include <QApplication>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>

3
oscar/SleepLib/session.cpp
View File

@ -8,6 +8,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include "session.h" #include "session.h"
#include "version.h" #include "version.h"
#include <cmath> #include <cmath>

11
oscar/daily.cpp
View File

@ -837,16 +837,17 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
tree->insertTopLevelItem(cnt++ , start); tree->insertTopLevelItem(cnt++ , start);
tree->insertTopLevelItem(cnt++ , end); tree->insertTopLevelItem(cnt++ , end);
for (QList<Session *>::iterator s=day->begin(); s!=day->end(); ++s) { for (QList<Session *>::iterator s=day->begin(); s!=day->end(); ++s) {
QDateTime st = QDateTime::fromMSecsSinceEpoch((*s)->first()); // Localtime Session* sess = *s;
QDateTime et = QDateTime::fromMSecsSinceEpoch((*s)->last()); // Localtime 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"))); 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); start->addChild(item);
item = new QTreeWidgetItem(QStringList(et.toString("HH:mm:ss"))); 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); end->addChild(item);
} }
} }