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

Fix MAP durations

Browse Source
This commit is contained in:
Mark Watkins 2014-08-12 04:42:26 +10:00
parent e5472fd414
commit 31ee980d0c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sleepyhead/Graphs/MinutesAtPressure.cpp
View File

@ -269,8 +269,11 @@ void RecalcMAP::run()
} }
if ((lastdata != data) || (time > maxx)) { if ((lastdata != data) || (time > maxx)) {
qint64 d1 = qMax(minx, lasttime);
qint64 d2 = qMin(maxx, time);
int duration = (time - lasttime) / 1000L;
int duration = (d2 - d1) / 1000L;
EventStoreType key = floor(lastdata * gain); EventStoreType key = floor(lastdata * gain);
if (key <= 30) { if (key <= 30) {
times[key] += duration; times[key] += duration;
@ -278,9 +281,9 @@ void RecalcMAP::run()
ChannelID code = chans.at(c); ChannelID code = chans.at(c);
schema::Channel & chan = schema::channel[code]; schema::Channel & chan = schema::channel[code];
if (chan.type() == schema::SPAN) { if (chan.type() == schema::SPAN) {
events[code][key] += sess->rangeSum(code, qMax(minx, lasttime), qMin(maxx, time)); events[code][key] += sess->rangeSum(code, d1, d2);
} else { } else {
events[code][key] += sess->rangeCount(code, qMax(minx, lasttime), qMin(maxx, time)); events[code][key] += sess->rangeCount(code, d1, d2);
} }
} }
} }