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

ResMed EPR Fix, show summary only warning in daily panel

Browse Source
This commit is contained in:
Mark Watkins 2014-06-20 12:53:12 +10:00
parent 73c2c0e1da
commit 3d3e3fa5c8
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -676,8 +676,15 @@ void ResmedImport::run()
if (R.max_ipap >= 0) sess->settings[CPAP_IPAPHi] = R.max_ipap;
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap;
if (R.mode >= 0) sess->settings[CPAP_Mode] = R.mode;
if (R.epr >= 0) sess->settings[RMS9_EPR] = R.epr;
if (R.epr_set >= 0) sess->settings[RMS9_EPRSet] = R.epr_set;
if (R.epr >= 0) {
sess->settings[RMS9_EPR] = R.epr;
sess->settings[CPAP_PresReliefType] = (int)PR_EPR;
}
if (R.epr_set >= 0) {
sess->settings[RMS9_EPRSet] = R.epr_set;
sess->settings[CPAP_PresReliefSet] = R.epr_set;
}
// Ignore all the rest of the sumary data, because there is enough available to calculate it with higher accuracy.
@ -1291,8 +1298,14 @@ int ResmedLoader::Open(QString path, Profile *profile)
if (R.max_ipap >= 0) sess->settings[CPAP_IPAPHi] = R.max_ipap;
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap;
if (R.mode >= 0) sess->settings[CPAP_Mode] = R.mode;
if (R.epr >= 0) sess->settings[RMS9_EPR] = R.epr;
if (R.epr_set >= 0) sess->settings[RMS9_EPRSet] = R.epr_set;
if (R.epr >= 0) {
sess->settings[RMS9_EPR] = R.epr;
sess->settings[CPAP_PresReliefType] = (int)PR_EPR;
}
if (R.epr_set >= 0) {
sess->settings[RMS9_EPRSet] = R.epr_set;
sess->settings[CPAP_PresReliefSet] = R.epr_set;
}
if (R.leakmax >= 0) sess->setMax(CPAP_Leak, R.leakmax);
if (R.leakmax >= 0) sess->setMin(CPAP_Leak, 0);
if ((R.leakmed >= 0) && (R.leak95 >= 0) && (R.leakmax >= 0)) {

4
sleepyhead/daily.cpp
View File

@ -1192,10 +1192,10 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
ccnt++;
}
}
if (GraphView->isEmpty() && (ccnt>0)) {
if (GraphView->isEmpty() && ((ccnt>0) || (cpap && cpap->settingExists(CPAP_SummaryOnly)))) {
html+="<tr><td colspan=5>&nbsp;</td></tr>\n";
html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg("<b>"+STR_MessageBox_PleaseNote+"</b> "+ tr("This day just contains summary data, only limited information is available ."));
}
} else
if (cpap && PROFILE.cpap->showLeakRedline()) {
float rlt = cpap->timeAboveThreshold(CPAP_Leak, PROFILE.cpap->leakRedline()) / 60.0;
float pc = 100.0 / cpap->hours() * rlt;