From ce18739d14c58bb1bf80523c94b6b6121ac824fd Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sun, 23 Aug 2020 15:30:38 -0700 Subject: [PATCH] ResMed and Oximetry loader enhancements - Oximetry loader from file now remembers last directory data was imported from. - ResMed loader loads from last day or oldest purge date if a day was purged since last import. purgeDate added to MachineInfo to implement this. Purge date set when a day is purged and cleared after an import. --- Htmldocs/release_notes.html | 1 + oscar/SleepLib/common.h | 1 + .../SleepLib/loader_plugins/resmed_loader.cpp | 8 ++- oscar/SleepLib/machine.cpp | 5 +- oscar/SleepLib/machine.h | 3 ++ oscar/SleepLib/machine_common.h | 6 ++- oscar/SleepLib/profiles.cpp | 14 ++++- oscar/mainwindow.cpp | 52 ++----------------- oscar/oximeterimport.cpp | 10 ++-- 9 files changed, 43 insertions(+), 57 deletions(-) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index fec6dcf6..161a9161 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -40,6 +40,7 @@
  • [fix] Overview tooltips now list chart components in same order as displayed in chart.
  • [fix] Overview graphs now show last day on charts for timezones near GMT.
  • [fix] Welcome page calculation of days since last import fixed.
    • +
  • [fix] Oximetry import from file now remembers last directory imported from.

    • Changes and fixes in OSCAR v1.1.1 diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index 8ddadca4..f5f47382 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -149,6 +149,7 @@ const QString STR_GEN_DataFolder = "DataFolder"; const QString STR_PREF_ReimportBackup = "ReimportBackup"; const QString STR_PREF_LastCPAPPath = "LastCPAPPath"; +const QString STR_PREF_LastOximetryPath = "LastOximetryPath"; const QString STR_MACH_ResMed = "ResMed"; const QString STR_MACH_PRS1 = "PRS1"; diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index eaf134d6..2dacf020 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -337,8 +337,12 @@ int ResmedLoader::Open(const QString & dirpath) qDebug() << "We have seen this machime"; mach->setInfo( info ); // update info 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; // re-import the last day, to pick up partial days + QDate purgeDate = mach->purgeDate(); + if (purgeDate.isValid()) { + firstImportDay = min(firstImportDay, purgeDate); + } +// 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 } else { // Starting from new beginnings - new or purged qDebug() << "New machine or just purged"; @@ -673,6 +677,8 @@ int ResmedLoader::Open(const QString & dirpath) qDebug() << "Total Events " << event_cnt; qDebug() << "Total new Sessions " << num_new_sessions; + mach->clearPurgeDate(); + return num_new_sessions; } // end Open() diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp index 78d489e0..15ce7756 100644 --- a/oscar/SleepLib/machine.cpp +++ b/oscar/SleepLib/machine.cpp @@ -611,7 +611,10 @@ void Machine::setLoaderName(QString value) void Machine::setInfo(MachineInfo inf) { - info = inf; + MachineInfo merged = inf; + if (info.purgeDate.isValid()) merged.purgeDate = info.purgeDate; + if (info.lastimported.isValid()) merged.lastimported = info.lastimported; + info = merged; m_loader = GetLoader(inf.loadername); } diff --git a/oscar/SleepLib/machine.h b/oscar/SleepLib/machine.h index fb1cdda3..6de7a430 100644 --- a/oscar/SleepLib/machine.h +++ b/oscar/SleepLib/machine.h @@ -194,12 +194,15 @@ class Machine inline int version() const { return info.version; } inline QDateTime lastImported() const { return info.lastimported; } + inline QDate purgeDate() const { return info.purgeDate; } inline void setModel(QString value) { info.model = value; } inline void setBrand(QString value) { info.brand = value; } inline void setSerial(QString value) { info.serial = value; } inline void setType(MachineType type) { info.type = type; } inline void setCap(quint32 value) { info.cap = value; } + inline void setPurgeDate(QDate value) {info.purgeDate = value; } + inline void clearPurgeDate() {info.purgeDate = QDate(); } bool saveSessionInfo(); bool loadSessionInfo(); diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h index adef8fcb..4e4b5413 100644 --- a/oscar/SleepLib/machine_common.h +++ b/oscar/SleepLib/machine_common.h @@ -16,6 +16,7 @@ #include #include #include +#include using namespace std; @@ -111,8 +112,8 @@ struct MachineInfo { MachineInfo() { type = MT_UNKNOWN; version = 0; cap=0; } MachineInfo(const MachineInfo & /*copy*/) = default; - MachineInfo(MachineType type, quint32 cap, QString loadername, QString brand, QString model, QString modelnumber, QString serial, QString series, QDateTime lastimported, int version) : - type(type), cap(cap), loadername(loadername), brand(brand), model(model), modelnumber(modelnumber), serial(serial), series(series), lastimported(lastimported), version(version) {} + MachineInfo(MachineType type, quint32 cap, QString loadername, QString brand, QString model, QString modelnumber, QString serial, QString series, QDateTime lastimported, int version, QDate purgeDate = QDate()) : + type(type), cap(cap), loadername(loadername), brand(brand), model(model), modelnumber(modelnumber), serial(serial), series(series), lastimported(lastimported), version(version), purgeDate(purgeDate) {} MachineType type; quint32 cap; @@ -124,6 +125,7 @@ struct MachineInfo { QString series; QDateTime lastimported; int version; + QDate purgeDate; }; diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index eac6e6f1..f1004985 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -140,6 +140,7 @@ QString Profile::checkLock() return lockhost; } +// Properties for machines.xml: const QString STR_PROP_Brand = "brand"; const QString STR_PROP_Model = "model"; const QString STR_PROP_Series = "series"; @@ -148,6 +149,7 @@ const QString STR_PROP_SubModel = "submodel"; const QString STR_PROP_Serial = "serial"; const QString STR_PROP_DataVersion = "dataversion"; const QString STR_PROP_LastImported = "lastimported"; +const QString STR_PROP_PurgeDate = "purgedate"; void Profile::addLock() { @@ -169,10 +171,11 @@ bool Profile::OpenMachines() QString filename = p_path+"machines.xml"; QFile file(filename); if (!file.open(QFile::ReadOnly)) { -// qWarning() << "Could not open" << filename.toLocal8Bit().data(); qWarning() << "Could not open" << filename.toLocal8Bit().data() << "for reading, error code" << file.error() << file.errorString(); return false; } +// qDebug() << "OpenMachines opened" << filename.toLocal8Bit().data(); + QDomDocument doc("machines.xml"); if (!doc.setContent(&file)) { @@ -183,7 +186,7 @@ bool Profile::OpenMachines() QDomElement root = doc.firstChild().toElement(); if (root.tagName().toLower() != "machines") { - qDebug() << "No Machines Tag in machines.xml"; + qWarning() << "No Machines Tag in machines.xml"; return false; } @@ -233,6 +236,8 @@ bool Profile::OpenMachines() info.version = e.text().toInt(); } else if (key == STR_PROP_LastImported) { info.lastimported = QDateTime::fromString(e.text(), Qt::ISODate); + } else if (key == STR_PROP_PurgeDate) { + info.purgeDate = QDate::fromString(e.text(), Qt::ISODate); } else if (key == "properties") { QDomElement pe = e.firstChildElement(); for (; !pe.isNull(); pe = pe.nextSiblingElement()) { @@ -311,6 +316,10 @@ bool Profile::StoreMachines() mp.appendChild(doc.createTextNode(m->lastImported().toString(Qt::ISODate))); me.appendChild(mp); + mp = doc.createElement(STR_PROP_PurgeDate); + mp.appendChild(doc.createTextNode(m->purgeDate().toString(Qt::ISODate))); + me.appendChild(mp); + mach.appendChild(me); } @@ -322,6 +331,7 @@ bool Profile::StoreMachines() qWarning() << "Could not open" << filename << "for writing, error code" << file.error() << file.errorString(); return false; } + file.write(doc.toByteArray()); return true; } diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index a18ce540..6a9fbe15 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1776,61 +1776,13 @@ void MainWindow::on_actionPurge_Current_Day_triggered() QList::iterator s; QList list; -//// QList sidlist; // obsolete, see below for (s = day->begin(); s != day->end(); ++s) { list.append(*s); qDebug() << "Purging session ID:" << (*s)->session() << "["+QDateTime::fromTime_t((*s)->session()).toString()+"]"; qDebug() << "First Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realFirst()).toString(); qDebug() << "Last Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realLast()).toString(); -//// sidlist.append((*s)->session()); } -//////// The imported_files.csv has been removed from SH 1.1 ////////// -// QHash skipfiles; -// // Read the already imported file list -// -// QFile impfile(cpap->getDataPath()+"/imported_files.csv"); -// if (impfile.exists()) { -// qDebug() << "Obsolet file exists" << impfile.fileName(); -// if (impfile.open(QFile::ReadOnly)) { -// QTextStream impstream(&impfile); -// QString serial; -// impstream >> serial; -// if (cpap->serial() == serial) { -// QString line, file, str; -// SessionID sid; -// bool ok; -// do { -// line = impstream.readLine(); -// file = line.section(',',0,0); -// str = line.section(',',1); -// sid = str.toInt(&ok); -// if (!sidlist.contains(sid)) { -// skipfiles[file] = sid; -// } -// } while (!impstream.atEnd()); -// } -// } -// impfile.close(); -// // Delete the file -// impfile.remove(); -// -// // Rewrite the file without the sessions being removed. -// if (impfile.open(QFile::WriteOnly)) { -// QTextStream out(&impfile); -// out << cpap->serial(); -// QHash::iterator skit; -// QHash::iterator skit_end = skipfiles.end(); -// for (skit = skipfiles.begin(); skit != skit_end; ++skit) { -// QString a = QString("%1,%2\n").arg(skit.key()).arg(skit.value());; -// out << a; -// } -// out.flush(); -// } -// impfile.close(); -// } // end of obsolte file code -/////////////////////////////////////////////////////////////////////////////////////// - QFile rxcache(p_profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" )); rxcache.remove(); @@ -1845,6 +1797,10 @@ void MainWindow::on_actionPurge_Current_Day_triggered() delete sess; } + // save purge date where later import should start + QDate pd = cpap->purgeDate(); + if (pd.isNull() || day->date() < pd) + cpap->setPurgeDate(day->date()); } day = p_profile->GetDay(date, MT_CPAP); Q_UNUSED(day); diff --git a/oscar/oximeterimport.cpp b/oscar/oximeterimport.cpp index 29429110..6cf2cc3f 100644 --- a/oscar/oximeterimport.cpp +++ b/oscar/oximeterimport.cpp @@ -403,8 +403,9 @@ void OximeterImport::doUpdateProgress(int v, int t) void OximeterImport::on_fileImportButton_clicked() { - - const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); + QString documentsFolder = (*p_profile)[STR_PREF_LastOximetryPath].toString(); + if (documentsFolder.isEmpty()) + documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); qDebug() << "oximod - File Import button clicked"; @@ -438,13 +439,16 @@ void OximeterImport::on_fileImportButton_clicked() ui->informationButton->setVisible(false); importMode = IM_FILE; - if (oximodule->oxisessions.size() > 1) { chooseSession(); } else { // oximodule->setStartTime( ??? ); Nope, it was set in the loader module by the file import routime on_syncButton_clicked(); } + + QDir oxdir(filename.section("/",0,-1)); + (*p_profile)[STR_PREF_LastOximetryPath] = oxdir.canonicalPath(); + qDebug() << "oximod - Finished file import: Oximodule startTime is " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ss"); }