From 90434d5f11f1620d1c3d21acc77ecd98c81d4d34 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 26 Mar 2020 09:54:55 -0400
Subject: [PATCH] Bump the PRS1 loader version to force a rebuild, update
 release notes.

Also fix a typo in the rebuild dialog.
---
 oscar/SleepLib/loader_plugins/prs1_loader.h |  2 +-
 oscar/SleepLib/profiles.cpp                 |  2 +-
 oscar/daily.cpp                             |  2 ++
 oscar/docs/release_notes.html               | 14 +++++++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index cf5adc75..55e4278e 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -25,7 +25,7 @@
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation
 // BEFORE making a release
-const int prs1_data_version = 17;
+const int prs1_data_version = 18;
 //
 //********************************************************************************************
 #if 0  // Apparently unused
diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index 4c079452..fd2e52c6 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -541,7 +541,7 @@ void Profile::DataFormatError(Machine *m)
         msg = msg + QObject::tr("This means you will need to import this machine data again afterwards from your own backups or data card.") + "<br/><br/>";
     }
 
-    msg += "<font size=+1>"+QObject::tr("Important:")+"</font> "+QObject::tr("Once you upgrade, you <font size=+1>can not</font> use this profile with the previous version anymore.")+"<br/><br/>"+
+    msg += "<font size=+1>"+QObject::tr("Important:")+"</font> "+QObject::tr("Once you upgrade, you <font size=+1>cannot</font> use this profile with the previous version anymore.")+"<br/><br/>"+
             QObject::tr("If you are concerned, click No to exit, and backup your profile manually, before starting OSCAR again.")+ "<br/><br/>";
     msg = msg + "<font size=+1>"+QObject::tr("Are you ready to upgrade, so you can run the new version of OSCAR?")+"</font>";
 
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index e57b6444..85bf2d5b 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -1607,6 +1607,8 @@ void Daily::Load(QDate date)
     if (cpap) {
         float hours=day->hours(MT_CPAP);
         if (GraphView->isEmpty() && (hours>0)) {
+            // TODO: Eventually we should get isBrick from the loader, since some summary days
+            // on a non-brick might legitimately have no graph data.
             if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea)) {
                 GraphView->setEmptyText(STR_Empty_Brick);
 
diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html
index 57f74253..52a8aca2 100644
--- a/oscar/docs/release_notes.html
+++ b/oscar/docs/release_notes.html
@@ -6,6 +6,19 @@
 Which was written and copyright 2011-2018 &copy; Mark Watkins
 </p>
 
+<p>
+<b>Changes and fixes in OSCAR v1.1.0-BETA?</b>
+<ul>
+<li>[fix] Improved import of Philips Respironics settings. In particular:
+<ul>
+<li>The settings for PC, S, and S/T modes are now displayed correctly.</li>
+<li>AVAPS settings are now displayed correctly, including target tidal volume.</li>
+<li>Backup breath settings are now imported and displayed.</li>
+<li>The settings for CPAP-Check and Auto-Trial modes are now displayed correctly.</li>
+</ul>
+<li>[fix] Several crashes have been fixed.
+</ul>
+
 <p>
 <b>Changes and fixes in OSCAR v1.1.0-beta-2</b>
 <ul>
@@ -15,7 +28,6 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
 <li>[fix] Improved import of Philips Respironics flex and humidification settings</li>
 <li>[new]Extensive re-organization of the ResMed loader to facilitate understanding and future improvements</li>
 </ul>
-</b>
 
 <p>
 <b>Changes and fixes in OSCAR v1.1.0-beta-1</b>