From fd50d817980c77791ae3e2215b7daa872a7a5d45 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 19 Sep 2014 00:31:31 +1000 Subject: [PATCH] PRS1 compliance duration stuff, cms50i deviceid fix --- sleepyhead/Graphs/gSessionTimesChart.cpp | 9 +++- sleepyhead/SleepLib/day.cpp | 42 +++++++++++++++---- .../loader_plugins/cms50f37_loader.cpp | 2 +- .../SleepLib/loader_plugins/prs1_loader.cpp | 3 +- sleepyhead/SleepLib/session.cpp | 30 ++++++++++++- sleepyhead/SleepLib/session.h | 29 ++++++++++++- sleepyhead/oximeterimport.cpp | 1 + 7 files changed, 101 insertions(+), 15 deletions(-) diff --git a/sleepyhead/Graphs/gSessionTimesChart.cpp b/sleepyhead/Graphs/gSessionTimesChart.cpp index 0cc5d003..d5a00d70 100644 --- a/sleepyhead/Graphs/gSessionTimesChart.cpp +++ b/sleepyhead/Graphs/gSessionTimesChart.cpp @@ -891,12 +891,17 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion & // segments for (int j=0; jm_slices.at(j); - float s1 = float(splittime.secsTo(QDateTime::fromMSecsSinceEpoch(slice.start))) / 3600.0; + QDateTime st = QDateTime::fromMSecsSinceEpoch(slice.start); + + float s1 = float(splittime.secsTo(st)) / 3600.0; float s2 = double(slice.end - slice.start) / 3600000.0; QColor col = (slice.status == EquipmentOn) ? goodcolor : Qt::black; - slices.append(SummaryChartSlice(&calcitems[0], s1, s2, (slice.status == EquipmentOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off"), col)); + QString txt = QObject::tr("%1\nLength:%3\nStart:%2\n").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2); + + txt += (slice.status == EquipmentOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off"); + slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, col)); } } else { // otherwise just show session duration diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp index cc6e29b2..7effcf8f 100644 --- a/sleepyhead/SleepLib/day.cpp +++ b/sleepyhead/SleepLib/day.cpp @@ -716,16 +716,28 @@ qint64 Day::total_time() QList::iterator end = sessions.end(); for (QList::iterator it = sessions.begin(); it != end; ++it) { Session &sess = *(*it); + int slicesize = sess.m_slices.size(); if (sess.enabled() && (sess.type() != MT_JOURNAL)) { first = sess.first(); last = sess.last(); - // This algorithm relies on non zero length, and correctly ordered sessions - if (last > first) { - range.insert(first, 0); - range.insert(last, 1); - d_totaltime += sess.length(); + if (slicesize == 0) { + // This algorithm relies on non zero length, and correctly ordered sessions + if (last > first) { + range.insert(first, 0); + range.insert(last, 1); + d_totaltime += sess.length(); + } + } else { + for (int i=0; i::iterator end = sessions.end(); for (QList::iterator it = sessions.begin(); it != end; ++it) { Session &sess = *(*it); + int slicesize = sess.m_slices.size(); if ((sess.type() == type) && sess.enabled()) { first = sess.first(); last = sess.last(); // This algorithm relies on non zero length, and correctly ordered sessions - if (last > first) { - range.insert(first, 0); - range.insert(last, 1); - d_totaltime += sess.length(); + if (slicesize == 0) { + if (last > first) { + range.insert(first, 0); + range.insert(last, 1); + d_totaltime += sess.length(); + } + } else { + for (int i=0; isettings[PRS1_FlexMode] = (int)flexmode; session->settings[PRS1_FlexLevel] = (int)flexlevel; - session->settings[CPAP_SummaryOnly] = true; + session->setSummaryOnly(true); + //session->settings[CPAP_SummaryOnly] = true; session->settings[PRS1_HumidStatus] = (bool)(data[0x0A] & 0x80); // Humidifier Connected session->settings[PRS1_HumidLevel] = (int)(data[0x0A] & 7); // Humidifier Value diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 007e3d45..7266cfb3 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -23,7 +23,7 @@ using namespace std; // This is the uber important database version for SleepyHeads internal storage // Increment this after stuffing with Session's save & load code. -const quint16 summary_version = 15; +const quint16 summary_version = 16; const quint16 events_version = 10; Session::Session(Machine *m, SessionID session) @@ -215,6 +215,7 @@ QDataStream & operator>>(QDataStream & in, Session & session) return in; } + void Session::LoadSummaryData(QDataStream & in) { quint16 version; @@ -260,6 +261,27 @@ void Session::LoadSummaryData(QDataStream & in) s_enabled = 1; } +QDataStream & operator>>(QDataStream & in, SessionSlice & slice) +{ + in >> slice.start; + quint32 length; + in >> length; + slice.end = slice.start + length; + + quint16 i; + in >> i; + slice.status = (SliceStatus)i; + return in; +} +QDataStream & operator<<(QDataStream & out, const SessionSlice & slice) +{ + out << slice.start; + quint32 length = slice.end - slice.start; + out << length; + out << (quint16)slice.status; + return out; +} + bool Session::StoreSummary() { QString filename = s_machine->getSummariesPath() + QString().sprintf("%08lx.000", s_session); @@ -324,6 +346,8 @@ bool Session::StoreSummary() out << s_summaryOnly; // 13 -> + out << m_slices; + file.close(); return true; } @@ -568,6 +592,10 @@ bool Session::LoadSummary() } else if (version > 13) { in >> s_summaryOnly; } + + if (version >= 16) { + in >> m_slices; + } } // not really a good idea to do this... should flag and do a reindex diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h index 2d6171f2..e1d24c1b 100644 --- a/sleepyhead/SleepLib/session.h +++ b/sleepyhead/SleepLib/session.h @@ -125,6 +125,21 @@ class Session //! \brief Return the millisecond length of this session qint64 length() { return s_last - s_first; +// qint64 t; +// int size = m_slices.size(); +// if (size == 0) { +// t = (s_last - s_first); +// } else { +// t = 0; +// for (int i=0; iredraw(); } + if (!oximodule->oxirec) return; int size = oximodule->oxirec->size(); if (size > 0) {