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

Compare maskevents to session count to all re-import on same day - added debug trace

Browse Source
This commit is contained in:
Phil Olynyk 2020-08-08 14:17:54 -04:00
parent 363aa6d1b9
commit b35cd921c1
3 changed files with 107 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,6 +261,7 @@ int ResmedLoader::Open(const QString & dirpath, ResDaySaveCallback s)
int ResmedLoader::Open(const QString & dirpath) int ResmedLoader::Open(const QString & dirpath)
{ {
qDebug() << "Starting ResmedLoader::Open( with " << dirpath << ")";
QString datalogPath; QString datalogPath;
QHash<QString, QString> idmap; // Temporary machine ID properties hash QHash<QString, QString> idmap; // Temporary machine ID properties hash
@ -337,7 +338,8 @@ int ResmedLoader::Open(const QString & dirpath)
mach->setInfo( info ); // update info mach->setInfo( info ); // update info
QDate lastDate = mach->LastDay(); // use the last day for this machine QDate lastDate = mach->LastDay(); // use the last day for this machine
// firstImportDay = lastDate.addDays(-1); // start the day before, to pick up partial days // firstImportDay = lastDate.addDays(-1); // start the day before, to pick up partial days
firstImportDay = lastDate.addDays(1); // start the day after until we figure out the purge firstImportDay = lastDate; // re-import the last day, to pick up partial days
// firstImportDay = lastDate.addDays(1); // start the day after until we figure out the purge
} else { // Starting from new beginnings - new or purged } else { // Starting from new beginnings - new or purged
qDebug() << "New machine or just purged"; qDebug() << "New machine or just purged";
p_profile->forceResmedPrefs(); p_profile->forceResmedPrefs();
@ -346,7 +348,7 @@ int ResmedLoader::Open(const QString & dirpath)
QDateTime ignoreBefore = p_profile->session->ignoreOlderSessionsDate(); QDateTime ignoreBefore = p_profile->session->ignoreOlderSessionsDate();
bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
if (ignoreOldSessions) if (ignoreOldSessions && (ignoreBefore.date() > firstImportDay))
firstImportDay = ignoreBefore.date(); firstImportDay = ignoreBefore.date();
qDebug() << "First day to import: " << firstImportDay.toString(); qDebug() << "First day to import: " << firstImportDay.toString();
@ -421,11 +423,11 @@ int ResmedLoader::Open(const QString & dirpath)
bool addToSTRmap = true; bool addToSTRmap = true;
QDate date = stredf->edfHdr.startdate_orig.date(); QDate date = stredf->edfHdr.startdate_orig.date();
long int days = stredf->GetNumDataRecords(); long int days = stredf->GetNumDataRecords();
qDebug() << importFile.section("/",-2,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1); qDebug() << importFile.section("/",-3,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1);
if (STRmap.contains(date)) { // Keep the longer of the two STR files - or newer if equal! if (STRmap.contains(date)) { // Keep the longer of the two STR files - or newer if equal!
qDebug() << importFile.section("/",-3,-1) << "overlaps" << STRmap[date].filename.section("/",-3,-1) << "for" << days << "ends" << date.addDays(days-1); qDebug() << importFile.section("/",-3,-1) << "overlaps" << STRmap[date].filename.section("/",-3,-1) << "for" << days << "ends" << date.addDays(days-1);
if (days >= STRmap[date].days) { if (days >= STRmap[date].days) {
qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1) << "with" << STRmap[date].days; qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1) << "with" << STRmap[date].days << "from STRmap";
STRmap.remove(date); STRmap.remove(date);
} else { } else {
qDebug() << "Skipping" << importFile.section("/",-3,-1); qDebug() << "Skipping" << importFile.section("/",-3,-1);
@ -448,11 +450,13 @@ int ResmedLoader::Open(const QString & dirpath)
qWarning() << "Failed to copy" << importFile << "to" << backupFile; qWarning() << "Failed to copy" << importFile << "to" << backupFile;
} }
STRmap[date] = STRFile(backupFile, days, stredf); STRmap[date] = STRFile(backupFile, days, stredf);
qDebug() << "Adding" << importFile << "to STRmap as" << backupFile;
// Meh.. these can be calculated if ever needed for ResScan SDcard export // Meh.. these can be calculated if ever needed for ResScan SDcard export
QFile::copy(importPath + "STR.crc", backup_path + "STR.crc"); QFile::copy(importPath + "STR.crc", backup_path + "STR.crc");
} }
} }
} else { // get the STR file that is in the BACKUP folder that we are rebuilding from } else { // get the STR file that is in the BACKUP folder that we are rebuilding from
qDebug() << "Rebuilding from BACKUP folder";
ResMedEDFInfo * stredf = fetchSTRandVerify( strpath, info.serial ); ResMedEDFInfo * stredf = fetchSTRandVerify( strpath, info.serial );
if ( stredf != nullptr ) { if ( stredf != nullptr ) {
QDate date = stredf->edfHdr.startdate_orig.date(); QDate date = stredf->edfHdr.startdate_orig.date();
@ -482,9 +486,9 @@ int ResmedLoader::Open(const QString & dirpath)
// Add any STR_Backup versions to the file list // Add any STR_Backup versions to the file list
for (auto & fi : flist) { for (auto & fi : flist) {
QString filename = fi.fileName(); QString filename = fi.fileName();
if (!filename.startsWith("STR", Qt::CaseInsensitive)) if ( ! filename.startsWith("STR", Qt::CaseInsensitive))
continue; continue;
if (!(filename.endsWith("edf.gz", Qt::CaseInsensitive) || filename.endsWith("edf", Qt::CaseInsensitive))) if ( ! (filename.endsWith("edf.gz", Qt::CaseInsensitive) || filename.endsWith("edf", Qt::CaseInsensitive)))
continue; continue;
QString datestr = filename.section("STR-",-1).section(".edf",0,0); // +"01"; QString datestr = filename.section("STR-",-1).section(".edf",0,0); // +"01";
@ -502,16 +506,16 @@ int ResmedLoader::Open(const QString & dirpath)
delete stredf; delete stredf;
continue; continue;
} else { } else {
qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1); qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1) << "from STRmap";
STRmap.remove(date); STRmap.remove(date);
} }
} }
qDebug() << "Adding" << fi.canonicalFilePath().section("/", -2,-1) << "starts at" << date << "for" << days; qDebug() << "Adding" << fi.canonicalFilePath().section("/", -3,-1) << "starts at" << date << "for" << days << "to STRmap";
STRmap[date] = STRFile(fi.canonicalFilePath(), days, stredf); STRmap[date] = STRFile(fi.canonicalFilePath(), days, stredf);
} // end for walking the STR_Backup directory } // end for walking the STR_Backup directory
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "STRmap size is now " << STRmap.size(); qDebug() << "Finished STRmap size is now " << STRmap.size();
#endif #endif
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
@ -593,7 +597,9 @@ int ResmedLoader::Open(const QString & dirpath)
emit updateMessage(QObject::tr("Importing Sessions...")); emit updateMessage(QObject::tr("Importing Sessions..."));
// Walk down the resDay list // Walk down the resDay list
qDebug() << "About to call runTasks()";
runTasks(); runTasks();
qDebug() << "Finshed runTasks() with" << sessionCount << "new sessions";
int num_new_sessions = sessionCount; int num_new_sessions = sessionCount;
@ -604,7 +610,9 @@ int ResmedLoader::Open(const QString & dirpath)
emit updateMessage(QObject::tr("Finishing Up...")); emit updateMessage(QObject::tr("Finishing Up..."));
QApplication::processEvents(); QApplication::processEvents();
qDebug() << "About to call fishAddingSessions()";
finishAddingSessions(); finishAddingSessions();
qDebug() << "Finshed finishedAddinfSessions() with" << sessionCount << "new sessions";
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
{ {
@ -678,14 +686,17 @@ void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * ma
{ {
Day * day = p_profile->FindDay(date, MT_CPAP); Day * day = p_profile->FindDay(date, MT_CPAP);
bool reimporting = false; bool reimporting = false;
qDebug() << "Starting checkSummary for" << date.toString();
if (day && day->hasMachine(mach)) { if (day && day->hasMachine(mach)) {
// Sessions found for this machine, check if only summary info // Sessions found for this machine, check if only summary info
qDebug() << "Sessions already found for this date";
if (day->summaryOnly(mach) && (resday.files.size()> 0)) { if (day->summaryOnly(mach) && (resday.files.size()> 0)) {
// Note: if this isn't an EDF file, there's really no point doing this here, // Note: if this isn't an EDF file, there's really no point doing this here,
// but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case // but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case
// This day was first imported as a summary from STR.edf, so we now totally want to redo this day // This day was first imported as a summary from STR.edf, so we now totally want to redo this day
qDebug() << "Summary sessions only - delete them";
QList<Session *> sessions = day->getSessions(MT_CPAP); QList<Session *> sessions = day->getSessions(MT_CPAP);
for (auto & sess : sessions) { for (auto & sess : sessions) {
day->removeSession(sess); day->removeSession(sess);
@ -694,10 +705,10 @@ void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * ma
} else if (day->noSettings(mach) && resday.str.date.isValid()) { } else if (day->noSettings(mach) && resday.str.date.isValid()) {
// STR is present now, it wasn't before... we don't need to trash the files, but we do want the official settings. // STR is present now, it wasn't before... we don't need to trash the files, but we do want the official settings.
// Do it right here // Do it right here
qDebug() << "Date was missing settings, now we have them";
for (auto & sess : day->sessions) { for (auto & sess : day->sessions) {
if (sess->machine() != mach) if (sess->machine() != mach)
continue; continue;
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "Adding STR.edf information to session" << sess->session(); qDebug() << "Adding STR.edf information to session" << sess->session();
#endif #endif
@ -706,12 +717,25 @@ void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * ma
sess->SetChanged(true); sess->SetChanged(true);
sess->StoreSummary(); sess->StoreSummary();
} }
} else } else {
return; qDebug() << "Have summary and details for this date!";
if (day->size() == (resday.str.maskevents/2) ) {
qDebug() << "No new sessions -- skipping";
return;
}
qDebug() << "Maskevent count" << resday.str.maskevents << "is not twice the existing session count" << day->size();
qDebug() << "Clean the day and re-import it";
QList<Session *> sessions = day->getSessions(MT_CPAP);
for (auto & sess : sessions) {
day->removeSession(sess);
delete sess;
}
}
} }
ResDayTask * rdt = new ResDayTask(this, mach, &resday, saveCallback); ResDayTask * rdt = new ResDayTask(this, mach, &resday, saveCallback);
rdt->reimporting = reimporting; rdt->reimporting = reimporting;
qDebug() << "in checkSummary, Queue task for" << resday.date.toString();
queTask(rdt); queTask(rdt);
} }
@ -735,6 +759,7 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
// Generate list of files for later processing // Generate list of files for later processing
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
qDebug() << "Generating list of EDF files"; qDebug() << "Generating list of EDF files";
qDebug() << "First Import date is " << firstImport;
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
time.start(); time.start();
@ -742,7 +767,7 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
QDir dir(datalog_path); QDir dir(datalog_path);
// First list any EDF files in DATALOG folder // First list any EDF files in DATALOG folder - Series 9 machines
QStringList filter; QStringList filter;
filter << "*.edf"; filter << "*.edf";
dir.setNameFilters(filter); dir.setNameFilters(filter);
@ -857,8 +882,12 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
date = date.addDays(-1); date = date.addDays(-1);
} }
if (date < firstImport) if (date < firstImport) {
#ifdef SESSION_DEBUG
qDebug() << "Skipping file - ignore before " << filename;
#endif
continue; continue;
}
// Chop off the .gz component if it exists, it's not needed at this stage // Chop off the .gz component if it exists, it's not needed at this stage
if (filename.endsWith(STR_ext_gz)) { if (filename.endsWith(STR_ext_gz)) {
@ -975,7 +1004,9 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
// QDateTime ignoreBefore = p_profile->session->ignoreOlderSessionsDate(); // QDateTime ignoreBefore = p_profile->session->ignoreOlderSessionsDate();
// bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); // bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
int totalRecs = 0; qDebug() << "Starting ProcessSTRfiles";
int totalRecs = 0; // Count the STR days
for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) { for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) {
STRFile & file = it.value(); STRFile & file = it.value();
ResMedEDFInfo & str = *file.edf; ResMedEDFInfo & str = *file.edf;
@ -993,9 +1024,9 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
int currentRec = 0; int currentRec = 0;
// Walk through all the STR files in the STRmap
for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) { for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) {
STRFile & file = it.value(); STRFile & file = it.value();
QString & strfile = file.filename;
ResMedEDFInfo & str = *file.edf; ResMedEDFInfo & str = *file.edf;
QDate date = str.edfHdr.startdate_orig.date(); // each STR.edf record starts at 12 noon QDate date = str.edfHdr.startdate_orig.date(); // each STR.edf record starts at 12 noon
@ -1003,12 +1034,15 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
QDate lastDay = date.addDays(size-1); QDate lastDay = date.addDays(size-1);
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "Processing" << strfile.section("/", -3, -1) << date.toString() << size << str.GetNumSignals(); QString & strfile = file.filename;
qDebug() << "Processing" << strfile.section("/", -3, -1) << date.toString() << "for" << size << "days";
qDebug() << "Last day is" << lastDay; qDebug() << "Last day is" << lastDay;
#endif #endif
if ( lastDay < firstImport ) { if ( lastDay < firstImport ) {
#ifdef STR_DEBUG
qDebug() << "LastDay before firstImport, skipping" << strfile.section("/", -3, -1); qDebug() << "LastDay before firstImport, skipping" << strfile.section("/", -3, -1);
#endif
continue; continue;
} }
@ -1037,29 +1071,33 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
emit setProgressValue(++currentRec); emit setProgressValue(++currentRec);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
// if (ignoreOldSessions) { if (date < firstImport) {
if (date < firstImport) {
#ifdef SESSION_DEBUG #ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "Before" << firstImport.toString(); qDebug() << "Skipping" << date.toString() << "Before" << firstImport.toString();
#endif #endif
continue;
}
// }
auto rit = resdayList.find(date);
if (rit != resdayList.end()) {
// Already seen this record.. should check if the data is the same, but meh.
// At least check the maskeventcount to see if it changed...
if ( maskeventcount->dataArray[0] != rit.value().str.maskevents ) {
qDebug() << "Maske events don't match, purge" << rit.value().date.toString();
// purge...
}
// #ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "Already saw this one";
// #endif
continue; continue;
} }
// This is not what we want to check, we must look at this day in the database files...
// Found the plce in checkSummaryDay to compare session count with maskevents divided by 2
qDebug() << "ResdayList size is" << resdayList.size();
// auto rit = resdayList.find(date);
// if (rit != resdayList.end()) {
// // Already seen this record.. should check if the data is the same, but meh.
// // At least check the maskeventcount to see if it changed...
// if ( maskeventcount->dataArray[0] != rit.value().str.maskevents ) {
// qDebug() << "Mask events don't match, purge" << rit.value().date.toString();
// // purge...
// }
// // #ifdef SESSION_DEBUG
// qDebug() << "Skipping" << date.toString() << "Already saw this one";
// // #endif
// continue;
// } // else {
// // qWarning() << date.toString() << "is missing from resdayList - FIX THIS";
// // continue;
// // }
int recstart = rec * maskon->sampleCnt; int recstart = rec * maskon->sampleCnt;
bool validday = false; bool validday = false;
@ -1078,7 +1116,8 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
continue; continue;
} }
rit = resdayList.insert(date, ResMedDay(date)); qDebug() << "Adding" << date.toString() << "to resdayLisyt b/c we have STR record";
auto rit = resdayList.insert(date, ResMedDay(date));
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "Setting up STRRecord for" << date.toString(); qDebug() << "Setting up STRRecord for" << date.toString();
@ -1473,9 +1512,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
qDebug() << "Finished" << strfile; qDebug() << "Finished" << strfile;
#endif #endif
} }
#ifdef STR_DEBUG
qDebug() << "Finished ProcessSTR"; qDebug() << "Finished ProcessSTR";
#endif
return true; return true;
} }
@ -1510,7 +1547,7 @@ void backupSTRfiles( const QString strpath, const QString importPath, const QStr
MachineInfo & info, QMap<QDate, STRFile> & STRmap ) MachineInfo & info, QMap<QDate, STRFile> & STRmap )
{ {
Q_UNUSED(strpath); Q_UNUSED(strpath);
qDebug() << "Entering backupSTRfiles during new IMPORT"; qDebug() << "Starting backupSTRfiles during new IMPORT";
QDir dir; QDir dir;
// Qstring strBackupPath(backupPath+"STR_Backup"); // Qstring strBackupPath(backupPath+"STR_Backup");
QStringList strfiles; QStringList strfiles;
@ -1575,9 +1612,9 @@ void backupSTRfiles( const QString strpath, const QString importPath, const QStr
if ( QFile::exists(backupfile)) { if ( QFile::exists(backupfile)) {
QFile::remove(backupfile); QFile::remove(backupfile);
} }
// #ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "Copying" << filename.section("/",-3,1) << "to" << backupfile.section("/",-3,-1); qDebug() << "Copying" << filename.section("/",-3,-1) << "to" << backupfile.section("/",-3,-1);
// #endif #endif
if (filename.endsWith(STR_ext_gz,Qt::CaseInsensitive)) { // we have a compressed file if (filename.endsWith(STR_ext_gz,Qt::CaseInsensitive)) { // we have a compressed file
if (compress_backups) { // fine, copy it to backup folder if (compress_backups) { // fine, copy it to backup folder
QFile::copy(filename, backupfile); QFile::copy(filename, backupfile);
@ -1601,7 +1638,7 @@ void backupSTRfiles( const QString strpath, const QString importPath, const QStr
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "STRmap has" << STRmap.size() << "entries"; qDebug() << "STRmap has" << STRmap.size() << "entries";
#endif #endif
qDebug() << "Leaving backupSTRfiles during new IMPORT"; qDebug() << "Finished backupSTRfiles during new IMPORT";
} }
QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info) QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info)
@ -1984,6 +2021,9 @@ struct OverlappingEDF {
void ResDayTask::run() void ResDayTask::run()
{ {
#ifdef SESSION_DEBUG
qDebug() << "Processing STR and edf files for" << resday->date;
#endif
if (resday->files.size() == 0) { // No EDF files??? if (resday->files.size() == 0) { // No EDF files???
if (( ! resday->str.date.isValid()) || (resday->str.date > QDate::currentDate()) ) { if (( ! resday->str.date.isValid()) || (resday->str.date > QDate::currentDate()) ) {
// 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
@ -2023,6 +2063,7 @@ void ResDayTask::run()
save(loader, sess); // This is aliased to SaveSession - unless testing save(loader, sess); // This is aliased to SaveSession - unless testing
} }
} }
qDebug() << "Finished summary processing for" << resday->date;
return; return;
} }
@ -2054,6 +2095,7 @@ void ResDayTask::run()
} }
} }
} }
qDebug() << "Created" << overlaps.size() << "sessionGroups from STR record";
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 f_itr=resday->files.begin(), fend=resday->files.end(); f_itr!=fend; ++f_itr) {
@ -2084,7 +2126,7 @@ void ResDayTask::run()
break; break;
} }
} }
if (!added) { // Didn't get a hit, look at the EDF files duration and check for an overlap if ( ! added) { // Didn't get a hit, look at the EDF files duration and check for an overlap
EDFduration dur = getEDFDuration(fullpath); EDFduration dur = getEDFDuration(fullpath);
if ((dur.start > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) || if ((dur.start > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) ||
(dur.end > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) ) { (dur.end > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) ) {
@ -2118,7 +2160,7 @@ void ResDayTask::run()
ov.end = dur.end; ov.end = dur.end;
ov.filemap.insert(filetime_t, filename); ov.filemap.insert(filetime_t, filename);
#ifdef SESSION_DEBUG #ifdef SESSION_DEBUG
qDebug() << "Creating overlap for" << filename; qDebug() << "Creating overlap for" << filename << "missing STR record";
qDebug() << "Starts:" << dur.start << "Ends:" << dur.end; qDebug() << "Starts:" << dur.start << "Ends:" << dur.end;
#endif #endif
overlaps.append(ov); overlaps.append(ov);
@ -2152,8 +2194,10 @@ void ResDayTask::run()
// } // }
// } // }
if (overlaps.size()==0) if (overlaps.size()==0) {
qDebug() << "No sessionGroups for" << resday->date << "FINSIHED";
return; return;
}
// Now overlaps is populated with zero or more individual session groups of EDF files (zero because of sucky summary only days) // Now overlaps is populated with zero or more individual session groups of EDF files (zero because of sucky summary only days)
for (auto & ovr : overlaps) { for (auto & ovr : overlaps) {
@ -2191,7 +2235,7 @@ void ResDayTask::run()
default: default:
qWarning() << "Unrecognized file type for" << filename; qWarning() << "Unrecognized file type for" << filename;
} }
} } // end for each edf file in the sessionGroup
// Turns out there is only one or sometimes two EVE's per day, and they store data for the whole day // Turns out there is only one or sometimes two EVE's per day, and they store data for the whole day
// So we have to extract Annotations data and apply it for all sessions // So we have to extract Annotations data and apply it for all sessions
@ -2256,7 +2300,7 @@ void ResDayTask::run()
Day * day = it.value(); Day * day = it.value();
bool hasmachine = day && day->hasMachine(mach); bool hasmachine = day && day->hasMachine(mach);
if (!hasmachine) if ( ! hasmachine)
continue; continue;
QList<Session *> sessions = day->getSessions(MT_CPAP); QList<Session *> sessions = day->getSessions(MT_CPAP);
@ -2308,9 +2352,13 @@ void ResmedLoader::SaveSession(ResmedLoader* loader, Session* sess)
{ {
Machine* mach = sess->machine(); Machine* mach = sess->machine();
loader->sessionMutex.lock(); loader->sessionMutex.lock(); // AddSession definitely ain't threadsafe.
sess->Store(mach->getDataPath()); if ( ! sess->Store(mach->getDataPath()) ) {
mach->AddSession(sess); // AddSession definitely ain't threadsafe. qWarning() << "Failed to store session" << sess->session();
}
if ( ! mach->AddSession(sess) ) {
qWarning() << "Session" << sess->session() << "was not addded";
}
loader->sessionCount++; loader->sessionCount++;
loader->sessionMutex.unlock(); loader->sessionMutex.unlock();
} }

7
oscar/SleepLib/machine.cpp
View File

@ -843,8 +843,11 @@ void Machine::queTask(ImportTask * task)
void Machine::runTasks() void Machine::runTasks()
{ {
if (m_tasklist.isEmpty()) if (m_tasklist.isEmpty()) {
qDebug() << "No tasks in m_tasklist";
return; return;
}
qDebug() << "m_tasklist size is" << m_tasklist.size();
QThreadPool * threadpool = QThreadPool::globalInstance(); QThreadPool * threadpool = QThreadPool::globalInstance();
/*********************************************************** /***********************************************************
@ -853,7 +856,7 @@ void Machine::runTasks()
// if (loader()) // if (loader())
// emit loader()->setProgressMax(m_totaltasks); // emit loader()->setProgressMax(m_totaltasks);
***********************************************************/ ***********************************************************/
while (!m_tasklist.isEmpty()) { while ( ! m_tasklist.isEmpty()) {
if (threadpool->tryStart(m_tasklist.at(0))) { if (threadpool->tryStart(m_tasklist.at(0))) {
m_tasklist.pop_front(); m_tasklist.pop_front();
/************************************************************ /************************************************************

5
oscar/SleepLib/machine_loader.cpp
View File

@ -92,7 +92,8 @@ void MachineLoader::queTask(ImportTask * task)
void MachineLoader::runTasks(bool threaded) void MachineLoader::runTasks(bool threaded)
{ {
m_totalMLtasks=m_MLtasklist.size(); m_totalMLtasks = m_MLtasklist.size();
qDebug() << "MachineLoader::runTasks MLtasklist size is" << m_totalMLtasks;
if (m_totalMLtasks == 0) if (m_totalMLtasks == 0)
return; return;
emit setProgressMax(m_totalMLtasks); emit setProgressMax(m_totalMLtasks);
@ -100,7 +101,7 @@ void MachineLoader::runTasks(bool threaded)
threaded=AppSetting->multithreading(); threaded=AppSetting->multithreading();
if (!threaded) { if ( ! threaded) {
while (!m_MLtasklist.isEmpty() && !m_abort) { while (!m_MLtasklist.isEmpty() && !m_abort) {
ImportTask * task = m_MLtasklist.takeFirst(); ImportTask * task = m_MLtasklist.takeFirst();
task->run(); task->run();