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

Conditionalize debug output with DEBUG_SESSION and DEBUG_IDENT

Browse Source
This commit is contained in:
Phil Olynyk 2019-12-30 11:14:05 -05:00
parent 031989e300
commit ccba19b3d2
2 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,11 +319,13 @@ int ResmedLoader::Open(const QString & dirpath)
if ( ! parseIdentTGT(path, & info, idmap) ) if ( ! parseIdentTGT(path, & info, idmap) )
return -1; return -1;
#ifdef DEBUG_IDENT
qDebug() << "Info:" << info.series << info.model << info.modelnumber << info.serial; qDebug() << "Info:" << info.series << info.model << info.modelnumber << info.serial;
qDebug() << "IdMap size:" << idmap.size(); qDebug() << "IdMap size:" << idmap.size();
foreach ( QString st , idmap.keys() ) { foreach ( QString st , idmap.keys() ) {
qDebug() << "Key" << st << "Value" << idmap[st]; qDebug() << "Key" << st << "Value" << idmap[st];
} }
#endif
// Abort if no serial number // Abort if no serial number
if (info.serial.isEmpty()) { if (info.serial.isEmpty()) {
@ -1524,7 +1526,7 @@ EDFType lookupEDFType(const QString & filename)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
EDFduration getEDFDuration(const QString & filename) EDFduration getEDFDuration(const QString & filename)
{ {
qDebug() << "getEDFDuration called for" << filename; // qDebug() << "getEDFDuration called for" << filename;
QString ext = filename.section("_", -1).section(".",0,0).toUpper(); QString ext = filename.section("_", -1).section(".",0,0).toUpper();
@ -1840,8 +1842,9 @@ void ResDayTask::run()
} }
// Summary only day, create sessions for each mask-on/off pair and tag them summary only // Summary only day, create sessions for each mask-on/off pair and tag them summary only
STRRecord & R = resday->str; STRRecord & R = resday->str;
#ifdef SESSION_DEBUG
qDebug() << "Creating summary-only sessions for" << resday->date; qDebug() << "Creating summary-only sessions for" << resday->date;
#endif
for (int i=0;i<resday->str.maskon.size();++i) { for (int i=0;i<resday->str.maskon.size();++i) {
quint32 maskon = resday->str.maskon[i]; quint32 maskon = resday->str.maskon[i];
quint32 maskoff = resday->str.maskoff[i]; quint32 maskoff = resday->str.maskoff[i];
@ -1870,7 +1873,7 @@ void ResDayTask::run()
// files list containing unsorted EDF files that match this day // files list containing unsorted EDF files that match this day
// guaranteed no sessions for this day for this machine. // guaranteed no sessions for this day for this machine.
// Need to overlap check sessions // Need to check overlapping files in session candidates
QList<OverlappingEDF> overlaps; QList<OverlappingEDF> overlaps;
@ -1899,7 +1902,7 @@ void ResDayTask::run()
QDateTime filetime = QDateTime().fromString(datestr,"yyyyMMdd_HHmmss"); QDateTime filetime = QDateTime().fromString(datestr,"yyyyMMdd_HHmmss");
quint32 filetime_t = filetime.toTime_t(); quint32 filetime_t = filetime.toTime_t();
if (type == EDF_EVE) { if (type == EDF_EVE) { // skip the EVE and CSL files, b/c they often cover all sessions
EVElist[filetime_t] = filename; EVElist[filetime_t] = filename;
continue; continue;
} else if (type == EDF_CSL) { } else if (type == EDF_CSL) {
@ -1920,30 +1923,41 @@ void ResDayTask::run()
OverlappingEDF & ovr = overlaps[i]; OverlappingEDF & ovr = overlaps[i];
if ((ovr.start < dur.end) && (dur.start < ovr.end)) { if ((ovr.start < dur.end) && (dur.start < ovr.end)) {
ovr.filemap.insert(filetime_t, filename); ovr.filemap.insert(filetime_t, filename);
// Expand ovr's scope
//ovr.start = min(ovr.start, dur.start);
//ovr.end = max(ovr.end, dur.end);
added = true; added = true;
qDebug() << "Adding" << filename << "to session" << i; #ifdef SESSION_DEBUG
qDebug() << "Starts:" << ovr.start << dur.start << "ends:" << ovr.end << dur.end; qDebug() << "Adding" << filename << "to overlap" << i;
qDebug() << "Overlap starts:" << ovr.start << "ends:" << ovr.end;
qDebug() << "File time starts:" << dur.start << "ends:" << dur.end;
#endif
// Expand ovr's scope -- I think this is necessary!! (PO)
// YES! when the STR file is missing, there are no mask on/off entries
// and the edf files are not always created at the same time
ovr.start = min(ovr.start, dur.start);
ovr.end = max(ovr.end, dur.end);
// if ( (dur.start < ovr.start) || (dur.end > ovr.end) )
// qDebug() << "Should have expanded overlap" << i << "for" << filename;
break; break;
} }
} } // end for walk existing overlap entries
if ( ! added ) { if ( ! added ) {
if (dur.start != dur.end) { // Couldn't fit it in anywhere, create a new Overlap entry/session if (dur.start != dur.end) { // Didn't fit it in anywhere, create a new Overlap entry/session
OverlappingEDF ov; OverlappingEDF ov;
ov.start = dur.start; ov.start = dur.start;
ov.end = dur.end; ov.end = dur.end;
ov.filemap.insert(filetime_t, filename); ov.filemap.insert(filetime_t, filename);
qDebug() << "Creating session for" << filename; #ifdef SESSION_DEBUG
qDebug() << "Creating session for" << filename;
qDebug() << "Starts:" << dur.start << "Ends:" << dur.end; qDebug() << "Starts:" << dur.start << "Ends:" << dur.end;
overlaps.append(ov); #endif
overlaps.append(ov);
} else { } else {
#ifdef SESSION_DEBUG
qDebug() << "Skipping zero duration file" << filename; qDebug() << "Skipping zero duration file" << filename;
#endif
} }
} } // end create a new overlap entry
} } // end check for file overlap
} } // end for walk resday files list
// Create an ordered map and see how far apart the sessions really are. // Create an ordered map and see how far apart the sessions really are.
QMap<quint32, OverlappingEDF> mapov; QMap<quint32, OverlappingEDF> mapov;
@ -1951,19 +1965,20 @@ void ResDayTask::run()
mapov[ovr.start] = ovr; mapov[ovr.start] = ovr;
} }
// Examine the gaps in between to see if we should merge sessions // We are not going to merge close sessions - gaps can be useful markers for users
for (auto oit=mapov.begin(), oend=mapov.end(); oit != oend; ++oit) { // // Examine the gaps in between to see if we should merge sessions
// Get next in line // for (auto oit=mapov.begin(), oend=mapov.end(); oit != oend; ++oit) {
auto next_oit = oit+1; // // Get next in line
if (next_oit != mapov.end()) { // auto next_oit = oit+1;
OverlappingEDF & A = oit.value(); // if (next_oit != mapov.end()) {
OverlappingEDF & B = next_oit.value(); // OverlappingEDF & A = oit.value();
int gap = B.start - A.end; // OverlappingEDF & B = next_oit.value();
if (gap < 60) { // TODO see if we should use the prefs value here... ??? // int gap = B.start - A.end;
// qDebug() << "Only a" << gap << "s sgap between ResMed sessions on" << resday->date.toString(); // if (gap < 60) { // TODO see if we should use the prefs value here... ???
} // // qDebug() << "Only a" << gap << "s sgap between ResMed sessions on" << resday->date.toString();
} // }
} // }
// }
if (overlaps.size()==0) if (overlaps.size()==0)
return; return;
@ -2045,8 +2060,9 @@ void ResDayTask::run()
} else { } else {
// No corresponding STR.edf record, but we have EDF files // No corresponding STR.edf record, but we have EDF files
#ifdef SESSION_DEBUG
qDebug() << "EDF files without STR record" << resday->date.toString(); qDebug() << "EDF files without STR record" << resday->date.toString();
#endif
bool foundprev = false; bool foundprev = false;
loader->sessionMutex.lock(); loader->sessionMutex.lock();
@ -2083,8 +2099,10 @@ void ResDayTask::run()
} }
sess->UpdateSummaries(); sess->UpdateSummaries();
#ifdef SESSION_DEBUG
qDebug() << "Adding session" << sess->session() qDebug() << "Adding session" << sess->session()
<< "["+QDateTime::fromTime_t(sess->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"; << "["+QDateTime::fromTime_t(sess->session()).toString("MMM dd, yyyy hh:mm:ss")+"]";
#endif
// Save is not threadsafe? (meh... it seems to be) // Save is not threadsafe? (meh... it seems to be)
// loader->saveMutex.lock(); // loader->saveMutex.lock();

4
oscar/SleepLib/session.h
View File

@ -12,7 +12,9 @@
#ifndef SESSION_H #ifndef SESSION_H
#define SESSION_H #define SESSION_H
#define SESSION_DEBUG // this is added as DEFINES += SESSION_DEBUG in the Qmake line
// to see how the Resmed loader assigns files to sessions
// #define SESSION_DEBUG
#include <QDebug> #include <QDebug>
#include <QHash> #include <QHash>