Force use of systems Standard Time Zone by QDateTime

oscar/SleepLib/loader_plugins/edfparser.cpp

@@ -8,6 +8,7 @@
  * for more details. */
 
 #include <QDateTime>
+#include <QTimeZone>
 #include <QDebug>
 #include <QFile>
 #include <QMutexLocker>
@@ -35,6 +36,9 @@ EDFInfo::EDFInfo()
 //    fileData = nullptr;
 }
 
+    int EDFInfo::TZ_offset = QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime());
+    QTimeZone EDFInfo::localNoDST = QTimeZone(TZ_offset);
+
 EDFInfo::~EDFInfo()
 {
 //    if ( fileData ) {
@@ -83,6 +87,20 @@ bool EDFInfo::Open(const QString & name)
     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 ok;
@@ -97,7 +115,7 @@ bool EDFInfo::parseHeader( EDFHeaderRaw *hdrPtr )
 
     edfHdr.patientident=QString::fromLatin1(hdrPtr->patientident,80).trimmed();
     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
     // The solution is left for the afflicted - it won't be me!
     QDate d2 = edfHdr.startdate_orig.date();

oscar/SleepLib/loader_plugins/edfparser.h

@@ -14,6 +14,8 @@
 #include <QVector>
 #include <QHash>
 #include <QList>
+#include <QDateTime>
+#include <QTimeZone>
 
 #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
 
+    static QDateTime getStartDT(const QString str);                    //! \brief Returns the start time using noLocalDST
+
 //  The data members follow
 
+    static int  TZ_offset;
+    static QTimeZone localNoDST;
+
     QString filename;								//!	\brief For debug and error messages
 
     EDFHeaderQT edfHdr;                             //! \brief The header in a QT friendly form

oscar/SleepLib/loader_plugins/resmed_loader.cpp

@@ -699,13 +699,13 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
                 continue;
             }
         } else if (len == 8) {        // test directory date
-        //  if (ignoreOldSessions) {
             QDate dirDate = QDate().fromString(filename, "yyyyMMdd");
             if (dirDate < firstImport) {
+#ifdef SESSION_DEBUG
                 qDebug() << "Skipping directory - ignore before " << filename;
+#endif
                 continue;
             }
-        //  }
         } else {
             qDebug() << "Skipping directory - bad name size " << filename;
             continue;
@@ -782,10 +782,8 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
             date = date.addDays(-1);
         }
 
-//      if (ignoreOldSessions) {
         if (date < firstImport)
             continue;
-//      }
 
         // Chop off the .gz component if it exists, it's not needed at this stage
         if (filename.endsWith(STR_ext_gz)) {
@@ -950,7 +948,9 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
 
         //  if (ignoreOldSessions) {
                 if (date < firstImport) {
-//                  qDebug() << "Skipping" << date.toString() << "Before" << ignoreBefore.date().toString();
+#ifdef SESSION_DEBUG
+                   qDebug() << "Skipping" << date.toString() << "Before" << ignoreBefore.date().toString();
+#endif
                     continue;
                 }
         //  }
@@ -958,7 +958,9 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
             auto rit = resdayList.find(date);
             if (rit != resdayList.end()) {
                 // 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";
+#endif
                 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
                     validday=true;
             }
-            if (!validday) {
+            if ( ! validday) {
                 // There are no mask on/off events, so this STR day is useless.
+#ifdef SESSION_DEBUG
                 qDebug() << "Skipping" << date.toString() << "No mask events";
+#endif
                 continue;
             }
 
@@ -1271,7 +1275,7 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
                     static bool warn=false;
                     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";
-                        sleep(1);
+//                        sleep(1);
                         warn = true;
                     }
 
@@ -1463,7 +1467,6 @@ void BackupSTRfiles( const QString path, const QString strBackupPath, MachineInf
             QFile::exists(gzfile) && QFile::remove(gzfile);
 
         STRmap[date] = STRFile(backupfile, stredf);
-//	delete stredf;
     }   // end for walking the STR files list
 }
 
