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

Don't treat a 0-length compliance file as a failure in parsing.

Browse Source 
This fixes the start/end times of such compliance sessions, but their
total_time is broken due to the presence of a 0-length slice.

That will require a more extensive fix of the slice system throughout
the program.
This commit is contained in:
sawinglogz 2019-10-24 12:19:13 -04:00
parent 8297760fa8
commit e356b7816b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1454,7 +1454,7 @@ PRS1_DURATION_EVENT(PRS1UnknownDurationEvent, EV_PRS1_UNK_DURATION);
PRS1_DURATION_EVENT(PRS1HypopneaEvent, EV_PRS1_HY);
PRS1_VALUE_EVENT(PRS1TotalLeakEvent, EV_PRS1_TOTLEAK);
PRS1_VALUE_EVENT(PRS1LeakEvent, EV_PRS1_LEAK); // TODO: do machines really report unintentional leak?
PRS1_VALUE_EVENT(PRS1LeakEvent, EV_PRS1_LEAK);
PRS1_PRESSURE_EVENT(PRS1AutoPressureSetEvent, EV_PRS1_AUTO_PRESSURE_SET);
PRS1_PRESSURE_EVENT(PRS1PressureSetEvent, EV_PRS1_PRESSURE_SET);
@ -3889,12 +3889,12 @@ bool PRS1Import::ImportCompliance()
}
if (compliance->duration == 0) {
// This does occasionally happen and merely indicates a brief session with no useful data.
qDebug() << compliance->sessionid << "duration == 0";
return false;
// This requires the use of really_set_last below, which otherwise rejects 0 length.
qDebug() << compliance->sessionid << "compliance duration == 0";
}
session->setSummaryOnly(true);
session->set_first(start);
session->set_last(qint64(compliance->timestamp + compliance->duration) * 1000L);
session->really_set_last(qint64(compliance->timestamp + compliance->duration) * 1000L);
return true;
}
@ -7133,6 +7133,10 @@ bool PRS1Import::ParseSession(void)
break;
}
// TODO: filter out 0-length slices, since they cause problems for Day::total_time()
// and possibly filter out everything except mask on/off, since the gSessionTimesChart::paint
// assumes that assumes that. Or rework the slice system to be more robust.
if (event != nullptr) {
ok = ParseEvents();
if (!ok) {