diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index a5b13859..977b3aab 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -11,6 +11,14 @@
This page in other languages:
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes
+ Changes and fixes in OSCAR v1.3.1-beta-?
+
Portions of OSCAR are © 2019-2021 by
+ The OSCAR Team
+
+ - [fix] Fix missing oximetry and motion waveforms on Overview pages.
+ - [fix] Fix rare problem of minimum pressure shown as zero on Overview and Statistics pages.
+
+
Changes and fixes in OSCAR v1.3.1-beta-1
Portions of OSCAR are © 2019-2021 by
The OSCAR Team
@@ -29,7 +37,6 @@
[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.
[new] Add date range option to Statistics page.
[new] Improve appearance and operation of event types and graphs comboboxes on Daily and Overview pages.
- [fix] Fix missing oximetry and motion waveforms on Overview pages.
[fix] Correct SleepStyle machines sometimes identified as Icon machines.
[fix] Improve event flag position in flow graph for DV6 machines.
[fix] --datadir option now allows fully qualified paths on Mac and Linux.
diff --git a/oscar/Graphs/MinutesAtPressure.cpp b/oscar/Graphs/MinutesAtPressure.cpp
index 09b79257..0f3a7c85 100644
--- a/oscar/Graphs/MinutesAtPressure.cpp
+++ b/oscar/Graphs/MinutesAtPressure.cpp
@@ -232,7 +232,11 @@ EventDataType msecToMinutes(EventDataType value) {
}
EventDataType getSetting(Session * sess,ChannelID code) {
- auto setting=sess->settings[code];
+ if (!sess->settings.contains(code)) {
+ qWarning() << "MinutesAtPressure could not find channel" << code;
+ return -1;
+ }
+ auto setting=sess->settings.value(code);/*[code]; */
enum schema::DataType datatype = schema::channel[code].datatype();
if (!( datatype == schema::DEFAULT || datatype == schema::DOUBLE )) return -1;
return setting.toDouble();
@@ -714,22 +718,24 @@ void RecalcMAP::run()
for ( int idx=0; idxeventlist.value(ipapcode);
- EPAP.eventLists = sess->eventlist.value(epapcode);
+ if (sess->type() == MT_CPAP) {
+ IPAP.updateBucketsPerPressure(sess);
+ EPAP.updateBucketsPerPressure(sess);
+ IPAP.eventLists = sess->eventlist.value(ipapcode);
+ EPAP.eventLists = sess->eventlist.value(epapcode);
- updateTimes(IPAP);
- updateTimes(EPAP);
+ updateTimes(IPAP);
+ updateTimes(EPAP);
- EventDataType value = getSetting(sess, CPAP_PressureMin);
- if (value >=0.1 && minP >value) minP=value;
- value = getSetting(sess, CPAP_PressureMax);
- if (value >=0.1 && maxP =0.1 && minP >value) minP=value;
+ value = getSetting(sess, CPAP_PressureMax);
+ if (value >=0.1 && maxP maxP) minP=maxP;
diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index aeb2f976..bdc5f7d3 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -263,7 +263,7 @@ EventDataType Day::settings_max(ChannelID code)
EventDataType value;
for (auto & sess : sessions) {
- if (sess->enabled()) {
+ if (sess->enabled() && sess->s_machtype != MT_JOURNAL) {
value = sess->settings.value(code, min).toFloat();
if (value > max) {
max = value;
@@ -280,7 +280,7 @@ EventDataType Day::settings_min(ChannelID code)
EventDataType value;
for (auto & sess : sessions) {
- if (sess->enabled()) {
+ if (sess->enabled() && sess->s_machtype != MT_JOURNAL) {
value = sess->settings.value(code, max).toFloat();
if (value < min) {
min = value;