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

Further zMaskProfile cleanup, no change in functionality.

Browse Source
This commit is contained in:
sawinglogz 2021-08-24 10:23:20 -04:00
parent 5693dcf458
commit b2f86a720c
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
oscar/SleepLib/calcs.cpp
View File

@ -1180,8 +1180,8 @@ struct TimeValue {
struct zMaskProfile {
public:
zMaskProfile();
~zMaskProfile();
zMaskProfile() {};
~zMaskProfile() {};
void scanPressure(Session *session);
@ -1199,13 +1199,6 @@ bool operator<(const TimeValue &p1, const TimeValue &p2)
return p1.time < p2.time;
}
zMaskProfile::zMaskProfile()
{
}
zMaskProfile::~zMaskProfile()
{
}
void zMaskProfile::scanPressureList(Session *session, ChannelID code)
{
auto it = session->eventlist.find(code);
@ -1247,24 +1240,17 @@ void zMaskProfile::scanPressure(Session *session)
// Returns what the nominal leak SHOULD be at the given pressure
EventDataType zMaskProfile::calcLeak(EventStoreType pressure)
{
// Average mask leak minimum at pressure 4 = 20.167
// Average mask slope = 1.76
// Min/max Slope = 1.313 - 2.188
// Min/max leak at pressure 4 = 18 - 22
// Min/max leak at pressure 20 = 42 - 54
float leak; // = 0.0;
float lpm4 = p_profile->cpap->custom4cmH2OLeaks();
float lpm20 = p_profile->cpap->custom20cmH2OLeaks();
float lpm4 = p_profile->cpap->custom4cmH2OLeaks();
float lpm20 = p_profile->cpap->custom20cmH2OLeaks();
float lpm = lpm20 - lpm4;
float ppm = lpm / 16.0;
float lpm = lpm20 - lpm4;
float ppm = lpm / 16.0;
float p = (pressure/10.0f) - 4.0;
float p = (pressure/10.0f) - 4.0;
leak = p * ppm + lpm4;
leak = p * ppm + lpm4;
return leak;
}
@ -1287,6 +1273,7 @@ int calcLeaks(Session *session)
maskProfile->scanPressure(session);
// TODO: a single leak eventlist incorrectly handles discontinuous data
EventList *leak = session->AddEventList(CPAP_Leak, EVL_Event, 1);
auto & EVL = session->eventlist[CPAP_LeakTotal];

3
oscar/SleepLib/profiles.h
View File

@ -558,6 +558,9 @@ class CPAPSettings : public PrefSettings
initPref(STR_CS_AutoImport, false);
initPref(STR_CS_BrickWarning, true);
// From old zMaskProfile::calcLeak comments:
// Average mask leak minimum at pressure 4 = 20.167
// Average mask slope = 1.76
m_calcUnintentionalLeaks = initPref(STR_CS_CalculateUnintentionalLeaks, true).toBool();
m_4cmH2OLeaks = initPref(STR_CS_4cmH2OLeaks, 20.167).toDouble();
m_20cmH2OLeaks = initPref(STR_CS_20cmH2OLeaks, 48.333).toDouble();