chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump the PRS1 loader version to force a rebuild, update release notes.

Browse Source 
Also fix a typo in the rebuild dialog.
This commit is contained in:
sawinglogz 2020-03-26 09:54:55 -04:00
parent a96a665987
commit 90434d5f11
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/loader_plugins/prs1_loader.h
View File

@ -25,7 +25,7 @@
//******************************************************************************************** //********************************************************************************************
// Please INCREMENT the following value when making changes to this loaders implementation // Please INCREMENT the following value when making changes to this loaders implementation
// BEFORE making a release // BEFORE making a release
const int prs1_data_version = 17; const int prs1_data_version = 18;
// //
//******************************************************************************************** //********************************************************************************************
#if 0 // Apparently unused #if 0 // Apparently unused

2
oscar/SleepLib/profiles.cpp
View File

@ -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 = 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/>"; 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>"; msg = msg + "<font size=+1>"+QObject::tr("Are you ready to upgrade, so you can run the new version of OSCAR?")+"</font>";

2
oscar/daily.cpp
View File

@ -1607,6 +1607,8 @@ void Daily::Load(QDate date)
if (cpap) { if (cpap) {
float hours=day->hours(MT_CPAP); float hours=day->hours(MT_CPAP);
if (GraphView->isEmpty() && (hours>0)) { 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)) { if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea)) {
GraphView->setEmptyText(STR_Empty_Brick); GraphView->setEmptyText(STR_Empty_Brick);

14
oscar/docs/release_notes.html
View File

@ -6,6 +6,19 @@
Which was written and copyright 2011-2018 &copy; Mark Watkins Which was written and copyright 2011-2018 &copy; Mark Watkins
</p> </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> <p>
<b>Changes and fixes in OSCAR v1.1.0-beta-2</b> <b>Changes and fixes in OSCAR v1.1.0-beta-2</b>
<ul> <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>[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> <li>[new]Extensive re-organization of the ResMed loader to facilitate understanding and future improvements</li>
</ul> </ul>
</b>
<p> <p>
<b>Changes and fixes in OSCAR v1.1.0-beta-1</b> <b>Changes and fixes in OSCAR v1.1.0-beta-1</b>