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

Fix problem with minimum pressure sometimes shown as zero on Overview and Statistics pages.

Browse Source 
Journal session was corrupted with channel id's not valid for journals.
  May have been caused by incorrect QHash coding in MinutesAtPressure.cpp
  Revised Min and Max functions not to look at MT_JOURNAL sessions.
  Updated release notes,.
This commit is contained in:
Guy Scharf 2021-12-20 11:27:48 -07:00
parent 2c5d59e666
commit b22e0cd026
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Htmldocs/release_notes.html
View File

@ -11,6 +11,14 @@
<b>This page in other languages:</b> <b>This page in other languages:</b>
<br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p> <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
<p> <p>
<b>Changes and fixes in OSCAR v1.3.1-beta-?</b>
<br>Portions of OSCAR are © 2019-2021 by
<i>The OSCAR Team</i></p>
<ul>
<li>[fix] Fix missing oximetry and motion waveforms on Overview pages.</li>
<li>[fix] Fix rare problem of minimum pressure shown as zero on Overview and Statistics pages.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.3.1-beta-1</b> <b>Changes and fixes in OSCAR v1.3.1-beta-1</b>
<br>Portions of OSCAR are © 2019-2021 by <br>Portions of OSCAR are © 2019-2021 by
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>
@ -29,7 +37,6 @@
<li>[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.</li> <li>[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.</li>
<li>[new] Add date range option to Statistics page.</li> <li>[new] Add date range option to Statistics page.</li>
<li>[new] Improve appearance and operation of event types and graphs comboboxes on Daily and Overview pages.</li> <li>[new] Improve appearance and operation of event types and graphs comboboxes on Daily and Overview pages.</li>
<li>[fix] Fix missing oximetry and motion waveforms on Overview pages.</li>
<li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li> <li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li>
<li>[fix] Improve event flag position in flow graph for DV6 machines.</li> <li>[fix] Improve event flag position in flow graph for DV6 machines.</li>
<li>[fix] --datadir option now allows fully qualified paths on Mac and Linux.</li> <li>[fix] --datadir option now allows fully qualified paths on Mac and Linux.</li>

32
oscar/Graphs/MinutesAtPressure.cpp
View File

@ -232,7 +232,11 @@ EventDataType msecToMinutes(EventDataType value) {
} }
EventDataType getSetting(Session * sess,ChannelID code) { 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(); enum schema::DataType datatype = schema::channel[code].datatype();
if (!( datatype == schema::DEFAULT || datatype == schema::DOUBLE )) return -1; if (!( datatype == schema::DEFAULT || datatype == schema::DOUBLE )) return -1;
return setting.toDouble(); return setting.toDouble();
@ -714,22 +718,24 @@ void RecalcMAP::run()
for ( int idx=0; idx<sessions.size() ; idx++ ) { for ( int idx=0; idx<sessions.size() ; idx++ ) {
auto & sess = sessions[idx]; auto & sess = sessions[idx];
IPAP.updateBucketsPerPressure(sess); if (sess->type() == MT_CPAP) {
EPAP.updateBucketsPerPressure(sess); IPAP.updateBucketsPerPressure(sess);
IPAP.eventLists = sess->eventlist.value(ipapcode); EPAP.updateBucketsPerPressure(sess);
EPAP.eventLists = sess->eventlist.value(epapcode); IPAP.eventLists = sess->eventlist.value(ipapcode);
EPAP.eventLists = sess->eventlist.value(epapcode);
updateTimes(IPAP); updateTimes(IPAP);
updateTimes(EPAP); updateTimes(EPAP);
EventDataType value = getSetting(sess, CPAP_PressureMin); EventDataType value = getSetting(sess, CPAP_PressureMin);
if (value >=0.1 && minP >value) minP=value; if (value >=0.1 && minP >value) minP=value;
value = getSetting(sess, CPAP_PressureMax); value = getSetting(sess, CPAP_PressureMax);
if (value >=0.1 && maxP <value) maxP=value; if (value >=0.1 && maxP <value) maxP=value;
updateEvents(sess,IPAP); updateEvents(sess,IPAP);
if (m_quit) break; if (m_quit) break;
}
} }
if (minP>maxP) minP=maxP; if (minP>maxP) minP=maxP;

4
oscar/SleepLib/day.cpp
View File

@ -263,7 +263,7 @@ EventDataType Day::settings_max(ChannelID code)
EventDataType value; EventDataType value;
for (auto & sess : sessions) { for (auto & sess : sessions) {
if (sess->enabled()) { if (sess->enabled() && sess->s_machtype != MT_JOURNAL) {
value = sess->settings.value(code, min).toFloat(); value = sess->settings.value(code, min).toFloat();
if (value > max) { if (value > max) {
max = value; max = value;
@ -280,7 +280,7 @@ EventDataType Day::settings_min(ChannelID code)
EventDataType value; EventDataType value;
for (auto & sess : sessions) { for (auto & sess : sessions) {
if (sess->enabled()) { if (sess->enabled() && sess->s_machtype != MT_JOURNAL) {
value = sess->settings.value(code, max).toFloat(); value = sess->settings.value(code, max).toFloat();
if (value < min) { if (value < min) {
min = value; min = value;