chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ResMed and Oximetry loader enhancements

Browse Source 
- 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.
This commit is contained in:
Guy Scharf 2020-08-23 15:30:38 -07:00
parent 5e5af1b541
commit ce18739d14
9 changed files with 43 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -40,6 +40,7 @@
<li>[fix] Overview tooltips now list chart components in same order as displayed in chart.</li>
<li>[fix] Overview graphs now show last day on charts for timezones near GMT.</li>
<li>[fix] Welcome page calculation of days since last import fixed.</li>
<li>[fix] Oximetry import from file now remembers last directory imported from.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.1.1</b>

1
oscar/SleepLib/common.h
View File

@ -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";

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

@ -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()

5
oscar/SleepLib/machine.cpp
View File

@ -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);
}

3
oscar/SleepLib/machine.h
View File

@ -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();

6
oscar/SleepLib/machine_common.h
View File

@ -16,6 +16,7 @@
#include <QString>
#include <QDateTime>
#include <QDebug>
#include <QDate>
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;
};

14
oscar/SleepLib/profiles.cpp
View File

@ -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;
}

52
oscar/mainwindow.cpp
View File

@ -1776,61 +1776,13 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
QList<Session *>::iterator s;
QList<Session *> list;
//// QList<SessionID> 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<QString, SessionID> 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<QString, SessionID>::iterator skit;
// QHash<QString, SessionID>::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);

10
oscar/oximeterimport.cpp
View File

@ -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");
}