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

Revise VS2 index to match official reports.

Browse Source 
The VS2 channel is unique in that it only appears (as a flag)
when there are nonzero snores during a 2-minute period. However, the
VS index isn't the number of events (nonzero intervals) per hour,
but rather the number of snores per hour.
This commit is contained in:
sawinglogz 2020-05-07 17:36:31 -04:00
parent c43479672a
commit 346208140e
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -30,6 +30,7 @@
<li>[fix] Add support for rise time mode on DreamStation BiPAP devices (600X-700X).</li>
<li>[fix] Remove the ramp time and pressure settings when the ramp is disabled on pre-DreamStation devices.</li>
<li>[fix] Improve import of Philips Respironics oximetry data.</li>
<li>[fix] Fix VS2 index shown on the Daily page for Philips Respironics machines.</li>
<li>[fix] Fix occasional failure to save imported Viatom data.</li>
<li>[fix] Fix a recurring database upgrade prompt.</li>
<li>[fix] Fix an occasional crash when importing Resmed data.</li>

6
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -3131,14 +3131,16 @@ void PRS1Import::ImportEvent(qint64 t, PRS1ParsedEvent* e)
// TODO: The numeric snore graph is the right way to present this information,
// but it needs to be shifted left 2 minutes, since it's not a starting value
// but a past statistic.
AddEvent(channel, t, e->m_value, e->m_gain); // Snore count
AddEvent(channel, t, e->m_value, e->m_gain); // Snore count, continuous data
if (e->m_value > 0) {
// TODO: currently these get drawn on our waveforms, but they probably shouldn't,
// since they don't have a precise timestamp. They should continue to be drawn
// on the flags overview. See the comment in ImportEventChunk regarding flags
// for numeric channels.
//
// We need to pass the count along so that the VS2 index will tabulate correctly.
VS2 = *channels.at(1);
AddEvent(VS2, t, 0, 1);
AddEvent(VS2, t, e->m_value, 1);
}
break;
case PRS1VibratorySnoreEvent::TYPE: // real VS marker on waveform

2
oscar/SleepLib/loader_plugins/prs1_loader.h
View File

@ -25,7 +25,7 @@
//********************************************************************************************
// Please INCREMENT the following value when making changes to this loaders implementation
// BEFORE making a release
const int prs1_data_version = 18;
const int prs1_data_version = 19;
//
//********************************************************************************************
#if 0 // Apparently unused

3
oscar/daily.cpp
View File

@ -1672,6 +1672,9 @@ void Daily::Load(QDate date)
if (chan.type() == schema::SPAN) {
val = (100.0 / hours)*(day->sum(code)/3600.0);
data = QString("%1%").arg(val,0,'f',2);
} else if (code == CPAP_VSnore2) { // TODO: This should be generalized rather than special-casing a single channel here.
val = day->sum(code) / hours;
data = QString("%1").arg(val,0,'f',2);
} else {
val = day->count(code) / hours;
data = QString("%1").arg(val,0,'f',2);

3
oscar/reports.cpp
View File

@ -223,6 +223,9 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
float cai = day->count(CPAP_ClearAirway) / hours;
float rei = day->count(CPAP_RERA) / hours;
float vsi = day->count(CPAP_VSnore) / hours;
if (day->channelHasData(CPAP_VSnore2)) { // PRS1 puts its 2-minute VS count in a different channel rather than reporting each incident.
vsi = day->sum(CPAP_VSnore2) / hours;
}
float fli = day->count(CPAP_FlowLimit) / hours;
// float sai = day->count(CPAP_SensAwake) / hours;
float nri = day->count(CPAP_NRI) / hours;