From 903482f5ac51f3cde72b4bf5c4c63b609e92a145 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 2 Apr 2020 20:56:30 -0400 Subject: [PATCH 1/7] Revert the HTML Tidy mangling of release_notes.html that broke OSCAR rendering. --- oscar/docs/release_notes.html | 519 ++++++++++++++++++---------------- 1 file changed, 275 insertions(+), 244 deletions(-) diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index c87b6fa9..e646855c 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -1,245 +1,276 @@ - - - - - - release_notes - - - - Changes and fixes in OSCAR v1.1.0-BETA-? - - Changes and fixes in OSCAR v1.1.0-beta-2 - - Changes and fixes in OSCAR v1.1.0-beta-1 - - Changes and fixes in OSCAR v1.1.0-testing-4 - - Changes and fixes in OSCAR v1.1.0-testing-3 - NOTE: Translations have NOT yet been updated for these changes - - Changes and fixes in OSCAR v1.1.0-testing-2 - NOTE: Translations have NOT yet been updated for these changes - - Changes and fixes in OSCAR v1.1.0-testing-1 - NOTE: Translations have NOT yet been updated for these changes - - Changes and fixes in OSCAR v1.0.1-r-1 - - Changes and fixes in OSCAR v1.0.0-beta-9 - - Changes and fixes in OSCAR v1.0.0-beta-8 - - Changes and fixes in OSCAR v1.0.0-beta-7 - - Changes and fixes in OSCAR v1.0.0-beta-6 - - Changes and fixes in OSCAR v1.0.0-beta-5 - - Changes and fixes in OSCAR v1.0.0-beta-4 - - Changes and fixes in OSCAR v1.0.0-beta-3 - - SleepyHead v1.1.0-unstable-0 - + + + + +

+Changes and fixes in OSCAR v1.1.0-BETA? +

+ +

+Changes and fixes in OSCAR v1.1.0-beta-2 +

+ +

+Changes and fixes in OSCAR v1.1.0-beta-1 +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-4 +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-3 +
NOTE: Translations have NOT yet been updated for these changes +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-2 +
NOTE: Translations have NOT yet been updated for these changes +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-1 +
NOTE: Translations have NOT yet been updated for these changes +

+

+ +

+Changes and fixes in OSCAR v1.0.1-r-1 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-9 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-8 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-7 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-6 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-5 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-4 +

+

+

+Changes and fixes in OSCAR v1.0.0-beta-3 +

+

+ +

+SleepyHead v1.1.0-unstable-0 +

+

+ From 1591feb2076634b30febab70e2839a0ac374e2e6 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 2 Apr 2020 21:15:13 -0400 Subject: [PATCH 2/7] Reapply Arie's many grammatical fixes to the release notes. --- oscar/docs/release_notes.html | 100 +++++++++++++++++----------------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index e646855c..0e7100d4 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -1,9 +1,8 @@  - + -

-Changes and fixes in OSCAR v1.1.0-BETA? +Changes and fixes in OSCAR v1.1.0-BETA-?

Changes and fixes in OSCAR v1.1.0-testing-3 -
NOTE: Translations have NOT yet been updated for these changes +NOTE: Translations have NOT yet been updated for these changes

Changes and fixes in OSCAR v1.1.0-testing-2 -
NOTE: Translations have NOT yet been updated for these changes +NOTE: Translations have NOT yet been updated for these changes

Changes and fixes in OSCAR v1.1.0-testing-1 -
NOTE: Translations have NOT yet been updated for these changes +NOTE: Translations have NOT yet been updated for these changes

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index acca00ac..3fdfdff3 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -272,6 +272,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = { { "400X110", 0, 6, "DreamStation CPAP Pro" }, { "400X150", 0, 6, "DreamStation CPAP Pro" }, { "500X110", 0, 6, "DreamStation Auto CPAP" }, + { "500X120", 0, 6, "DreamStation Auto CPAP" }, { "500X130", 0, 6, "DreamStation Auto CPAP" }, { "500X150", 0, 6, "DreamStation Auto CPAP" }, { "501X120", 0, 6, "DreamStation Auto CPAP with P-Flex" }, @@ -4973,7 +4974,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void) // That's represented by a mask-off event 19129 seconds after the mask-on, then a time-elapsed // event after 65535 seconds, then an equipment off event after another 616 seconds. tt += data[pos] | (data[pos+1] << 8); - // TODO: see if this event exists in other versions + // TODO: see if this event exists in earlier versions break; case 5: // Clock adjustment? CHECK_VALUE(pos, 1); // Always first @@ -6113,10 +6114,10 @@ bool PRS1DataChunk::ParseSummaryF5V012(void) CHECK_VALUE(chunk_size, 1); // and the only record in the session. if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1"); break; - case 7: // ??? + case 7: // Time Elapsed? tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) break; - case 8: // ??? + case 8: // Time Elapsed? How is this different from 7? tt += data[pos] | (data[pos+1] << 8); // This also adds to the total duration (otherwise it won't match report) break; case 9: // Humidifier setting change @@ -7075,6 +7076,9 @@ bool PRS1DataChunk::ParseSummaryF0V6(void) //CHECK_VALUE(data[pos+3], 0); } break; + case 0x09: // Time Elapsed (event 4 in F0V4) + tt += data[pos] | (data[pos+1] << 8); + break; case 0x0a: // Humidifier setting change tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) this->ParseHumidifierSettingV3(data[pos+2], data[pos+3]); From f5bb5655e0cd7d9581d0226f24a5ea07536fa3eb Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sat, 4 Apr 2020 17:37:19 -0400 Subject: [PATCH 7/7] Enable the Daily tab/button after importing data from the Data menu. Previously only oximetry data imported via the wizard would update the button. (As would quitting/relaunching, or switching profiles.) --- oscar/mainwindow.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 53e8a30e..8d4007ea 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -2328,6 +2328,8 @@ void MainWindow::on_actionImport_ZEO_Data_triggered() Notify(tr("Imported %1 ZEO session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); qDebug() << "Imported" << c << "ZEO sessions"; PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with ZEO data at\n\n%1").arg(filename), tr("Up to date")); } else { @@ -2357,6 +2359,8 @@ void MainWindow::on_actionImport_Dreem_Data_triggered() Notify(tr("Imported %1 Dreem session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); qDebug() << "Imported" << c << "Dreem sessions"; PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with Dreem data at\n\n%1").arg(filename), tr("Up to date")); } else { @@ -2451,6 +2455,8 @@ void MainWindow::on_actionImport_Somnopose_Data_triggered() Notify(tr("Somnopause Data Import complete")); PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); daily->LoadDate(daily->getDate()); } @@ -2477,6 +2483,8 @@ void MainWindow::on_actionImport_Viatom_Data_triggered() if (c > 0) { Notify(tr("Imported %1 oximetry session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with oximetry data at\n\n%1").arg(filename), tr("Up to date")); } else {