@@ -1563,8 +1566,9 @@ EDFduration getEDFDuration(const QString & filename)
         }
 
         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)) {
             file.close();
@@ -1590,8 +1594,8 @@ EDFduration getEDFDuration(const QString & filename)
         char datebytes[17] = {0};
         gzread(f, (char *)&datebytes, 16);
         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
             gzclose(f);
@@ -1616,7 +1620,7 @@ EDFduration getEDFDuration(const QString & filename)
         d2.setDate(d2.year() + 100, d2.month(), d2.day());
         startDate.setDate(d2);
     }
-    if (!startDate.isValid()) {
+    if ( ! startDate.isValid() ) {
         qDebug() << "Invalid date time retreieved parsing EDF duration for" << filename;
         return EDFduration(0, 0, filename);
     }
@@ -1628,8 +1632,10 @@ EDFduration getEDFDuration(const QString & filename)
     quint32 end = start + rec_duration * num_records;
 
     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();
 
     start = qMin(st2, start);	// They should be the same, usually
@@ -1637,7 +1643,6 @@ EDFduration getEDFDuration(const QString & filename)
     if (end < start)
         end = qMax(st2, start);
 
-
     EDFduration dur(start, end, filename);
 
     dur.type = lookupEDFType(filename);
@@ -1699,7 +1704,7 @@ void StoreSummaryStatistics(Session * sess, STRRecord & R)
     }
 
     if (R.tv50 >= 0) {
-  //      sess->setp95(CPAP_TidalVolume, R.tv95);
+//      sess->setp95(CPAP_TidalVolume, R.tv95);
 //      sess->setp50(CPAP_TidalVolume, R.tv50);
         sess->setMax(CPAP_TidalVolume, R.tvmax);
     }
@@ -1839,9 +1844,6 @@ struct OverlappingEDF {
 
 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->str.date.isValid()) {
             // This condition should be impossible, but just in case something gets fudged up elsewhere later
@@ -2148,7 +2150,6 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
 
     if (!edf.Parse()) {
         qDebug() << "LoadCSL failed to parse" << path;
-//	fileData->clear();
         return false;
     }
 
@@ -2197,8 +2198,6 @@ bool ResmedLoader::LoadCSL(Session *sess, const QString & path)
         qDebug() << "Unfinished csr event in " << edf.filename;
     }
 
-//    fileData->clear();
-
 #ifdef DEBUG_EFFICIENCY
     timeMutex.lock();
     timeInLoadCSL += time.elapsed();
@@ -2228,7 +2227,6 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
 
     if (!edf.Parse()) {
         qDebug() << "LoadEVE failed to parse" << path;
-//	fileData->clear();
         return false;
     }
 
@@ -2294,8 +2292,6 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
         }
     }
 
-//    fileData->clear();
-
 #ifdef DEBUG_EFFICIENCY
     timeMutex.lock();
     timeInLoadEVE += time.elapsed();
@@ -2324,7 +2320,6 @@ bool ResmedLoader::LoadBRP(Session *sess, const QString & path)
 #endif
     if (!edf.Parse()) {
         qDebug() << "LoadBRP failed to parse" << path;
-//	fileData->clear();
         return false;
     }
 #ifdef DEBUG_EFFICIENCY
@@ -2391,8 +2386,6 @@ bool ResmedLoader::LoadBRP(Session *sess, const QString & path)
         }
     }
 
-//    fileData->clear();
-
 #ifdef DEBUG_EFFICIENCY
     timeMutex.lock();
     timeInLoadBRP += time.elapsed();
@@ -2426,7 +2419,6 @@ bool ResmedLoader::LoadSAD(Session *sess, const QString & path)
 
     if (!edf.Parse()) {
         qDebug() << "LoadSAD failed to parse" << path;
-//	fileData->clear();
         return false;
     }
 
@@ -2471,8 +2463,6 @@ bool ResmedLoader::LoadSAD(Session *sess, const QString & path)
         }
     }
 
-//    fileData->clear();
-
 #ifdef DEBUG_EFFICIENCY
     timeMutex.lock();
     timeInLoadSAD += time.elapsed();
@@ -2502,7 +2492,6 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
 
     if (!edf.Parse()) {
         qDebug() << "LoadPLD failed to parse" << path;
-//	fileData->clear();
         return false;
     }
 
@@ -2647,8 +2636,6 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
 
     }
 
-//    fileData->clear();
-
 #ifdef DEBUG_EFFICIENCY
     timeMutex.lock();
     timeInLoadPLD += time.elapsed();