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

Force use of systems Standard Time Zone by QDateTime

Browse Source
This commit is contained in:
Phil Olynyk 2020-02-02 14:29:23 -05:00
parent 6624738f67
commit f903a26d11
3 changed files with 101 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
oscar/SleepLib/loader_plugins/edfparser.cpp
View File

@ -8,6 +8,7 @@
* for more details. */ * for more details. */
#include <QDateTime> #include <QDateTime>
#include <QTimeZone>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QMutexLocker> #include <QMutexLocker>
@ -35,6 +36,9 @@ EDFInfo::EDFInfo()
// fileData = nullptr; // fileData = nullptr;
} }
int EDFInfo::TZ_offset = QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime());
QTimeZone EDFInfo::localNoDST = QTimeZone(TZ_offset);
EDFInfo::~EDFInfo() EDFInfo::~EDFInfo()
{ {
// if ( fileData ) { // if ( fileData ) {
@ -83,6 +87,20 @@ bool EDFInfo::Open(const QString & name)
return true; return true;
} }
QDateTime EDFInfo::getStartDT( QString dateTimeStr )
{
// edfHdr.startdate_orig = QDateTime::fromString(QString::fromLatin1(hdrPtr->datetime, 16), "dd.MM.yyHH.mm.ss");
// QString dateTimeStr; // , dateStr, timeStr;
QDate qDate;
QTime qTime;
// dateTimeStr = QString::fromLatin1(hdrPtr->datetime, 16);
// dateStr = dateTimeStr.left(8);
// timeStr = dateTimeStr.right(8);
qDate = QDate::fromString(dateTimeStr.left(8), "dd.MM.yy");
qTime = QTime::fromString(dateTimeStr.right(8), "HH.mm.ss");
return QDateTime(qDate, qTime, localNoDST);
}
bool EDFInfo::parseHeader( EDFHeaderRaw *hdrPtr ) bool EDFInfo::parseHeader( EDFHeaderRaw *hdrPtr )
{ {
bool ok; bool ok;
@ -97,7 +115,7 @@ bool EDFInfo::parseHeader( EDFHeaderRaw *hdrPtr )
edfHdr.patientident=QString::fromLatin1(hdrPtr->patientident,80).trimmed(); edfHdr.patientident=QString::fromLatin1(hdrPtr->patientident,80).trimmed();
edfHdr.recordingident = QString::fromLatin1(hdrPtr->recordingident, 80).trimmed(); // Serial number is in here.. edfHdr.recordingident = QString::fromLatin1(hdrPtr->recordingident, 80).trimmed(); // Serial number is in here..
edfHdr.startdate_orig = QDateTime::fromString(QString::fromLatin1(hdrPtr->datetime, 16), "dd.MM.yyHH.mm.ss"); edfHdr.startdate_orig = getStartDT(QString::fromLatin1(hdrPtr->datetime, 16));
// This conversion will fail in 2084 after when the spec calls for the year to be 'yy' instead of digits // This conversion will fail in 2084 after when the spec calls for the year to be 'yy' instead of digits
// The solution is left for the afflicted - it won't be me! // The solution is left for the afflicted - it won't be me!
QDate d2 = edfHdr.startdate_orig.date(); QDate d2 = edfHdr.startdate_orig.date();

7
oscar/SleepLib/loader_plugins/edfparser.h
View File

@ -14,6 +14,8 @@
#include <QVector> #include <QVector>
#include <QHash> #include <QHash>
#include <QList> #include <QList>
#include <QDateTime>
#include <QTimeZone>
#include "SleepLib/common.h" #include "SleepLib/common.h"
@ -138,8 +140,13 @@ class EDFInfo
virtual QString GetPatient() { return edfHdr.patientident; } //! \brief Returns the patientid field from the EDF header virtual QString GetPatient() { return edfHdr.patientident; } //! \brief Returns the patientid field from the EDF header
static QDateTime getStartDT(const QString str); //! \brief Returns the start time using noLocalDST
// The data members follow // The data members follow
static int TZ_offset;
static QTimeZone localNoDST;
QString filename; //! \brief For debug and error messages QString filename; //! \brief For debug and error messages
EDFHeaderQT edfHdr; //! \brief The header in a QT friendly form EDFHeaderQT edfHdr; //! \brief The header in a QT friendly form

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

@ -435,10 +435,10 @@ int ResmedLoader::Open(const QString & dirpath)
ResMedEDFInfo * stredf = new ResMedEDFInfo(); ResMedEDFInfo * stredf = new ResMedEDFInfo();
if ( stredf->Open(fi.canonicalFilePath() ) ) { if ( stredf->Open(fi.canonicalFilePath() ) ) {
qDebug() << "Failed to open" << filename; qDebug() << "Failed to open" << filename;
delete stredf; delete stredf;
continue; continue;
} }
if (!stredf->Parse()) { if (!stredf->Parse()) {
qDebug() << "Faulty STR file" << filename; qDebug() << "Faulty STR file" << filename;
delete stredf; delete stredf;
@ -598,7 +598,7 @@ int ResmedLoader::Open(const QString & dirpath)
qDebug() << "Total new Sessions " << num_new_sessions; qDebug() << "Total new Sessions " << num_new_sessions;
return num_new_sessions; return num_new_sessions;
} // end Open() } // end Open()
void StoreSettings(Session * sess, STRRecord & R); // forward void StoreSettings(Session * sess, STRRecord & R); // forward
void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * mach ) void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * mach )
@ -692,23 +692,23 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
filename = fi.fileName(); filename = fi.fileName();
int len = filename.length(); int len = filename.length();
if (len == 4) { // when does this happen? if (len == 4) { // when does this happen?
filename.toInt(&ok); filename.toInt(&ok);
if ( ! ok ) { if ( ! ok ) {
qDebug() << "Skipping directory - bad 4-letter name" << filename; qDebug() << "Skipping directory - bad 4-letter name" << filename;
continue; continue;
}
} else if (len == 8) { // test directory date
QDate dirDate = QDate().fromString(filename, "yyyyMMdd");
if (dirDate < firstImport) {
#ifdef SESSION_DEBUG
qDebug() << "Skipping directory - ignore before " << filename;
#endif
continue;
} }
} else if (len == 8) { // test directory date
// if (ignoreOldSessions) {
QDate dirDate = QDate().fromString(filename, "yyyyMMdd");
if (dirDate < firstImport) {
qDebug() << "Skipping directory - ignore before " << filename;
continue;
}
// }
} else { } else {
qDebug() << "Skipping directory - bad name size " << filename; qDebug() << "Skipping directory - bad name size " << filename;
continue; continue;
} }
// Get file lists under this directory // Get file lists under this directory
dir.setPath(fi.canonicalFilePath()); dir.setPath(fi.canonicalFilePath());
@ -782,10 +782,8 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
date = date.addDays(-1); date = date.addDays(-1);
} }
// if (ignoreOldSessions) { if (date < firstImport)
if (date < firstImport) 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)) {
@ -950,7 +948,9 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
// if (ignoreOldSessions) { // if (ignoreOldSessions) {
if (date < firstImport) { if (date < firstImport) {
// qDebug() << "Skipping" << date.toString() << "Before" << ignoreBefore.date().toString(); #ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "Before" << ignoreBefore.date().toString();
#endif
continue; continue;
} }
// } // }
@ -958,7 +958,9 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
auto rit = resdayList.find(date); auto rit = resdayList.find(date);
if (rit != resdayList.end()) { if (rit != resdayList.end()) {
// Already seen this record.. should check if the data is the same, but meh. // Already seen this record.. should check if the data is the same, but meh.
#ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "Already saw this one"; qDebug() << "Skipping" << date.toString() << "Already saw this one";
#endif
continue; continue;
} }
@ -972,9 +974,11 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if (((on >= 0) && (off >= 0)) && (on != off)) // ignore very short on-off times if (((on >= 0) && (off >= 0)) && (on != off)) // ignore very short on-off times
validday=true; validday=true;
} }
if (!validday) { if ( ! validday) {
// There are no mask on/off events, so this STR day is useless. // There are no mask on/off events, so this STR day is useless.
#ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "No mask events"; qDebug() << "Skipping" << date.toString() << "No mask events";
#endif
continue; continue;
} }
@ -1271,7 +1275,7 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
static bool warn=false; static bool warn=false;
if (!warn) { // just nag once if (!warn) { // just nag once
qDebug() << "If you can read this, please tell the developers you found a ResMed with EPR but no EPR_LEVEL so he can remove this warning"; qDebug() << "If you can read this, please tell the developers you found a ResMed with EPR but no EPR_LEVEL so he can remove this warning";
sleep(1); // sleep(1);
warn = true; warn = true;
} }
@ -1382,7 +1386,7 @@ bool parseIdentTGT( QString path, MachineInfo * info, QHash<QString, QString> &
} }
f.close(); f.close();
return true; return true;
} }
void BackupSTRfiles( const QString path, const QString strBackupPath, MachineInfo info, QMap<QDate, STRFile> STRmap ) { void BackupSTRfiles( const QString path, const QString strBackupPath, MachineInfo info, QMap<QDate, STRFile> STRmap ) {
@ -1412,9 +1416,9 @@ void BackupSTRfiles( const QString path, const QString strBackupPath, MachineInf
for (auto & filename : strfiles) { for (auto & filename : strfiles) {
ResMedEDFInfo * stredf = new ResMedEDFInfo(); ResMedEDFInfo * stredf = new ResMedEDFInfo();
if ( ! stredf->Open(filename) ) { if ( ! stredf->Open(filename) ) {
qDebug() << "Failed to open" << filename; qDebug() << "Failed to open" << filename;
continue; continue;
} }
if ( ! stredf->Parse()) { if ( ! stredf->Parse()) {
qDebug() << "Faulty STR file" << filename; qDebug() << "Faulty STR file" << filename;
delete stredf; delete stredf;
@ -1463,7 +1467,6 @@ void BackupSTRfiles( const QString path, const QString strBackupPath, MachineInf
QFile::exists(gzfile) && QFile::remove(gzfile); QFile::exists(gzfile) && QFile::remove(gzfile);
STRmap[date] = STRFile(backupfile, stredf); STRmap[date] = STRFile(backupfile, stredf);
// delete stredf;
} // end for walking the STR files list } // end for walking the STR files list
} }
@ -1551,7 +1554,7 @@ EDFduration getEDFDuration(const QString & filename)
double rec_duration; double rec_duration;
QDateTime startDate; QDateTime startDate;
// We will just look at the header part of the edf file here // We will just look at the header part of the edf file here
if (!filename.endsWith(".gz", Qt::CaseInsensitive)) { if (!filename.endsWith(".gz", Qt::CaseInsensitive)) {
QFile file(filename); QFile file(filename);
if (!file.open(QFile::ReadOnly)) if (!file.open(QFile::ReadOnly))
@ -1563,8 +1566,9 @@ EDFduration getEDFDuration(const QString & filename)
} }
QByteArray bytes = file.read(16).trimmed(); QByteArray bytes = file.read(16).trimmed();
// We'll fix the xx85 problem below // We'll fix the xx85 problem below
startDate = QDateTime::fromString(QString::fromLatin1(bytes, 16), "dd.MM.yyHH.mm.ss"); // startDate = QDateTime::fromString(QString::fromLatin1(bytes, 16), "dd.MM.yyHH.mm.ss");
startDate = EDFInfo::getStartDT(QString::fromLatin1(bytes,16));
if (!file.seek(0xec)) { if (!file.seek(0xec)) {
file.close(); file.close();
@ -1590,8 +1594,8 @@ EDFduration getEDFDuration(const QString & filename)
char datebytes[17] = {0}; char datebytes[17] = {0};
gzread(f, (char *)&datebytes, 16); gzread(f, (char *)&datebytes, 16);
QString str = QString(QString::fromLatin1(datebytes,16)).trimmed(); QString str = QString(QString::fromLatin1(datebytes,16)).trimmed();
// startDate = QDateTime::fromString(str, "dd.MM.yyHH.mm.ss");
startDate = QDateTime::fromString(str, "dd.MM.yyHH.mm.ss"); startDate = EDFInfo::getStartDT(str);
if (!gzseek(f, 0xec-0xa8-16, SEEK_CUR)) { // 0xec if (!gzseek(f, 0xec-0xa8-16, SEEK_CUR)) { // 0xec
gzclose(f); gzclose(f);
@ -1616,7 +1620,7 @@ EDFduration getEDFDuration(const QString & filename)
d2.setDate(d2.year() + 100, d2.month(), d2.day()); d2.setDate(d2.year() + 100, d2.month(), d2.day());
startDate.setDate(d2); startDate.setDate(d2);
} }
if (!startDate.isValid()) { if ( ! startDate.isValid() ) {
qDebug() << "Invalid date time retreieved parsing EDF duration for" << filename; qDebug() << "Invalid date time retreieved parsing EDF duration for" << filename;
return EDFduration(0, 0, filename); return EDFduration(0, 0, filename);
} }
@ -1628,8 +1632,10 @@ EDFduration getEDFDuration(const QString & filename)
quint32 end = start + rec_duration * num_records; quint32 end = start + rec_duration * num_records;
QString filedate = filename.section("/",-1).section("_",0,1); QString filedate = filename.section("/",-1).section("_",0,1);
// QDateTime dt2 = QDateTime::fromString(filedate, "yyyyMMdd_hhmmss");
QDateTime dt2 = QDateTime::fromString(filedate, "yyyyMMdd_hhmmss"); d2 = QDate::fromString( filedate.left(8), "yyyyMMdd");
QTime t2 = QTime::fromString( filedate.right(6), "hhmmss");
QDateTime dt2 = QDateTime( d2, t2, EDFInfo::localNoDST );
quint32 st2 = dt2.toTime_t(); quint32 st2 = dt2.toTime_t();
start = qMin(st2, start); // They should be the same, usually start = qMin(st2, start); // They should be the same, usually
@ -1637,7 +1643,6 @@ EDFduration getEDFDuration(const QString & filename)
if (end < start) if (end < start)
end = qMax(st2, start); end = qMax(st2, start);
EDFduration dur(start, end, filename); EDFduration dur(start, end, filename);
dur.type = lookupEDFType(filename); dur.type = lookupEDFType(filename);
@ -1681,32 +1686,32 @@ void StoreSummaryStatistics(Session * sess, STRRecord & R)
} }
if (R.leak50 >= 0) { if (R.leak50 >= 0) {
// sess->setp95(CPAP_Leak, R.leak95); // sess->setp95(CPAP_Leak, R.leak95);
// sess->setp50(CPAP_Leak, R.leak50); // sess->setp50(CPAP_Leak, R.leak50);
sess->setMax(CPAP_Leak, R.leakmax); sess->setMax(CPAP_Leak, R.leakmax);
} }
if (R.rr50 >= 0) { if (R.rr50 >= 0) {
// sess->setp95(CPAP_RespRate, R.rr95); // sess->setp95(CPAP_RespRate, R.rr95);
// sess->setp50(CPAP_RespRate, R.rr50); // sess->setp50(CPAP_RespRate, R.rr50);
sess->setMax(CPAP_RespRate, R.rrmax); sess->setMax(CPAP_RespRate, R.rrmax);
} }
if (R.mv50 >= 0) { if (R.mv50 >= 0) {
// sess->setp95(CPAP_MinuteVent, R.mv95); // sess->setp95(CPAP_MinuteVent, R.mv95);
// sess->setp50(CPAP_MinuteVent, R.mv50); // sess->setp50(CPAP_MinuteVent, R.mv50);
sess->setMax(CPAP_MinuteVent, R.mvmax); sess->setMax(CPAP_MinuteVent, R.mvmax);
} }
if (R.tv50 >= 0) { if (R.tv50 >= 0) {
// sess->setp95(CPAP_TidalVolume, R.tv95); // sess->setp95(CPAP_TidalVolume, R.tv95);
// sess->setp50(CPAP_TidalVolume, R.tv50); // sess->setp50(CPAP_TidalVolume, R.tv50);
sess->setMax(CPAP_TidalVolume, R.tvmax); sess->setMax(CPAP_TidalVolume, R.tvmax);
} }
if (R.mp50 >= 0) { if (R.mp50 >= 0) {
// sess->setp95(CPAP_MaskPressure, R.mp95); // sess->setp95(CPAP_MaskPressure, R.mp95);
// sess->seTTtp50(CPAP_MaskPressure, R.mp50); // sess->seTTtp50(CPAP_MaskPressure, R.mp50);
sess->setMax(CPAP_MaskPressure, R.mpmax); sess->setMax(CPAP_MaskPressure, R.mpmax);
} }
@ -1839,9 +1844,6 @@ struct OverlappingEDF {
void ResDayTask::run() void ResDayTask::run()
{ {
// if (this->resday->date == QDate(2016,1,6)) {
// qDebug() << "in resday" << this->resday->date;
// }
if (resday->files.size() == 0) { // No EDF files??? if (resday->files.size() == 0) { // No EDF files???
if ( ! resday->str.date.isValid()) { if ( ! resday->str.date.isValid()) {
// 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
@ -1949,16 +1951,16 @@ void ResDayTask::run()
} // end for walk existing overlap entries } // end for walk existing overlap entries
if ( ! added ) { if ( ! added ) {
if (dur.start != dur.end) { // Didn'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);
#ifdef SESSION_DEBUG #ifdef SESSION_DEBUG
qDebug() << "Creating session for" << filename; qDebug() << "Creating session for" << filename;
qDebug() << "Starts:" << dur.start << "Ends:" << dur.end; qDebug() << "Starts:" << dur.start << "Ends:" << dur.end;
#endif #endif
overlaps.append(ov); overlaps.append(ov);
} else { } else {
#ifdef SESSION_DEBUG #ifdef SESSION_DEBUG
qDebug() << "Skipping zero duration file" << filename; qDebug() << "Skipping zero duration file" << filename;
#endif #endif
@ -2137,8 +2139,8 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
ResMedEDFInfo edf; ResMedEDFInfo edf;
if ( ! edf.Open(path) ) { if ( ! edf.Open(path) ) {
qDebug() << "LoadCSL failed to open" << path; qDebug() << "LoadCSL failed to open" << path;
return false; return false;
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
@ -2147,8 +2149,7 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
#endif #endif
if (!edf.Parse()) { if (!edf.Parse()) {
qDebug() << "LoadCSL failed to parse" << path; qDebug() << "LoadCSL failed to parse" << path;
// fileData->clear();
return false; return false;
} }
@ -2197,8 +2198,6 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
qDebug() << "Unfinished csr event in " << edf.filename; qDebug() << "Unfinished csr event in " << edf.filename;
} }
// fileData->clear();
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
timeMutex.lock(); timeMutex.lock();
timeInLoadCSL += time.elapsed(); timeInLoadCSL += time.elapsed();
@ -2218,8 +2217,8 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
#endif #endif
ResMedEDFInfo edf; ResMedEDFInfo edf;
if ( ! edf.Open(path) ) { if ( ! edf.Open(path) ) {
qDebug() << "LoadEVE failed to open" << path; qDebug() << "LoadEVE failed to open" << path;
return false; return false;
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
int edfopentime = time.elapsed(); int edfopentime = time.elapsed();
@ -2227,8 +2226,7 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
#endif #endif
if (!edf.Parse()) { if (!edf.Parse()) {
qDebug() << "LoadEVE failed to parse" << path; qDebug() << "LoadEVE failed to parse" << path;
// fileData->clear();
return false; return false;
} }
@ -2294,8 +2292,6 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
} }
} }
// fileData->clear();
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
timeMutex.lock(); timeMutex.lock();
timeInLoadEVE += time.elapsed(); timeInLoadEVE += time.elapsed();
@ -2315,16 +2311,15 @@ bool ResmedLoader::LoadBRP(Session *sess, const QString & path)
#endif #endif
ResMedEDFInfo edf; ResMedEDFInfo edf;
if ( ! edf.Open(path) ) { if ( ! edf.Open(path) ) {
qDebug() << "LoadBRP failed to open" << path; qDebug() << "LoadBRP failed to open" << path;
return false; return false;
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
int edfopentime = time.elapsed(); int edfopentime = time.elapsed();
time.start(); time.start();
#endif #endif
if (!edf.Parse()) { if (!edf.Parse()) {
qDebug() << "LoadBRP failed to parse" << path; qDebug() << "LoadBRP failed to parse" << path;
// fileData->clear();
return false; return false;
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
@ -2391,8 +2386,6 @@ bool ResmedLoader::LoadBRP(Session *sess, const QString & path)
} }
} }
// fileData->clear();
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
timeMutex.lock(); timeMutex.lock();
timeInLoadBRP += time.elapsed(); timeInLoadBRP += time.elapsed();
@ -2415,8 +2408,8 @@ bool ResmedLoader::LoadSAD(Session *sess, const QString & path)
ResMedEDFInfo edf; ResMedEDFInfo edf;
if ( ! edf.Open(path) ) { if ( ! edf.Open(path) ) {
qDebug() << "LoadSAD failed to open" << path; qDebug() << "LoadSAD failed to open" << path;
return false; return false;
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
@ -2425,8 +2418,7 @@ bool ResmedLoader::LoadSAD(Session *sess, const QString & path)
#endif #endif
if (!edf.Parse()) { if (!edf.Parse()) {
qDebug() << "LoadSAD failed to parse" << path; qDebug() << "LoadSAD failed to parse" << path;
// fileData->clear();
return false; return false;
} }
@ -2471,8 +2463,6 @@ bool ResmedLoader::LoadSAD(Session *sess, const QString & path)
} }
} }
// fileData->clear();
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
timeMutex.lock(); timeMutex.lock();
timeInLoadSAD += time.elapsed(); timeInLoadSAD += time.elapsed();
@ -2492,8 +2482,8 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
#endif #endif
ResMedEDFInfo edf; ResMedEDFInfo edf;
if ( ! edf.Open(path) ) { if ( ! edf.Open(path) ) {
qDebug() << "LoadPLD failed to open" << path; qDebug() << "LoadPLD failed to open" << path;
return false; return false;
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
int edfopentime = time.elapsed(); int edfopentime = time.elapsed();
@ -2501,8 +2491,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
#endif #endif
if (!edf.Parse()) { if (!edf.Parse()) {
qDebug() << "LoadPLD failed to parse" << path; qDebug() << "LoadPLD failed to parse" << path;
// fileData->clear();
return false; return false;
} }
@ -2647,8 +2636,6 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
} }
// fileData->clear();
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
timeMutex.lock(); timeMutex.lock();
timeInLoadPLD += time.elapsed(); timeInLoadPLD += time.elapsed();