From 3cfbda2f69edafb64b7778bf91cef5c8a29584ab Mon Sep 17 00:00:00 2001 From: kappa44 <6469032-kappa44@users.noreply.gitlab.com> Date: Wed, 20 Oct 2021 11:02:17 +1100 Subject: [PATCH] Fix value display on and exact data points, and near session boundary with drift --- oscar/SleepLib/session.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index 4fc4f736..b2721371 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -1225,6 +1225,11 @@ void Session::UpdateSummaries() EventDataType Session::SearchValue(ChannelID code, qint64 time, bool square) { + qint64 drift = qint64(p_profile->cpap->clockDrift()) * 1000L; + // Address clock drift for CPAP so correct value is displayed + if (s_machine->type() == MT_CPAP) { + time -= drift; + } qint64 t1, t2, start; QHash >::iterator it; it = eventlist.find(code); @@ -1253,13 +1258,15 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time, bool square) a = el->data(i1); - if (i2 >= cnt) { return a; } + // Don't interpolate if next data point is past end or on exact data point + if (i2 >= cnt || i1 == i2) { return a; } qint64 t1 = i1 * el->rate(); qint64 t2 = i2 * el->rate(); c = EventDataType(t2 - t1); - if (c == 0) return 0; + // Don't interpolate if t2-t1==0 (should be caught by i1==i2 above) + if (c == 0) return a; d = EventDataType(t2 - tt); e = d/c;