From ef0cb253cdc0c5588cde272841b95f47a9543322 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 27 Jan 2020 14:28:25 -0500 Subject: [PATCH] Add CPAP_PressureSet/EPAPSet/IPAPSet to daily statistics view. Also add a breadcrumb for fixing average calculation for these channels. --- oscar/SleepLib/session.cpp | 4 ++++ oscar/daily.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index 6226913a..69129777 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -1030,6 +1030,10 @@ void Session::destroyEvent(ChannelID code) // does not trash settings.. } +// TODO: The below assumes values are held for their duration. This does not properly handle +// CPAP_PressureSet/EPAPSet/IPAPSet or other interpolated channels. The proper "value" held +// for any given duration is the average of the starding and ending values, for the duration +// between them. void Session::updateCountSummary(ChannelID code) { QHash >::iterator ev = eventlist.find(code); diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 76724715..99965ad4 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -1279,7 +1279,7 @@ QString Daily::getStatisticsInfo(Day * day) .arg(STR_TR_Max); ChannelID chans[]={ - CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB, + CPAP_Pressure,CPAP_PressureSet,CPAP_EPAP,CPAP_EPAPSet,CPAP_IPAP,CPAP_IPAPSet,CPAP_PS,CPAP_PTB, CPAP_MinuteVent, CPAP_RespRate, CPAP_RespEvent,CPAP_FLG, CPAP_Leak, CPAP_LeakTotal, CPAP_Snore, /* CPAP_IE, */ CPAP_Ti,CPAP_Te, CPAP_TgMV, CPAP_TidalVolume, OXI_Pulse, OXI_SPO2, POS_Inclination, POS_Orientation, POS_Movement