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

Fix value display on and exact data points, and near session boundary with drift

Browse Source
This commit is contained in:
kappa44 2021-10-20 11:02:17 +11:00
parent ac210e9068
commit 3cfbda2f69
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oscar/SleepLib/session.cpp
View File

@ -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<ChannelID, QVector<EventList *> >::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;