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

Use mask average instead of baseline in unintentional leaks calculation

Browse Source
This commit is contained in:
Mark Watkins 2016-03-03 11:45:40 +10:00
parent fcc2aa35d5
commit 774708df6d
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sleepyhead/SleepLib/calcs.cpp
View File

@ -1504,13 +1504,21 @@ void zMaskProfile::updatePressureMin()
EventDataType zMaskProfile::calcLeak(EventStoreType pressure) EventDataType zMaskProfile::calcLeak(EventStoreType pressure)
{ {
// return pressuremin[pressure]; // if (maxP == minP) {
// return pressuremin[pressure];
// }
// EventDataType leak = (pressure - minP) * (m_factor) + minL;
if (maxP == minP) { // Average mask leak minimum at pressure 4 = 20.167
return pressuremin[pressure]; // 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
// Generic Average of Masks from a SpreadSheet... will add two sliders to tweak this between the ranges later
EventDataType leak = (pressure/10.0 - 4.0) * 1.76 + 20.167;
EventDataType leak = (pressure - minP) * (m_factor) + minL;
return leak; return leak;
} }
@ -1722,6 +1730,7 @@ int calcLeaks(Session *session)
pstr = maskProfile->Pressure.data(); pstr = maskProfile->Pressure.data();
pend = maskProfile->Pressure.data()+(mppressize-1); pend = maskProfile->Pressure.data()+(mppressize-1);
// For each sessions Total Leaks list
for (int i = 0; i < evlsize; ++i) { for (int i = 0; i < evlsize; ++i) {
EventList &el = *EVL[i]; EventList &el = *EVL[i];
EventDataType gain = el.gain(), tmp, val; EventDataType gain = el.gain(), tmp, val;
@ -1736,12 +1745,14 @@ int calcLeaks(Session *session)
bool found; bool found;
// For each Total Leak value... // Scan through this Total Leak list's data
for (; dptr < eptr; ++dptr) { for (; dptr < eptr; ++dptr) {
tmp = EventDataType(*dptr) * gain; tmp = EventDataType(*dptr) * gain;
ti = start + *tptr++; ti = start + *tptr++;
found = false; found = false;
// Find the current pressure at this moment in time
pressure = pstr->value; pressure = pstr->value;
for (TimeValue *p1 = pstr; p1 != pend; ++p1) { for (TimeValue *p1 = pstr; p1 != pend; ++p1) {
@ -1757,21 +1768,6 @@ int calcLeaks(Session *session)
} }
} }
// for (int i = 0; i < mppressize - 1; ++i) {
// const TimeValue &p1 = &maskProfile->Pressure[i];
// const TimeValue &p2 = maskProfile->Pressure[i + 1];
// if ((p2.time > ti) && (p1.time <= ti)) {
// pressure = p1.value;
// found = true;
// break;
// } else if (p2.time == ti) {
// pressure = p2.value;
// found = true;
// break;
// }
// }
if (found) { if (found) {
// lookup and subtract the calculated leak baseline for this pressure // lookup and subtract the calculated leak baseline for this pressure
val = tmp - maskProfile->calcLeak(pressure); val = tmp - maskProfile->calcLeak(pressure);

5
sleepyhead/SleepLib/session.cpp
View File

@ -1099,12 +1099,17 @@ void Session::updateCountSummary(ChannelID code)
void Session::UpdateSummaries() void Session::UpdateSummaries()
{ {
ChannelID id; ChannelID id;
// Generate that AHI per hour graph in daily view.
calcAHIGraph(this); calcAHIGraph(this);
// Calculates RespRate and related waveforms (Tv, MV, Te, Ti) if missing // Calculates RespRate and related waveforms (Tv, MV, Te, Ti) if missing
calcRespRate(this); calcRespRate(this);
// Generate unintentional leaks if not present
calcLeaks(this); calcLeaks(this);
// Flag the Large Leaks if unintentional leaks is available, and no LargeLeaks weren't flagged by the machine already.
flagLargeLeaks(this); flagLargeLeaks(this);
calcSPO2Drop(this); calcSPO2Drop(this);