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

Merge branch 'master' of ssh://git.code.sf.net/p/sleepyhead/code

Browse Source
This commit is contained in:
Mark Watkins 2014-06-23 16:24:55 +10:00
commit 3363e1e31b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1218,8 +1218,11 @@ bool PRS1SessionData::ParseSummary()
} }
} }
if (!event) {
if (duration > 0) {
session->set_last(qint64(summary->timestamp + duration) * 1000L); session->set_last(qint64(summary->timestamp + duration) * 1000L);
}
if (!event) {
session->settings[CPAP_SummaryOnly] = true; session->settings[CPAP_SummaryOnly] = true;
} }
@ -1423,8 +1426,8 @@ void PRS1Import::run()
sg->session = new Session(mach, it.key()); sg->session = new Session(mach, it.key());
if (!sg->ParseSummary()) { if (!sg->ParseSummary()) {
delete sg->session; // delete sg->session;
continue; // continue;
} }
if (!sg->ParseEvents()) { if (!sg->ParseEvents()) {
// delete sg->session; // delete sg->session;
@ -1432,6 +1435,11 @@ void PRS1Import::run()
} }
sg->ParseWaveforms(); sg->ParseWaveforms();
if (sg->session->last() < sg->session->first()) {
// if last isn't set, duration couldn't be gained from summary, parsing events or waveforms..
// This session is dodgy, so kill it
sg->session->really_set_last(sg->session->first());
}
sg->session->SetChanged(true); sg->session->SetChanged(true);
loader->sessionMutex.lock(); loader->sessionMutex.lock();
@ -1457,17 +1465,13 @@ void PRS1FileGroup::ParseChunks()
{ {
// qDebug() << "Parsing chunks for session" << summary << event; // qDebug() << "Parsing chunks for session" << summary << event;
if (ParseFile(compliance)) { if (ParseFile(compliance)) {
// Compliance only piece of crap machine, nothing else to do.. // Compliance only piece of crap machine, nothing else to do.. :(
return; // return;
} }
ParseFile(summary); ParseFile(summary);
{ ParseFile(event);
// Only parse if summary is present ParseFile(waveform);
ParseFile(event);
ParseFile(waveform);
}
} }
bool PRS1FileGroup::ParseFile(QString path) bool PRS1FileGroup::ParseFile(QString path)