From b6f13ae0d6f74c65188b447807309da023254a0a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 30 Sep 2014 18:40:12 +1000 Subject: [PATCH] Added Records box back --- sleepyhead/SleepLib/profiles.cpp | 2 +- sleepyhead/docs/release_notes.html | 9 +- sleepyhead/mainwindow.ui | 142 ++++++++-------- sleepyhead/statistics.cpp | 262 +++++++++++++++++++++++++++++ sleepyhead/statistics.h | 7 + 5 files changed, 347 insertions(+), 75 deletions(-) diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 6c005884..83f0dbd5 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -1090,7 +1090,7 @@ int Profile::countCompliantDays(MachineType mt, QDate start, QDate end) int days = 0; do { - Day *day = GetGoodDay(date, mt); + Day *day = FindGoodDay(date, mt); if (day) { if (day->hours(mt) > compliance) { days++; } diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html index ad4f2786..59265720 100644 --- a/sleepyhead/docs/release_notes.html +++ b/sleepyhead/docs/release_notes.html @@ -7,7 +7,9 @@

Greetings!

Here is a definitely new and improved SleepyHead build :)

-

The New Features and Bugfixes list is getting a little scary, and I completely rewrote some important parts.. so let's have a Version Bump!

+

Warning: This is a test build, not all features are complete or will work 100% as intended yet!

+ +

This is the first public test build in a while, so there is a lot of new stuff to take in.

First up, a warning: Some new stuff is going down that might break on you.. Overview overhead figures aren't completely finished yet. I know about these and am working on them. You will likely have to Rebuild CPAP data to get this to behave properly.. If you have to do it more than once, somethings not right, and I need to know.

@@ -17,8 +19,7 @@ You will likely have to Rebuild CPAP data to get this to behave properly.. If yo You can even take these graph clones with you to another day! They aren't saved though. they are gone when you close SleepyHead.

Y-Axis menu allows for better control of Y-Axis scaling, all of this has been improved greatly... no more having to go into preferences to set minimum/maximum values (that SleepyHead wasn't honouring properly anyway). Now you can adjust these settings live for each graph!

-

Fisher & Paykel support got a tweak and timestamps should be correct, and even the new AirSense machines import mostly. -I still need to to see more AirSense data to get everything right though!

+

Line Cursor mode (F3 to toggles) is a very powerful new feature.. Play with it and see what it does. It's off by default because it takes a lot more CPU power to work.

Sleep Well, and good luck!

JediMark

@@ -26,6 +27,8 @@ I still need to to see more AirSense data to get everything right though!


New features & bug fixes in v0.9.8
+
  • Rework of Records box
    • +
  • Initial support for Philips Respironics System One Oximetery attachment
  • Removed old unused Mask Preferences and other junk
  • Complete Overview SummaryChart overhaul
  • Prescription changes now caches to disk to save having to reload all data every time
    • diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index e0b17f98..6a43909b 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -926,7 +926,7 @@ QTabWidget::Rounded - 0 + 1 false @@ -937,6 +937,71 @@ false + + + Welcome + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 14 + 50 + false + false + + + + background-color: red; +color: yellow; + + + <html><head/><body><p><span style=" font-weight:600;">Warning: </span>This is pre-release software, some parts of this program may not yet function as intended.</p></body></html> + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + 0 + 0 + + + + + about:blank + + + + + + &Statistics @@ -1065,71 +1130,6 @@ - - - Welcome - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 14 - 50 - false - false - - - - background-color: red; -color: yellow; - - - <html><head/><body><p><span style=" font-weight:600;">Warning: </span>This is pre-release software, some parts of this program may not yet function as intended.</p></body></html> - - - Qt::AlignHCenter|Qt::AlignTop - - - - - - - - 0 - 0 - - - - - about:blank - - - - - - @@ -1334,7 +1334,7 @@ color: yellow; - 180 + 230 0 @@ -1484,7 +1484,7 @@ QToolBox::tab:selected { 1 - 0 + 2 0 @@ -1494,7 +1494,7 @@ QToolBox::tab:selected { 0 0 - 180 + 250 724 @@ -1908,7 +1908,7 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 - 180 + 250 724 @@ -3056,7 +3056,7 @@ border-radius: 10px; 0 0 - 180 + 230 724 diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index a399dae9..1259b308 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -1747,6 +1747,9 @@ QString Statistics::GenerateHTML() html += GenerateRXChanges(); html += GenerateMachineList(); + UpdateRecordsBox(); + + html += ""; //updateFavourites(); @@ -1754,6 +1757,265 @@ QString Statistics::GenerateHTML() return html; } +void Statistics::UpdateRecordsBox() +{ + QString html = ""; + + Machine * cpap = p_profile->GetMachine(MT_CPAP); + if (cpap) { + QDate first = p_profile->FirstGoodDay(MT_CPAP); + QDate last = p_profile->LastGoodDay(MT_CPAP); + + ///////////////////////////////////////////////////////////////////////////////////// + /// Compliance and usage information + ///////////////////////////////////////////////////////////////////////////////////// + int totaldays = p_profile->countDays(MT_CPAP, first, last); + int compliant = p_profile->countCompliantDays(MT_CPAP, first, last); + + float comperc = (100.0 / float(totaldays)) * float(compliant); + + html += ""+QObject::tr("CPAP Usage")+"
    "; + html += QObject::tr("Days Used: %1").arg(totaldays) + "
    "; + html += QObject::tr("Low Use Days: %1").arg(totaldays - compliant) + "
    "; + html += QObject::tr("Compliance: %1%").arg(comperc, 0, 'f', 1) + "
    "; + + ///////////////////////////////////////////////////////////////////////////////////// + /// AHI Records + ///////////////////////////////////////////////////////////////////////////////////// + + if (p_profile->session->preloadSummaries()) { + const int show_records = 5; + QMultiMap::iterator it; + QMultiMap::iterator it_end; + + QMultiMap ahilist; + int baddays = 0; + + for (QDate date = first; date <= last; date = date.addDays(1)) { + Day * day = p_profile->GetGoodDay(date, MT_CPAP); + if (!day) continue; + + float ahi = day->calcAHI(); + if (ahi >= 5) { + baddays++; + } + ahilist.insert(ahi, date); + } + html += QObject::tr("Days AHI of 5 or greater: %1").arg(baddays) + "

    "; + + + if (ahilist.size() > (show_records * 2)) { + it = ahilist.begin(); + it_end = ahilist.end(); + + html += ""+QObject::tr("Best AHI")+"
    "; + + for (int i=0; (i").arg(it.value().toString(Qt::ISODate)) + +QObject::tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
    "; + + } + + html += "
    "; + + html += ""+QObject::tr("Worst AHI")+"
    "; + + it = ahilist.end() - 1; + it_end = ahilist.begin(); + for (int i=0; (i").arg(it.value().toString(Qt::ISODate)) + +QObject::tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
    "; + + } + + html += "
    "; + } + + ///////////////////////////////////////////////////////////////////////////////////// + /// Flow Limitation Records + ///////////////////////////////////////////////////////////////////////////////////// + + ahilist.clear(); + for (QDate date = first; date <= last; date = date.addDays(1)) { + Day * day = p_profile->GetGoodDay(date, MT_CPAP); + if (!day) continue; + + float val = 0; + if (day->channelHasData(CPAP_FlowLimit)) { + val = day->calcIdx(CPAP_FlowLimit); + } else if (day->channelHasData(CPAP_FLG)) { + // Use 90th percentile + val = day->calcPercentile(CPAP_FLG); + } + ahilist.insert(val, date); + } + + int cnt = 0; + if (ahilist.size() > (show_records * 2)) { + it = ahilist.begin(); + it_end = ahilist.end(); + + html += ""+QObject::tr("Best Flow Limitation")+"
    "; + + for (int i=0; (i").arg(it.value().toString(Qt::ISODate)) + +QObject::tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
    "; + + } + + html += "
    "; + + html += ""+QObject::tr("Worst Flow Limtation")+"
    "; + + it = ahilist.end() - 1; + it_end = ahilist.begin(); + for (int i=0; (i 0) { + html += QString("").arg(it.value().toString(Qt::ISODate)) + +QObject::tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
    "; + cnt++; + } + } + if (cnt == 0) { + html+= ""+QObject::tr("No Flow Limitation on record")+"
    "; + } + + html += "
    "; + } + + ///////////////////////////////////////////////////////////////////////////////////// + /// Large Leak Records + ///////////////////////////////////////////////////////////////////////////////////// + + ahilist.clear(); + for (QDate date = first; date <= last; date = date.addDays(1)) { + Day * day = p_profile->GetGoodDay(date, MT_CPAP); + if (!day) continue; + + float leak = day->calcPON(CPAP_LargeLeak); + ahilist.insert(leak, date); + } + + cnt = 0; + if (ahilist.size() > (show_records * 2)) { + html += ""+QObject::tr("Worst Large Leaks")+"
    "; + + it = ahilist.end() - 1; + it_end = ahilist.begin(); + + for (int i=0; (i 0) { + html += QString("").arg(it.value().toString(Qt::ISODate)) + +QObject::tr("Date: %1 Leak: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
    "; + cnt++; + } + + } + if (cnt == 0) { + html+= ""+QObject::tr("No Large Leaks on record")+"
    "; + } + + html += "
    "; + } + + + ///////////////////////////////////////////////////////////////////////////////////// + /// ÇSR Records + ///////////////////////////////////////////////////////////////////////////////////// + + cnt = 0; + if (p_profile->hasChannel(CPAP_CSR)) { + ahilist.clear(); + for (QDate date = first; date <= last; date = date.addDays(1)) { + Day * day = p_profile->GetGoodDay(date, MT_CPAP); + if (!day) continue; + + float leak = day->calcPON(CPAP_CSR); + ahilist.insert(leak, date); + } + + if (ahilist.size() > (show_records * 2)) { + html += ""+QObject::tr("Worst CSR")+"
    "; + + it = ahilist.end() - 1; + it_end = ahilist.begin(); + for (int i=0; (i 0) { + html += QString("").arg(it.value().toString(Qt::ISODate)) + +QObject::tr("Date: %1 CSR: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "
    "; + cnt++; + } + } + if (cnt == 0) { + html+= ""+QObject::tr("No CSR on record")+"
    "; + } + + html += "
    "; + } + } + + } else { + html += "
    "+QObject::tr("Want more information?")+"
    "; + html += ""+QObject::tr("SleepyHead needs all summary data loaded to calculate best/worst data for individual days.")+"

    "; + html += ""+QObject::tr("Please enable Pre-Load Summaries checkbox in preferences to make sure this data is available.")+"

    "; + } + + + ///////////////////////////////////////////////////////////////////////////////////// + /// Sort the RX list to get best and worst settings. + ///////////////////////////////////////////////////////////////////////////////////// + QList list; + QMap::iterator ri_end = rxitems.end(); + QMap::iterator ri; + + for (ri = rxitems.begin(); ri != ri_end; ++ri) { + list.append(&ri.value()); + ri.value().highlight = 0; + } + + qSort(list.begin(), list.end(), rxAHILessThan); + + + if (list.size() >= 2) { + html += ""+QObject::tr("Best RX Setting")+"
    "; + const RXItem & rxbest = *list.at(0); + html += QString("").arg(rxbest.start.toString(Qt::ISODate)).arg(rxbest.end.toString(Qt::ISODate)) + + QObject::tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "
    "; + html += QString("%1").arg(rxbest.machine->model()) + "
    "; + html += QString("Serial: %1").arg(rxbest.machine->serial()) + "
    "; + html += QObject::tr("Culminative AHI: %1").arg(double(rxbest.ahi) / rxbest.hours, 0, 'f', 2) + "
    "; + html += QObject::tr("Culminative Hours: %1").arg(rxbest.hours, 0, 'f', 2) + "
    "; + html += QString("%1").arg(rxbest.pressure) + "
    "; + html += QString("%1").arg(rxbest.relief) + "
    "; + html += "
    "; + + html += ""+QObject::tr("Worst RX Setting")+"
    "; + const RXItem & rxworst = *list.at(list.size() -1); + html += QString("").arg(rxworst.start.toString(Qt::ISODate)).arg(rxworst.end.toString(Qt::ISODate)) + + QObject::tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "
    "; + html += QString("%1").arg(rxworst.machine->model()) + "
    "; + html += QString("Serial: %1").arg(rxworst.machine->serial()) + "
    "; + html += QObject::tr("Culminative AHI: %1").arg(double(rxworst.ahi) / rxworst.hours, 0, 'f', 2) + "
    "; + html += QObject::tr("Culminative Hours: %1").arg(rxworst.hours, 0, 'f', 2) + "
    "; + + html += QString("%1").arg(rxworst.pressure) + "
    "; + html += QString("%1").arg(rxworst.relief) + "
    "; + } + } + + + + html += ""; + mainwin->setRecBoxHTML(html); +} + + QString StatisticsRow::value(QDate start, QDate end) { diff --git a/sleepyhead/statistics.h b/sleepyhead/statistics.h index 8bfb6248..946194af 100644 --- a/sleepyhead/statistics.h +++ b/sleepyhead/statistics.h @@ -144,6 +144,8 @@ public: short highlight; }; + + class Statistics : public QObject { Q_OBJECT @@ -158,6 +160,8 @@ class Statistics : public QObject QString GenerateMachineList(); QString GenerateRXChanges(); + void UpdateRecordsBox(); + protected: // Using a map to maintain order @@ -167,6 +171,9 @@ class Statistics : public QObject QMap rxitems; + QList record_best_ahi; + QList record_worst_ahi; + signals: public slots: