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

Add user alert when unexpected PRS1 data is encountered on import.

Browse Source 
Also rename some variables for clarity.
This commit is contained in:
sawinglogz 2020-01-04 22:06:28 -05:00
parent 26a844c720
commit 43716793b4
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -720,15 +720,21 @@ int PRS1Loader::OpenMachine(const QString & path)
finishAddingSessions(); finishAddingSessions();
// TODO: pop up a warning if m_unexpectedMessages isn't empty, based on if (m_unexpectedMessages.count() > 0 && p_profile->session->warnOnUnexpectedData()) {
// p_profile->session->warnOnUnexpectedData pref. // Compare this to the list of messages previously seen for this machine
// // and only alert if there are new ones.
// TODO: compare this to the list of messages previously seen for this machine QSet<QString> newMessages = m_unexpectedMessages - m->previouslySeenUnexpectedData();
// and only alert if there are new ones. if (newMessages.count() > 0) {
// // TODO: Rework the importer call structure so that this can become an
// TODO: persist the list of previously seen messages along with the current // emit statement to the appropriate import job.
// OSCAR version number in the machine XML record. Reset the list when the QMessageBox::information(QApplication::activeWindow(),
// OSCAR version changes. QObject::tr("Untested Data"),
QObject::tr("Your Philips Respironics %1 (%2) generated data that OSCAR has never seen before.").arg(m->getInfo().model).arg(m->getInfo().modelnumber) +"\n\n"+
QObject::tr("The imported data may not be entirely accurate, so the developers would like a .zip copy of this machine's SD card and matching Encore .pdf reports to make sure OSCAR is handling the data correctly.")
,QMessageBox::Ok);
m->previouslySeenUnexpectedData() += newMessages;
}
}
return m->unsupported() ? -1 : tasks; return m->unsupported() ? -1 : tasks;
} }
@ -813,9 +819,11 @@ Machine* PRS1Loader::CreateMachineFromProperties(QString propertyfile)
if (!s_PRS1ModelInfo.IsTested(props)) { if (!s_PRS1ModelInfo.IsTested(props)) {
qDebug() << info.modelnumber << "untested"; qDebug() << info.modelnumber << "untested";
if (p_profile->session->warnOnUntestedMachine() && !m->untested()) { if (p_profile->session->warnOnUntestedMachine() && m->warnOnUntested()) {
m->setUntested(true); // don't warn the user more than once m->suppressWarnOnUntested(); // don't warn the user more than once
#ifndef UNITTEST_MODE #ifndef UNITTEST_MODE
// TODO: Rework the importer call structure so that this can become an
// emit statement to the appropriate import job.
QMessageBox::information(QApplication::activeWindow(), QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Machine Untested"), QObject::tr("Machine Untested"),
QObject::tr("Your Philips Respironics CPAP machine (Model %1) has not been tested yet.").arg(info.modelnumber) +"\n\n"+ QObject::tr("Your Philips Respironics CPAP machine (Model %1) has not been tested yet.").arg(info.modelnumber) +"\n\n"+

5
oscar/SleepLib/machine.cpp
View File

@ -88,7 +88,10 @@ Machine::Machine(Profile *_profile, MachineID id) : profile(_profile)
day.clear(); day.clear();
highest_sessionid = 0; highest_sessionid = 0;
m_unsupported = false; m_unsupported = false;
m_untested = false; m_suppressUntestedWarning = false;
// TODO: Have the machine write m_suppressUntestedWarning and m_previousUnexpected
// to XML (along with the current OSCAR version number) so that they persist across
// application launches (but reset with each new OSCAR version).
if (!id) { if (!id) {
srand(time(nullptr)); srand(time(nullptr));

8
oscar/SleepLib/machine.h
View File

@ -179,8 +179,9 @@ class Machine
bool unsupported() { return m_unsupported; } bool unsupported() { return m_unsupported; }
void setUnsupported(bool b) { m_unsupported = b; } void setUnsupported(bool b) { m_unsupported = b; }
bool untested() { return m_untested; } bool warnOnUntested() { return m_suppressUntestedWarning == false; }
void setUntested(bool b) { m_untested = b; } void suppressWarnOnUntested() { m_suppressUntestedWarning = true; }
QSet<QString> & previouslySeenUnexpectedData() { return m_previousUnexpected; }
inline MachineType type() const { return info.type; } inline MachineType type() const { return info.type; }
inline QString brand() const { return info.brand; } inline QString brand() const { return info.brand; }
@ -249,7 +250,8 @@ class Machine
MachineInfo info; MachineInfo info;
bool m_unsupported; bool m_unsupported;
bool m_untested; bool m_suppressUntestedWarning;
QSet<QString> m_previousUnexpected;
//! \brief Contains a secondary index of day data, containing just this machines sessions //! \brief Contains a secondary index of day data, containing just this machines sessions
QMap<QDate, Day *> day; QMap<QDate, Day *> day;