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

Kludge fix for missing Ti and Te segments

Browse Source
This commit is contained in:
Phil Olynyk 2020-03-03 16:47:55 -05:00
parent 3ddb2c22f0
commit f077353a01
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -2617,6 +2617,10 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
double rate; double rate;
long recs; long recs;
ChannelID code; ChannelID code;
// The following is a hack to skip the multiple uses of Ti and Te by Resmed for signal labels
// It should be replaced when code in resmed_info class changes the labels to be unique
bool found_Ti_code = false;
bool found_Te_code = false;
for (auto & es : edf.edfsignals) { for (auto & es : edf.edfsignals) {
a = nullptr; a = nullptr;
@ -2694,18 +2698,20 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
// a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0); // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (matchSignal(CPAP_Ti, es.label)) { } else if (matchSignal(CPAP_Ti, es.label)) {
code = CPAP_Ti; code = CPAP_Ti;
// There are TWO of these with the same label on my VPAP Adapt 36037 // There are TWO of these with the same label on 36037, 36039, 36377 and others
// Also 37051 has R5Ti.2s and Ti.2s. We use R5Ti.2s and ignore the Ti.2s
if (sess->eventlist.contains(code)) if ( found_Ti_code )
continue; continue;
found_Ti_code = true;
a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
a->AddWaveform(edf.startdate, es.dataArray, recs, duration); a->AddWaveform(edf.startdate, es.dataArray, recs, duration);
// a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0); // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (matchSignal(CPAP_Te, es.label)) { } else if (matchSignal(CPAP_Te, es.label)) {
code = CPAP_Te; code = CPAP_Te;
// There are TWO of these with the same label on my VPAP Adapt 36037 // There are TWO of these with the same label on my VPAP Adapt 36037
if (sess->eventlist.contains(code)) if ( found_Te_code )
continue; continue;
found_Te_code = true;
a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
a->AddWaveform(edf.startdate, es.dataArray, recs, duration); a->AddWaveform(edf.startdate, es.dataArray, recs, duration);
// a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0); // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0);