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

Clean up some debug messages

Browse Source
This commit is contained in:
Phil Olynyk 2019-09-25 07:25:44 -04:00
parent 6896bfd50b
commit 6d338ac88f
2 changed files with 61 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,13 +224,13 @@ void ResmedLoader::ParseSTR(Machine *mach, QMap<QDate, STRFile> & STRmap, QDate
continue; continue;
} }
rit = resdayList.insert(date, ResMedDay()); rit = resdayList.insert(date, ResMedDay(date));
// qDebug() << "Setting up STRRecord for" << date.toString(); // qDebug() << "Setting up STRRecord for" << date.toString();
// sleep(1); // sleep(1);
STRRecord &R = rit.value().str; STRRecord &R = rit.value().str;
uint timestamp = QDateTime(date,QTime(12,0,0)).toTime_t(); uint noonstamp = QDateTime(date,QTime(12,0,0)).toTime_t();
R.date = date; R.date = date;
// skipday = false; // skipday = false;
@ -241,19 +241,19 @@ void ResmedLoader::ParseSTR(Machine *mach, QMap<QDate, STRFile> & STRmap, QDate
R.maskon.resize(maskon->sampleCnt); R.maskon.resize(maskon->sampleCnt);
R.maskoff.resize(maskoff->sampleCnt); R.maskoff.resize(maskoff->sampleCnt);
for (int s = 0; s < maskon->sampleCnt; ++s) { for (int s = 0; s < maskon->sampleCnt; ++s) {
qint32 on = maskon->dataArray[recstart + s]; qint32 on = maskon->dataArray[recstart + s]; // these on/off times are minutes since noon
qint32 off = maskoff->dataArray[recstart + s]; qint32 off = maskoff->dataArray[recstart + s];
R.maskon[s] = (on>0) ? (timestamp + (on * 60)) : 0; R.maskon[s] = (on>0) ? (noonstamp + (on * 60)) : 0; // convert them to seconds since midnight
R.maskoff[s] = (off>0) ? (timestamp + (off * 60)) : 0; R.maskoff[s] = (off>0) ? (noonstamp + (off * 60)) : 0;
} }
// two conditions that need dealing with, mask running at noon start, and finishing at noon start.. // two conditions that need dealing with, mask running at noon start, and finishing at noon start..
// (Sessions are forcibly split by resmed.. why the heck don't they store it that way???) // (Sessions are forcibly split by resmed.. why the heck don't they store it that way???)
if ((R.maskon[0]==0) && (R.maskoff[0]>0)) { if ((R.maskon[0]==0) && (R.maskoff[0]>0)) {
R.maskon[0] = timestamp; R.maskon[0] = noonstamp;
} } // TODO This should be last non-zero sample, not the last sample in the array
if ((R.maskon[maskon->sampleCnt-1] > 0) && (R.maskoff[maskoff->sampleCnt-1] == 0)) { if ((R.maskon[maskon->sampleCnt-1] > 0) && (R.maskoff[maskoff->sampleCnt-1] == 0)) {
R.maskoff[maskoff->sampleCnt-1] = QDateTime(date,QTime(12,0,0)).addDays(1).toTime_t() - 1; R.maskoff[maskoff->sampleCnt-1] = QDateTime(date,QTime(12,0,0)).addDays(1).toTime_t() - 1;
} }
@ -1123,7 +1123,7 @@ int ResmedLoader::scanFiles(Machine * mach, const QString & datalog_path, QDate
// Find or create ResMedDay object for this date // Find or create ResMedDay object for this date
auto rd = resdayList.find(date); auto rd = resdayList.find(date);
if (rd == resdayList.end()) { if (rd == resdayList.end()) {
rd = resdayList.insert(date, ResMedDay()); rd = resdayList.insert(date, ResMedDay(date));
rd.value().date = date; rd.value().date = date;
// We have data files without STR.edf record... the user MAY be planning on importing from another backup // We have data files without STR.edf record... the user MAY be planning on importing from another backup
@ -1332,7 +1332,7 @@ void StoreSettings(Session * sess, STRRecord & R)
struct OverlappingEDF { struct OverlappingEDF {
quint32 start; quint32 start;
quint32 end; quint32 end;
QMultiMap<quint32, QString> filemap; QMultiMap<quint32, QString> filemap; // key is start time, value is filename
Session * sess; Session * sess;
}; };
@ -1341,41 +1341,15 @@ void ResDayTask::run()
// if (this->resday->date == QDate(2016,1,6)) { // if (this->resday->date == QDate(2016,1,6)) {
// qDebug() << "in resday" << this->resday->date; // qDebug() << "in resday" << this->resday->date;
// } // }
/************************************************** if (resday->files.size() == 0) { // No EDF files???
// loader->sessionMutex.lock(); if ( ! resday->str.date.isValid()) {
// Day *day = p_profile->FindDay(resday->date, MT_CPAP);
// if (day) {
// if (day->summaryOnly(mach)) {
// if (resday->files.size() == 0) {
// // Summary only, and no new data files detected so we are done.
// loader->sessionMutex.unlock();
// return;
// }
// QList<Session *> sessions = day->getSessions(MT_CPAP);
//
// // Delete sessions for this day so they recreate with a clean slate.
// for (int i=0;i<sessions.size();++i) {
// Session * sess = sessions[i];
// day->removeSession(sess);
// delete sess;
// }
//
// } else {
// loader->sessionMutex.unlock();
// return;
// }
// }
// loader->sessionMutex.unlock();
****************************************************/
if (resday->files.size() == 0) {
if (!resday->str.date.isValid()) {
// No STR or files???
// This condition should be impossible, but just in case something gets fudged up elsewhere later // This condition should be impossible, but just in case something gets fudged up elsewhere later
qDebug() << "No edf files in resday, and the str date is inValid"; qDebug() << "No edf files in resday" << resday->date << "and the str date is inValid";
return; return;
} }
// Summary only day, create one session and tag it 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;
qDebug() << "Creating summary-only sessions for" << resday->date;
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];
@ -1384,10 +1358,8 @@ void ResDayTask::run()
Session * sess = new Session(mach, maskon); Session * sess = new Session(mach, maskon);
sess->set_first(quint64(maskon) * 1000L); sess->set_first(quint64(maskon) * 1000L);
sess->set_last(quint64(maskoff) * 1000L); sess->set_last(quint64(maskoff) * 1000L);
// Process the STR.edf settings StoreSettings(sess, R); // Process the STR.edf settings
StoreSettings(sess, R); StoreSummarySettings(sess, R); // We want the summary information too
// We want the summary information too otherwise we've got nothing.
StoreSummarySettings(sess, R);
sess->setSummaryOnly(true); sess->setSummaryOnly(true);
sess->SetChanged(true); sess->SetChanged(true);
@ -1397,11 +1369,8 @@ void ResDayTask::run()
mach->AddSession(sess); mach->AddSession(sess);
loader->sessionCount++; loader->sessionCount++;
loader->sessionMutex.unlock(); loader->sessionMutex.unlock();
//sess->TrashEvents();
} }
} }
return; return;
} }
@ -1416,7 +1385,6 @@ void ResDayTask::run()
int maskevents = resday->str.maskon.size(); int maskevents = resday->str.maskon.size();
if (resday->str.date.isValid()) { if (resday->str.date.isValid()) {
//First populate Overlaps with Mask ON/OFF events //First populate Overlaps with Mask ON/OFF events
for (int i=0; i < maskevents; ++i) { for (int i=0; i < maskevents; ++i) {
if ((resday->str.maskon[i]>0) || (resday->str.maskoff[i]>0)) { if ((resday->str.maskon[i]>0) || (resday->str.maskoff[i]>0)) {
@ -1430,54 +1398,58 @@ void ResDayTask::run()
} }
QMap<quint32, QString> EVElist, CSLlist; QMap<quint32, QString> EVElist, CSLlist;
for (auto f_itr=resday->files.begin(), fend=resday->files.end(); f_itr!=fend; ++f_itr) {
for (auto fit=resday->files.begin(), fend=resday->files.end(); fit!=fend; ++fit) { const QString & filename = f_itr.key();
const QString & key = fit.key(); const QString & fullpath = f_itr.value();
const QString & fullpath = fit.value(); QString ext = filename.section("_", -1).section(".",0,0).toUpper();
QString ext = key.section("_", -1).section(".",0,0).toUpper();
EDFType type = lookupEDFType(ext); EDFType type = lookupEDFType(ext);
QString datestr = key.section("_", 0, 1); QString datestr = filename.section("_", 0, 1);
QDateTime datetime = QDateTime().fromString(datestr,"yyyyMMdd_HHmmss"); QDateTime filetime = QDateTime().fromString(datestr,"yyyyMMdd_HHmmss");
quint32 tt = datetime.toTime_t(); quint32 filetime_t = filetime.toTime_t();
if (type == EDF_EVE) { if (type == EDF_EVE) {
EVElist[tt] = key; EVElist[filetime_t] = filename;
continue; continue;
} else if (type == EDF_CSL) { } else if (type == EDF_CSL) {
CSLlist[tt] = key; CSLlist[filetime_t] = filename;
continue; continue;
} }
bool added = false; bool added = false;
for (auto & ovr : overlaps) { for (auto & ovr : overlaps) {
if ((tt >= (ovr.start)) && (tt < ovr.end)) { if ((filetime_t >= (ovr.start)) && (filetime_t < ovr.end)) {
ovr.filemap.insert(tt, key); ovr.filemap.insert(filetime_t, filename);
added = true; added = true;
break; break;
} }
} }
if (!added) { if (!added) { // Didn't get a hit, look at the EDF files duration and check for an overlap
// Didn't get a hit, look at the actual EDF files duration and check for an overlap
EDFduration dur = getEDFDuration(fullpath); EDFduration dur = getEDFDuration(fullpath);
for (int i=overlaps.size()-1; i>=0; --i) { for (int i=overlaps.size()-1; i>=0; --i) {
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(tt, key); ovr.filemap.insert(filetime_t, filename);
// Expand ovr's scope // Expand ovr's scope
//ovr.start = min(ovr.start, dur.start); //ovr.start = min(ovr.start, dur.start);
//ovr.end = max(ovr.end, dur.end); //ovr.end = max(ovr.end, dur.end);
added = true; added = true;
qDebug() << "Adding" << filename << "to session" << i;
qDebug() << "Starts:" << ovr.start << dur.start << "ends:" << ovr.end << dur.end;
break; break;
} }
} }
if (!added) { if ( ! added ) {
// Couldn't fit it in anywhere, create a new Overlap entry/session if (dur.start != dur.end) { // Couldn'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(tt, key); ov.filemap.insert(filetime_t, filename);
overlaps.append(ov); qDebug() << "Creating session for" << filename;
qDebug() << "Starts:" << dur.start << "Ends:" << dur.end;
overlaps.append(ov);
} else {
qDebug() << "Skipping zero duration file" << filename;
}
} }
} }
} }
@ -1559,8 +1531,11 @@ void ResDayTask::run()
sess->setSummaryOnly(false); sess->setSummaryOnly(false);
sess->SetChanged(true); sess->SetChanged(true);
if (sess->length()>0) { if (sess->length() == 0) {
// we want empty sessions even though they are crap // we want empty sessions even though they are crap
qDebug() << "Session" << sess->session()
<< "["+QDateTime::fromTime_t(sess->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"
<< "has zero duration";
} }
if (resday->str.date.isValid()) { if (resday->str.date.isValid()) {
@ -1617,6 +1592,8 @@ void ResDayTask::run()
} }
sess->UpdateSummaries(); sess->UpdateSummaries();
qDebug() << "Adding session" << sess->session()
<< "["+QDateTime::fromTime_t(sess->session()).toString("MMM dd, yyyy hh:mm:ss")+"]";
// Save is not threadsafe? (meh... it seems to be) // Save is not threadsafe? (meh... it seems to be)
// loader->saveMutex.lock(); // loader->saveMutex.lock();
@ -1630,7 +1607,7 @@ void ResDayTask::run()
// Free the memory used by this session // Free the memory used by this session
sess->TrashEvents(); sess->TrashEvents();
} } // end for-loop walking the overlaps (file groups per session
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
@ -2006,7 +1983,7 @@ int ResmedLoader::Open(const QString & dirpath)
if (isAborted()) if (isAborted())
return 0; return 0;
qDebug() << "Fisnished DATALOG scan"; qDebug() << "Finished DATALOG scan";
sleep(1); sleep(1);
// Now at this point we have resdayList populated with processable summary and EDF files data // Now at this point we have resdayList populated with processable summary and EDF files data
// that can be processed in threads.. // that can be processed in threads..
@ -2181,7 +2158,7 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
qint64 csr_starts = 0; qint64 csr_starts = 0;
// Process event annotation records // Process event annotation records
qDebug() << "File has " << edf.annotations.size() << "annotation vectors"; // qDebug() << "File has " << edf.annotations.size() << "annotation vectors";
// int vec = 1; // int vec = 1;
for (auto annoVec = edf.annotations.begin(); annoVec != edf.annotations.end(); annoVec++ ) { for (auto annoVec = edf.annotations.begin(); annoVec != edf.annotations.end(); annoVec++ ) {
// qDebug() << "Vector " << vec++ << " has " << annoVec->size() << " annotations"; // qDebug() << "Vector " << vec++ << " has " << annoVec->size() << " annotations";
@ -2190,9 +2167,9 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
double tt = edf.startdate + qint64(anno->offset*1000.0); double tt = edf.startdate + qint64(anno->offset*1000.0);
if ( ! anno->text.isEmpty()) { if ( ! anno->text.isEmpty()) {
if (anno->text == "csr start") { if (anno->text == "CSR Start") {
csr_starts = tt; csr_starts = tt;
} else if (anno->text == "csr end") { } else if (anno->text == "CSR End") {
if ( ! CSR) { if ( ! CSR) {
CSR = sess->AddEventList(CPAP_CSR, EVL_Event); CSR = sess->AddEventList(CPAP_CSR, EVL_Event);
} }
@ -2258,7 +2235,7 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
UA = sess->AddEventList(CPAP_Apnea, EVL_Event); UA = sess->AddEventList(CPAP_Apnea, EVL_Event);
// Process event annotation records // Process event annotation records
qDebug() << "File has " << edf.annotations.size() << "annotation vectors"; // qDebug() << "File has " << edf.annotations.size() << "annotation vectors";
// int vec = 1; // int vec = 1;
for (auto annoVec = edf.annotations.begin(); annoVec != edf.annotations.end(); annoVec++ ) { for (auto annoVec = edf.annotations.begin(); annoVec != edf.annotations.end(); annoVec++ ) {
// qDebug() << "Vector " << vec++ << " has " << annoVec->size() << " annotations"; // qDebug() << "Vector " << vec++ << " has " << annoVec->size() << " annotations";

10
oscar/SleepLib/loader_plugins/resmed_loader.h
View File

@ -236,12 +236,13 @@ public:
class ResmedLoader; class ResmedLoader;
struct ResMedDay { class ResMedDay {
public:
ResMedDay( QDate d) : date(d) {}
QDate date; QDate date;
STRRecord str; STRRecord str;
QHash<QString, QString> files; QHash<QString, QString> files; // key is filename, value is fullpath
// QHash<QString, EDFduration> durations;
}; };
class ResDayTask:public ImportTask class ResDayTask:public ImportTask
@ -250,6 +251,7 @@ public:
ResDayTask(ResmedLoader * l, Machine * m, ResMedDay * d): reimporting(false), loader(l), mach(m), resday(d) {} ResDayTask(ResmedLoader * l, Machine * m, ResMedDay * d): reimporting(false), loader(l), mach(m), resday(d) {}
virtual ~ResDayTask() {} virtual ~ResDayTask() {}
virtual void run(); virtual void run();
bool reimporting; bool reimporting;
protected: protected: