From f077353a019c24f9fbfd7f3dd6c540e206994ca0 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Tue, 3 Mar 2020 16:47:55 -0500 Subject: [PATCH] Kludge fix for missing Ti and Te segments --- oscar/SleepLib/loader_plugins/resmed_loader.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 52dad00d..625262cc 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -2617,6 +2617,10 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path) double rate; long recs; 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) { a = nullptr; @@ -2694,18 +2698,20 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path) // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0); } else if (matchSignal(CPAP_Ti, es.label)) { code = CPAP_Ti; - // There are TWO of these with the same label on my VPAP Adapt 36037 - - if (sess->eventlist.contains(code)) + // 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 ( found_Ti_code ) continue; + found_Ti_code = true; a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); a->AddWaveform(edf.startdate, es.dataArray, recs, duration); // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0); } else if (matchSignal(CPAP_Te, es.label)) { code = CPAP_Te; // There are TWO of these with the same label on my VPAP Adapt 36037 - if (sess->eventlist.contains(code)) + if ( found_Te_code ) continue; + found_Te_code = true; a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); a->AddWaveform(edf.startdate, es.dataArray, recs, duration); // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0);