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

Chase down PRS1 unordered time warnings and add an explanatory TODO comment.

Browse Source 
Also fix some whitespace.

No functional changes.
This commit is contained in:
sawinglogz 2019-11-19 16:00:08 -05:00
parent 60ec8711dc
commit 46c9d4f0c8
2 changed files with 111 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar/SleepLib/event.cpp
View File

@ -63,6 +63,12 @@ EventDataType EventList::data2(quint32 i)
return EventDataType(m_data2[i]);
}
static QString ts(qint64 msecs)
{
// TODO: make this UTC so that tests don't vary by where they're run
return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
}
void EventList::AddEvent(qint64 time, EventStoreType data)
{
// Apply gain & offset
@ -85,7 +91,7 @@ void EventList::AddEvent(qint64 time, EventStoreType data)
if (m_first > time) {
// Crud.. Update all the previous records
// This really shouldn't happen.
qDebug() << "Unordered time detected in AddEvent()" << m_count << m_first << time << data;
qDebug() << "Unordered time detected in AddEvent()" << m_count << ts(m_first) << ts(time) << data;
qint32 delta = (m_first - time);

9
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -2890,6 +2890,15 @@ void PRS1Import::ImportEvent(qint64 t, PRS1ParsedEvent* e)
{
qint64 duration;
// TODO: Filter out duplicate/overlapping PB and RE events.
//
// These actually get reported by the machines, but they cause "unordered time" warnings
// and they throw off the session statistics. Even official reports show the wrong stats,
// for example counting each of 3 duplicate PBs towards the total time in PB.
//
// It's not clear whether filtering can reasonably be done here or whether it needs
// to be done in ImportEventChunk.
const QVector<ChannelID*> & channels = PRS1ImportChannelMap[e->m_type];
ChannelID channel = NoChannel, PS, VS2, LEAK;
if (channels.count() > 0) {