PRS1 compliance duration stuff, cms50i deviceid fix

sleepyhead/Graphs/gSessionTimesChart.cpp

@@ -891,12 +891,17 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
                     // segments
                     for (int j=0; j<slize; ++j) {
                         const SessionSlice & slice = sess->m_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

sleepyhead/SleepLib/day.cpp

@@ -716,16 +716,28 @@ qint64 Day::total_time()
     QList<Session *>::iterator end = sessions.end();
     for (QList<Session *>::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 (slicesize == 0) {
-            if (last > first) {
+                // This algorithm relies on non zero length, and correctly ordered sessions
-                range.insert(first, 0);
+                if (last > first) {
-                range.insert(last, 1);
+                    range.insert(first, 0);
-                d_totaltime += sess.length();
+                    range.insert(last, 1);
+                    d_totaltime += sess.length();
+                }
+            } else {
+                for (int i=0; i<slicesize; ++i) {
+                    const SessionSlice & slice = sess.m_slices.at(i);
+                    if (slice.status == EquipmentOn) {
+                        range.insert(slice.start, 0);
+                        range.insert(slice.end, 1);
+                        d_totaltime += slice.end - slice.start;
+                    }
+                }
             }
         }
     }
@@ -777,16 +789,28 @@ qint64 Day::total_time(MachineType type)
     QList<Session *>::iterator end = sessions.end();
     for (QList<Session *>::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) {
+            if (slicesize == 0) {
-                range.insert(first, 0);
+                if (last > first) {
-                range.insert(last, 1);
+                    range.insert(first, 0);
-                d_totaltime += sess.length();
+                    range.insert(last, 1);
+                    d_totaltime += sess.length();
+                }
+            } else {
+                for (int i=0; i<slicesize; ++i) {
+                    const SessionSlice & slice = sess.m_slices.at(i);
+                    if (slice.status == EquipmentOn) {
+                        range.insert(slice.start, 0);
+                        range.insert(slice.end, 1);
+                        d_totaltime += slice.end - slice.start;
+                    }
+                }
             }
         }
     }

sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp

@@ -647,7 +647,7 @@ void CMS50F37Loader::setDeviceID(QString str)
         cmd[i+2] = ba.at(i) | 0x80;
     }
 
-    cmd[1] = msb & 0x80;
+    cmd[1] = msb | 0x80;
 
     QString out;
     for (int i=0; i < 9; ++i) out += QString().sprintf("%02X ",cmd[i]);

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -1172,7 +1172,8 @@ bool PRS1Import::ParseCompliance()
 
     session->settings[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

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

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; i<size; ++i) {
+//                const SessionSlice & slice = m_slices.at(i);
+//                if (slice.status == EquipmentOn) {
+//                    t += slice.end - slice.start;
+//                }
+//            }
+//        }
+
+//        return t;
     }
 
     //! \brief Set this Sessions ID (Not does not update indexes)
@@ -157,7 +172,19 @@ class Session
 
     //! \brief Return Session Length in decimal hours
     double hours() {
-        double t = (s_last - s_first) / 3600000.0;
+        double t;
+        int size = m_slices.size();
+        if (size == 0) {
+            t = (s_last - s_first) / 3600000.0;
+        } else {
+            t = 0;
+            for (int i=0; i<size; ++i) {
+                const SessionSlice & slice = m_slices.at(i);
+                if (slice.status == EquipmentOn) {
+                    t += slice.end - slice.start;
+                }
+            }
+        }
         return t;
     }
 

sleepyhead/oximeterimport.cpp

@@ -669,6 +669,7 @@ void OximeterImport::updateLiveDisplay()
         liveView->redraw();
     }
 
+    if (!oximodule->oxirec) return;
     int size = oximodule->oxirec->size();
 
     if (size > 0) {