working on missing graph

oscar/SleepLib/loader_plugins/resmed_loader.cpp

@@ -2856,6 +2856,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
     time.start();
 #endif
     QString filename = path.section(-2, -1);
+    qDebug() << "LoadPLD opening" << filename.section("/", -2, -1);
     ResMedEDFInfo edf;
     if ( ! edf.Open(path) ) {
         qDebug() << "LoadPLD failed to open" << filename.section("/", -2, -1);
@@ -2895,6 +2896,10 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
     bool found_Ti_code = false;
     bool found_Te_code = false;
 
+    QDateTime sessionStartDT = QDateTime:: fromMSecsSinceEpoch(sess->first());
+    bool forceDebug = (sessionStartDT > QDateTime::fromString("2021-02-26 12:00:00", "yyyy-MM-dd HH:mm:ss")) &&
+                        (sessionStartDT < QDateTime::fromString("2021-02-27 12:00:00", "yyyy-MM-dd HH:mm:ss"));
+
     for (auto & es : edf.edfsignals) {
         a = nullptr;
         recs = es.sampleCnt * edf.GetNumDataRecords();
@@ -2905,6 +2910,9 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
         rate = double(duration) / double(recs);
 
         //qDebug() << "EVE:" << es.digital_maximum << es.digital_minimum << es.physical_maximum << es.physical_minimum << es.gain;
+        if (forceDebug) {
+            qDebug() << "Session" << sessionStartDT.toString() << filename.section("/", -2, -1) << "signal" << es.label;
+        }
         if (matchSignal(CPAP_Snore, es.label)) {
             code = CPAP_Snore;
             ToTimeDelta(sess, edf, es, code, recs, duration, 0, 0);
@@ -3058,7 +3066,7 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
     int startpos = 0;
 
     if ((code == CPAP_Pressure) || (code == CPAP_IPAP) || (code == CPAP_EPAP)) {
-        startpos = 20; // Shave the first 20 seconds of pressure data
+        startpos = 20; // Shave the first 40 seconds of pressure data
         tt += rate * startpos;
     }
 
@@ -3071,46 +3079,46 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
     EventList *el = nullptr;
 
     if (recs > startpos + 1) {
-
         // Prime last with a good starting value
         do {
             last = *sptr++;
             tmp = EventDataType(last) * es.gain;
-
             if ((tmp >= t_min) && (tmp <= t_max)) {
                 min = tmp;
                 max = tmp;
                 el = sess->AddEventList(code, EVL_Event, es.gain, es.offset, 0, 0);
-
                 el->AddEvent(tt, last);
+                qDebug() << "New EventList:" << QString::number(code, 16) << QDateTime::fromMSecsSinceEpoch(tt).toString();
                 tt += rate;
-
                 break;
             }
             tt += rate;
         } while (sptr < eptr);
 
-        if (!el)
+        if ( ! el) {
+            qWarning() << "No eventList for" << QDateTime::fromMSecsSinceEpoch(sess->first()).toString() << "code (hex)"
+                            << QString::number(code, 16);
+#ifdef DEBUG_EFFICIENCY
+            timeMutex.lock();
+            timeInTimeDelta += time.elapsed();
+            timeMutex.unlock();
+#endif
             return;
+        }
 
         for (; sptr < eptr; sptr++) {
             c = *sptr;
-
             if (last != c) {
                 if (square) {
                     buildEventList( last, t_min, t_max, es, &min, &max, tt, el, sess, code );
                 }
-
                 buildEventList( c, t_min, t_max, es, &min, &max, tt, el, sess, code );
             }
-
             tt += rate;
-
             last = c;
         }
 
         tmp = EventDataType(c) * es.gain;
-
         if ((tmp >= t_min) && (tmp <= t_max))
             el->AddEvent(tt, c);
 
@@ -3119,6 +3127,10 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
         sess->setPhysMin(code, es.physical_minimum);
         sess->setPhysMax(code, es.physical_maximum);
         sess->updateLast(tt);
+        qDebug() << "EventList:" << QString::number(code, 16) << QDateTime::fromMSecsSinceEpoch(tt).toString() << "Size" << el->count();
+    } else {
+        qDebug() << "not enough records for EventList" << QDateTime::fromMSecsSinceEpoch(sess->first()).toString() << "code"
+                            << QString::number(code, 16);
     }
 
 #ifdef DEBUG_EFFICIENCY

oscar/SleepLib/session.cpp

@@ -119,7 +119,9 @@ bool Session::OpenEvents()
 
 
     QString filename = eventFile();
+#ifdef DEBUG_EVENTS
     qDebug() << "Loading" << s_machine->loaderName().toLocal8Bit().data() << "Events:" << filename.toLocal8Bit().data();
+#endif
     bool b = LoadEvents(filename);
 
     if ( ! b) {
@@ -816,7 +818,7 @@ bool Session::LoadEvents(QString filename)
 
     QFile file(filename);
 
-    if (!file.open(QIODevice::ReadOnly)) {
+    if ( ! file.open(QIODevice::ReadOnly)) {
 //        qDebug() << "No Event/Waveform data available for" << s_session;
         qWarning() << "No Event/Waveform data available for" << s_session << "filename" << filename << "error code" << file.error() << file.errorString();
         return false;
@@ -836,6 +838,10 @@ bool Session::LoadEvents(QString filename)
     header >> s_first;          //(qint64)
     header >> s_last;           //(qint64)
 
+#ifdef DEBUG_EVENTS
+    qDebug() << "Session ID" << sessid << "Start Time" << QDateTime::fromMSecsSinceEpoch(s_first);
+#endif
+
     if (type != filetype_data) {
         qDebug() << "Wrong File Type in " << filename;
         return false;
@@ -893,6 +899,9 @@ bool Session::LoadEvents(QString filename)
 
     qint16 mcsize;
     in >> mcsize;   // number of Machine Code lists
+#ifdef DEBUG_EVENTS
+    qDebug() << "Number of Channels" << mcsize;
+#endif
 
     ChannelID code;
     qint64 ts1, ts2;
@@ -916,10 +925,17 @@ bool Session::LoadEvents(QString filename)
         mcorder.push_back(code);
         in >> size2;
         sizevec.push_back(size2);
+#ifdef DEBUG_EVENTS
+        qDebug() << "For Channel (hex)" << QString::number(code, 16) << "there are" << size2 << "EventLists";
+#endif
 
         for (int j = 0; j < size2; j++) {
             in >> ts1;
             in >> ts2;
+#ifdef DEBUG_EVENTS
+            qDebug() << "Start:" << QDateTime::fromMSecsSinceEpoch(ts1).toString() <<
+                        "Finish:" << QDateTime::fromMSecsSinceEpoch(ts2).toString();
+#endif
             in >> evcount;
             in >> t8;
             elt = (EventListType)t8;
@@ -953,7 +969,7 @@ bool Session::LoadEvents(QString filename)
         }
     }
 
-    //EventStoreType t;
+    //EventStoreType t;     // qint16
     //quint32 x;
 
     for (int i = 0; i < mcsize; i++) {
@@ -970,6 +986,7 @@ bool Session::LoadEvents(QString filename)
             in.readRawData((char *)ptr, evec.m_count << 1);
 
             //*** Don't delete these comments ***
+            //*** They explain what the above ReadRawData is doing!
             //            for (quint32 c=0;c<evec.m_count;c++) {
             //                in >> t;
             //                *ptr++=t;
@@ -980,6 +997,7 @@ bool Session::LoadEvents(QString filename)
 
                 in.readRawData((char *)ptr, evec.m_count << 1);
                 //*** Don't delete these comments ***
+                //*** They explain what the above ReadRawData is doing!
                 //                for (quint32 c=0;c<evec.m_count;c++) {
                 //                    in >> t;
                 //                    *ptr++=t;
@@ -1045,7 +1063,10 @@ void Session::updateCountSummary(ChannelID code)
 {
     QHash<ChannelID, QVector<EventList *> >::iterator ev = eventlist.find(code);
 
-    if (ev == eventlist.end()) { return; }
+    if (ev == eventlist.end()) { 
+        qDebug() << "No events for channel (hex)" << QString::number(code, 16);
+        return;
+    }
 
     QHash<ChannelID, QHash<EventStoreType, EventStoreType> >::iterator vs = m_valuesummary.find(code);
 
@@ -1118,7 +1139,10 @@ void Session::updateCountSummary(ChannelID code)
         }
     }
 
-    if (valsum.size() == 0) { return; }
+    if (valsum.size() == 0) { 
+        qDebug() << "No valuesummary for channel (hex)" << QString::number(code, 16);
+        return;
+    }
 
     m_valuesummary[code] = valsum;
     m_timesummary[code] = timesum;
@@ -1517,7 +1541,9 @@ bool Session::channelDataExists(ChannelID id)
 }
 bool Session::channelExists(ChannelID id)
 {
-    if (!enabled()) { return false; }
+    if ( ! enabled()) { 
+        return false;
+    }
 
     if (s_events_loaded) {
         QHash<ChannelID, QVector<EventList *> >::iterator j = eventlist.find(id);
@@ -1532,7 +1558,9 @@ bool Session::channelExists(ChannelID id)
             return false;
         }
 
-        if (q.value() == 0) { return false; }
+        if (q.value() == 0) { 
+            return false;
+        }
     }
 
     return true;