From 055aec77d84a19e019f9866e482c801f1dbf727a Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 31 Oct 2020 09:07:22 -0700 Subject: [PATCH 01/10] Name VERSION as 1.2.1-alpha.0 We don't know what the next release number will be but are setting it above 1.2.0 so that anyone who downloads the repository will know the HEAD is above 1.2.0. --- oscar/VERSION | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oscar/VERSION b/oscar/VERSION index 19c04ec9..de526223 100644 --- a/oscar/VERSION +++ b/oscar/VERSION @@ -1,5 +1,4 @@ // Update the string below to set OSCAR's version and release status. // See https://semver.org/spec/v2.0.0.html for details on format. -#define VERSION "1.2.0" - +#define VERSION "1.2.1-alpha.0" From 7aed374236d12a6e7b5c840e7867b748240b4eed Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 31 Oct 2020 09:10:06 -0700 Subject: [PATCH 02/10] Windows installer now deletes old About box HTML when installing a new version Old HTML files release_notes*.html, credits*.html, and about*.html will be deleted by Windows installers. Previously the installer did not remove old files before installing new files. As a result, obsolete release notes were displayed for non-English languages. --- Building/Windows/BuildInstall.iss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Building/Windows/BuildInstall.iss b/Building/Windows/BuildInstall.iss index f19368f2..f750b401 100644 --- a/Building/Windows/BuildInstall.iss +++ b/Building/Windows/BuildInstall.iss @@ -95,6 +95,11 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" +[InstallDelete] +Type: files; Name: "{app}\Html\release_notes*.html" +Type: files; Name: "{app}\Html\credits*.html" +Type: files; Name: "{app}\Html\about*.html" + [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 From 678e0f9241c72bb38832b240e47e170ae1209bcc Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 31 Oct 2020 09:49:02 -0700 Subject: [PATCH 03/10] Correct leak rate computations on Welcome page Welcome page was calculating current and 7-day averages using the "normal average" method, which averaged just the non-zero readings, giving excessively high numbers. Now computes using "weighted average" resulting in more meaningful numbers. --- oscar/welcome.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index 77f34e01..4afe85bb 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -300,8 +300,8 @@ QString Welcome::GenerateCPAPHTML() //EventDataType lat = day->timeAboveThreshold(CPAP_Leak, p_profile->cpap->leakRedline())/ 60.0; //EventDataType leaks = 1.0/hours * lat; - EventDataType leak = day->avg(CPAP_Leak); - EventDataType leakdays = p_profile->calcAvg(CPAP_Leak, MT_CPAP, starttime, endtime); + EventDataType leak = day->wavg(CPAP_Leak); + EventDataType leakdays = p_profile->calcWavg(CPAP_Leak, MT_CPAP, starttime, endtime); if ((leak < leakdays) && ((leakdays - leak) >= 0.1)) { comp = under; From c09b728e35cc132549dadad2c4c7cf926be06259 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 31 Oct 2020 11:26:03 -0700 Subject: [PATCH 04/10] Update Release Notes --- Htmldocs/release_notes.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index 3f80ee21..2f5f2895 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -11,6 +11,14 @@ For other languages, go to:
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

+ Changes and fixes in OSCAR v1.X.Y +
Portions of OSCAR are © 2019-2020 by + The OSCAR Team

+
    +
  • [fix] Correct calculation of average leak rate on Welcome page.
    • +
  • [fix] Correct installation of non-English Release Notes on Windows.
    • +
+

Changes and fixes in OSCAR v1.2.0
Portions of OSCAR are © 2019-2020 by The OSCAR Team

    From d4c2b74afb3d7fc6bf7b4191cc8a95f182f5bef4 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 31 Oct 2020 17:10:51 -0700 Subject: [PATCH 05/10] Allow non-ASCII (UTF-8) characters in user first and last name in user profile We do this by forcing a UTF-8 byte order marker in the profile.xml file. We also add processing instructions that specify UTF-8, although it seems the BOM is itself sufficient. --- Htmldocs/release_notes.html | 1 + oscar/SleepLib/preferences.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index 2f5f2895..0bac95ec 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -17,6 +17,7 @@
    • [fix] Correct calculation of average leak rate on Welcome page.
    • [fix] Correct installation of non-English Release Notes on Windows.
      • +
    • [fix] User first and last name in Profile window may now have non-ASCII (UTF-8) characters.

    Changes and fixes in OSCAR v1.2.0 diff --git a/oscar/SleepLib/preferences.cpp b/oscar/SleepLib/preferences.cpp index 7efae835..a4e045aa 100644 --- a/oscar/SleepLib/preferences.cpp +++ b/oscar/SleepLib/preferences.cpp @@ -335,6 +335,9 @@ bool Preferences::Save(QString filename) QDomDocument doc(p_name); + QDomProcessingInstruction pi = doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\""); + doc.appendChild(pi); + QDomElement droot = doc.createElement(STR_AppName); doc.appendChild(droot); @@ -368,6 +371,8 @@ bool Preferences::Save(QString filename) } QTextStream ts(&file); + ts.setCodec("UTF-8"); + ts.setGenerateByteOrderMark(true); ts << doc.toString(); file.close(); From 5e75fe8836f117f6df5d0031ad653c4d0fb5c800 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Tue, 3 Nov 2020 14:50:04 -0700 Subject: [PATCH 06/10] Fix OSCAR crash when session not found in Journal file While preparing bookmark HTML for right sidebar, OSCAR was trying to obtain the first MT_JOURNAL session, but was finding a null pointer and then not checking that the pointer was null. However, I don't know under what conditions this situation could happen in the database. At least now it won't crash OSCAR. --- oscar/mainwindow.cpp | 46 +++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index d8fba199..799d5f86 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1197,38 +1197,40 @@ void MainWindow::updateFavourites() if (journal) { if (journal->size() > 0) { Session *sess = journal->firstSession(MT_JOURNAL); - QString tmp; - bool filtered = !bookmarkFilter.isEmpty(); - bool found = !filtered; + if (sess) { + QString tmp; + bool filtered = !bookmarkFilter.isEmpty(); + bool found = !filtered; - if (sess->settings.contains(Bookmark_Start)) { - //QVariantList start=sess->settings[Bookmark_Start].toList(); - //QVariantList end=sess->settings[Bookmark_End].toList(); - QStringList notes = sess->settings[Bookmark_Notes].toStringList(); + if (sess->settings.contains(Bookmark_Start)) { + //QVariantList start=sess->settings[Bookmark_Start].toList(); + //QVariantList end=sess->settings[Bookmark_End].toList(); + QStringList notes = sess->settings[Bookmark_Notes].toStringList(); - if (notes.size() > 0) { - tmp += QString("%2
    ") - .arg(date.toString(Qt::ISODate)) - .arg(date.toString(MedDateFormat)); + if (notes.size() > 0) { + tmp += QString("%2
    ") + .arg(date.toString(Qt::ISODate)) + .arg(date.toString(MedDateFormat)); - tmp += ""; + tmp += ""; - for (int i = 0; i < notes.size(); i++) { - //QDate d=start[i].toDate(); - QString note = notes[i]; + for (int i = 0; i < notes.size(); i++) { + //QDate d=start[i].toDate(); + QString note = notes[i]; - if (filtered && note.contains(bookmarkFilter, Qt::CaseInsensitive)) { - found = true; + if (filtered && note.contains(bookmarkFilter, Qt::CaseInsensitive)) { + found = true; + } + + tmp += "

  • " + note + "
    • "; } - tmp += "
  • " + note + "
    • "; + tmp += ""; } - - tmp += ""; } - } - if (found) { html += tmp; } + if (found) { html += tmp; } + } } } From 4dec283c05971384ec398a1a745b1f0d3c735d26 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Tue, 3 Nov 2020 14:53:40 -0700 Subject: [PATCH 07/10] Update release notes. --- Htmldocs/release_notes.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index 0bac95ec..a55885f4 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -17,7 +17,8 @@
    • [fix] Correct calculation of average leak rate on Welcome page.
    • [fix] Correct installation of non-English Release Notes on Windows.
      • -
    • [fix] User first and last name in Profile window may now have non-ASCII (UTF-8) characters.
      • +
    • [fix] User first and last name in Profile window may now have UTF-8 (non-ASCII) characters.
      • +
    • [fix] Fix rare problem of OSCAR crashing with unusual Journal file.

    Changes and fixes in OSCAR v1.2.0 From 1af5d3ec40fb95cbcd080ea8cb00259ab80c2fda Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Wed, 4 Nov 2020 10:12:19 -0700 Subject: [PATCH 08/10] Improve some qWarning messages. resmed_loader: include all timestamps in "time in future" error messages mainwindow: add qWarning message if first journal session is null pointer --- oscar/SleepLib/loader_plugins/resmed_loader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index df360550..4a2700f4 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -2142,7 +2142,7 @@ void ResDayTask::run() quint32 maskoff = resday->str.maskoff[i]; if ( (maskon > QDateTime::currentDateTime().toTime_t()) || (maskoff > QDateTime::currentDateTime().toTime_t()) ) { - qWarning() << "mask time in future" << resday->date; + qWarning() << "mask time in future" << resday->date << "now" << QDateTime::currentDateTime().toTime_t() << "maskon" << maskon << "maskoff" << maskoff; continue; } if (((maskon>0) && (maskoff>0)) && (maskon != maskoff)) { //ignore very short sessions @@ -2184,7 +2184,7 @@ void ResDayTask::run() for (int i=0; i < maskOnSize; ++i) { if ( (resday->str.maskon[i] > QDateTime::currentDateTime().toTime_t()) || (resday->str.maskoff[i] > QDateTime::currentDateTime().toTime_t()) ) { - qWarning() << "mask time in future" << resday->date; + qWarning() << "mask time in future" << resday->date << "now" << QDateTime::currentDateTime().toTime_t() << "maskon" << resday->str.maskon[i] << "maskoff" << resday->str.maskoff[i]; continue; } if (((resday->str.maskon[i]>0) || (resday->str.maskoff[i]>0)) @@ -2235,7 +2235,7 @@ void ResDayTask::run() EDFduration dur = getEDFDuration(fullpath); if ((dur.start > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) || (dur.end > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) ) { - qWarning() << "Future Date in" << fullpath; + qWarning() << "Future Date in" << fullpath << "now" << QDateTime::currentDateTime().toSecsSinceEpoch() << "maskon" << dur.start << "maskoff" << dur.end; continue; // skip this file } for (int i=overlaps.size()-1; i>=0; --i) { From fac78038809956952124e8b88d1c166b45172da7 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Wed, 4 Nov 2020 10:23:14 -0700 Subject: [PATCH 09/10] Improve error message when null pointer found in journal file --- oscar/mainwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 799d5f86..95cfdf0e 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1197,7 +1197,9 @@ void MainWindow::updateFavourites() if (journal) { if (journal->size() > 0) { Session *sess = journal->firstSession(MT_JOURNAL); - if (sess) { + if (!sess) { + qWarning() << "null session for MT_JOURNAL first session"; + } else { QString tmp; bool filtered = !bookmarkFilter.isEmpty(); bool found = !filtered; From 5fb837ccb9f3aac0b822d0de9f7e5e5306057c78 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Wed, 4 Nov 2020 21:12:05 -0700 Subject: [PATCH 10/10] Daily page enable/disable oximeter session now works correctly. Prevoiusly, disabling an oximeter session could cause bookmarks to be disabled and/or OSCAR to crash. OSCAR was looking up the session for the oximeter session and not noticing it got a Journal session instead. --- oscar/SleepLib/day.cpp | 10 ++++++++++ oscar/SleepLib/day.h | 2 ++ oscar/daily.cpp | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp index 3e701bea..691a1716 100644 --- a/oscar/SleepLib/day.cpp +++ b/oscar/SleepLib/day.cpp @@ -98,6 +98,16 @@ Session *Day::find(SessionID sessid) return nullptr; } +Session *Day::find(SessionID sessid, MachineType mt) +{ + for (auto & sess : sessions) { + if ((sess->session() == sessid) && (sess->s_machtype == mt)) { + return sess; + } + } + return nullptr; +} + void Day::addSession(Session *s) { if (s == nullptr) { diff --git a/oscar/SleepLib/day.h b/oscar/SleepLib/day.h index 8651442c..2691f652 100644 --- a/oscar/SleepLib/day.h +++ b/oscar/SleepLib/day.h @@ -202,6 +202,8 @@ class Day Session *find(SessionID sessid); + Session *find(SessionID sessid, MachineType mt); + //! \brief Returns the number of Sessions in this day record int size() { return sessions.size(); } diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 613a6de7..7bff1515 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -560,7 +560,7 @@ void Daily::Link_clicked(const QUrl &url) if (code=="togglecpapsession") { // Enable/Disable CPAP session day=p_profile->GetDay(previous_date,MT_CPAP); if (!day) return; - Session *sess=day->find(sid); + Session *sess=day->find(sid, MT_CPAP); if (!sess) return; // int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); @@ -571,7 +571,7 @@ void Daily::Link_clicked(const QUrl &url) // webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); } else if (code=="toggleoxisession") { // Enable/Disable Oximetry session day=p_profile->GetDay(previous_date,MT_OXIMETER); - Session *sess=day->find(sid); + Session *sess=day->find(sid, MT_OXIMETER); if (!sess) return; // int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical);