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

Add debug messages for exceptional events in PRS1Import::ParseSession.

Browse Source 
Lots of new warnings that were being silently eaten!
This commit is contained in:
sawinglogz 2019-06-05 10:24:32 -04:00
parent 8fa5df5f89
commit 092d46be33
1 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4485,13 +4485,42 @@ void PRS1Import::run()
bool PRS1Import::ParseSession(void) bool PRS1Import::ParseSession(void)
{ {
bool ok = false;
bool save = false; bool save = false;
session = new Session(mach, sessionid); session = new Session(mach, sessionid);
if ((compliance && ImportCompliance()) || (summary && ImportSummary())) { do {
if (event && !ParseEvents()) { if (compliance != nullptr) {
ok = ImportCompliance();
if (!ok) {
qWarning() << sessionid << "Error parsing compliance, skipping session";
break;
}
}
if (summary != nullptr) {
if (compliance != nullptr) {
qWarning() << sessionid << "Has both compliance and summary?!";
// Never seen this, but try the summary anyway.
}
ok = ImportSummary();
if (!ok) {
qWarning() << sessionid << "Error parsing summary, skipping session";
break;
}
}
if (compliance == nullptr && summary == nullptr) {
qWarning() << sessionid << "No compliance or summary, skipping session";
break;
} }
if (event != nullptr) {
ok = ParseEvents();
if (!ok) {
qWarning() << sessionid << "Error parsing events, proceeding anyway?";
}
}
if (!wavefile.isEmpty()) {
// Parse .005 Waveform file // Parse .005 Waveform file
waveforms = loader->ParseFile(wavefile); waveforms = loader->ParseFile(wavefile);
waveforms = CoalesceWaveformChunks(waveforms); waveforms = CoalesceWaveformChunks(waveforms);
@ -4501,23 +4530,36 @@ bool PRS1Import::ParseSession(void)
session->destroyEvent(CPAP_FlowRate); session->destroyEvent(CPAP_FlowRate);
} }
} }
ParseWaveforms(); ok = ParseWaveforms();
if (!ok) {
qWarning() << sessionid << "Error parsing waveforms, proceeding anyway?";
}
}
if (!oxifile.isEmpty()) {
// Parse .006 Waveform file // Parse .006 Waveform file
oximetry = loader->ParseFile(oxifile); oximetry = loader->ParseFile(oxifile);
oximetry = CoalesceWaveformChunks(oximetry); oximetry = CoalesceWaveformChunks(oximetry);
ParseOximetry(); ok = ParseOximetry();
if (!ok) {
qWarning() << sessionid << "Error parsing oximetry, proceeding anyway?";
}
}
if (session->first() > 0) { if (session->first() > 0) {
if (session->last() < session->first()) { if (session->last() < session->first()) {
// if last isn't set, duration couldn't be gained from summary, parsing events or waveforms.. // if last isn't set, duration couldn't be gained from summary, parsing events or waveforms..
// This session is dodgy, so kill it // This session is dodgy, so kill it
qWarning() << sessionid << "Session last() earlier than first(), downgrading to summary only";
session->setSummaryOnly(true); session->setSummaryOnly(true);
session->really_set_last(session->first()+(qint64(summary_duration) * 1000L)); session->really_set_last(session->first()+(qint64(summary_duration) * 1000L));
} }
save = true; save = true;
} else {
qWarning() << sessionid << "missing start time";
} }
} } while (false);
return save; return save;
} }