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

Split PRS1 interval event determination into IsIntervalEvent.

Browse Source 
Also fix F3V3 CA/OA/HY timestamps, which weren't shifted left.
This commit is contained in:
sawinglogz 2019-11-16 20:07:52 -05:00
parent 903fae6546
commit d9212a19fa
2 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2634,6 +2634,43 @@ void PRS1Import::StartNewSlice(PRS1DataChunk* event, qint64 t)
} }
bool PRS1Import::IsIntervalEvent(PRS1ParsedEvent* e)
{
bool intervalEvent = false;
// Statistical timestamps are reported at the end of a (generally) 2-minute
// interval, rather than the start time that OSCAR expects for its imported
// events. (When a session or slice ends, there will be a shorter interval,
// the previous statistics to the end of the session/slice.)
switch (e->m_type) {
case PRS1PressureAverageEvent::TYPE:
case PRS1IPAPAverageEvent::TYPE:
case PRS1IPAPLowEvent::TYPE:
case PRS1IPAPHighEvent::TYPE:
case PRS1EPAPAverageEvent::TYPE:
case PRS1TotalLeakEvent::TYPE:
case PRS1LeakEvent::TYPE:
case PRS1RespiratoryRateEvent::TYPE:
case PRS1PatientTriggeredBreathsEvent::TYPE:
case PRS1MinuteVentilationEvent::TYPE:
case PRS1TidalVolumeEvent::TYPE:
case PRS1FlowRateEvent::TYPE:
case PRS1Test1Event::TYPE:
case PRS1Test2Event::TYPE:
case PRS1SnoreEvent::TYPE:
case PRS1HypopneaCount::TYPE:
case PRS1ClearAirwayCount::TYPE:
case PRS1ObstructiveApneaCount::TYPE:
intervalEvent = true;
break;
default:
break;
}
return intervalEvent;
}
bool PRS1Import::ImportEventChunk(PRS1DataChunk* event) bool PRS1Import::ImportEventChunk(PRS1DataChunk* event)
{ {
m_currentPressure=0; m_currentPressure=0;
@ -2673,35 +2710,10 @@ bool PRS1Import::ImportEventChunk(PRS1DataChunk* event)
for (int i=0; i < event->m_parsedData.count(); i++) { for (int i=0; i < event->m_parsedData.count(); i++) {
PRS1ParsedEvent* e = event->m_parsedData.at(i); PRS1ParsedEvent* e = event->m_parsedData.at(i);
t = qint64(event->timestamp + e->m_start) * 1000L; t = qint64(event->timestamp + e->m_start) * 1000L;
bool intervalEvent = false;
switch (e->m_type) {
case PRS1PressureAverageEvent::TYPE:
case PRS1IPAPAverageEvent::TYPE:
case PRS1IPAPLowEvent::TYPE:
case PRS1IPAPHighEvent::TYPE:
case PRS1EPAPAverageEvent::TYPE:
case PRS1TotalLeakEvent::TYPE:
case PRS1LeakEvent::TYPE:
case PRS1RespiratoryRateEvent::TYPE:
case PRS1PatientTriggeredBreathsEvent::TYPE:
case PRS1MinuteVentilationEvent::TYPE:
case PRS1TidalVolumeEvent::TYPE:
case PRS1FlowRateEvent::TYPE:
case PRS1Test1Event::TYPE:
case PRS1Test2Event::TYPE:
case PRS1SnoreEvent::TYPE:
intervalEvent = true;
break;
default:
break;
}
bool intervalEvent = IsIntervalEvent(e);
if (intervalEvent) { if (intervalEvent) {
// Update statistical timestamps, which are reported at the end of a (generally) // Calculate the start timetamp for the interval described by this event.
// 2-minute interval, so that their timestamps reflect their start time as OSCAR
// excpects. When a session or slice ends, there will be a shorter interval, from
// the previous statistics to the end of the session/slice.
// TODO: Handle multiple slices correctly, updating the interval start when a slice starts (and starting a new eventlist) // TODO: Handle multiple slices correctly, updating the interval start when a slice starts (and starting a new eventlist)
// TODO: Handle the end of a slice/session correctly, adding a duplicate "end" event with the original timestamp. // TODO: Handle the end of a slice/session correctly, adding a duplicate "end" event with the original timestamp.
// (This will require some slight refactoring of the main switch statement below, including moving some // (This will require some slight refactoring of the main switch statement below, including moving some

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

@ -343,6 +343,9 @@ protected:
void StartNewSlice(PRS1DataChunk* event, qint64 t); void StartNewSlice(PRS1DataChunk* event, qint64 t);
qint64 m_statIntervalStart, m_statIntervalEnd; qint64 m_statIntervalStart, m_statIntervalEnd;
//! \brief Identify statistical events that are reported at the end of an interval.
bool IsIntervalEvent(PRS1ParsedEvent* e);
//! \brief Import a single data chunk from a .002 file containing event data. //! \brief Import a single data chunk from a .002 file containing event data.
bool ImportEventChunk(PRS1DataChunk* event); bool ImportEventChunk(PRS1DataChunk* event);
//! \brief Create all supported channels (except for on-demand ones that only get created if an event appears). //! \brief Create all supported channels (except for on-demand ones that only get created if an event appears).