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

PRS1 summary duration fix, don't show event breakdown witout data present

Browse Source
This commit is contained in:
Mark Watkins 2014-06-21 02:19:17 +10:00
parent c59a377e89
commit 41622b1ed9
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -298,8 +298,6 @@ int CMS50Loader::doImportMode()
emit importComplete(this);
resetTimer.singleShot(2000, this, SLOT(shutdownPorts()));
return available;
// imp_callbacks = cb_reset = 0;
// return available;
}
}
}

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

@ -1204,6 +1204,10 @@ bool PRS1SessionData::ParseSummary()
// This is a time value for ASV stuff
if (summary->family == 5) {
offset = 4; // non zero adds 4 extra fields..
if (summary->familyVersion == 0) {
duration = data[0x1B] | data[0x1C] << 8;
}
} else if (summary->family == 0) {
if (summary->familyVersion == 2) {
@ -1214,6 +1218,11 @@ bool PRS1SessionData::ParseSummary()
}
}
if (!event) {
session->set_last(qint64(summary->timestamp + duration) * 1000L);
session->settings[CPAP_SummaryOnly] = true;
}
// Minutes. Convert to seconds/hours here?
session->settings[CPAP_RampTime] = (int)data[offset + 0x06];
session->settings[CPAP_RampPressure] = (EventDataType)data[offset + 0x07] / 10.0;

11
sleepyhead/daily.cpp
View File

@ -1424,8 +1424,15 @@ void Daily::Load(QDate date)
} else {
html += "<tr><td align=center>Unable to display Pie Chart on this system</td></tr>\n";
}
} else {
html += "<tr><td align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
} else if (cpap->channelHasData(CPAP_Obstructive)
|| cpap->channelHasData(CPAP_Hypopnea)
|| cpap->channelHasData(CPAP_ClearAirway)
|| cpap->channelHasData(CPAP_RERA)
|| cpap->channelHasData(CPAP_Apnea)
|| cpap->channelHasData(CPAP_FlowLimit)
|| cpap->channelHasData(CPAP_SensAwake)
) {
html += "<tr><td align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
}
}