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

Forgot to multiply ResMed EPR stuff by signal gain

Browse Source
This commit is contained in:
Mark Watkins 2012-01-02 17:48:49 +10:00
parent bd793adfc9
commit a1e62ed695
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Graphs/gSummaryChart.cpp
View File

@ -72,6 +72,7 @@ void SummaryChart::SetDay(Day * nullday)
addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN,true); addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN,true);
addSlice(CPAP_EPAP,QColor("light green"),ST_PERC,true,0.95); addSlice(CPAP_EPAP,QColor("light green"),ST_PERC,true,0.95);
addSlice(CPAP_IPAP,QColor("light cyan"),ST_WAVG,true);
addSlice(CPAP_IPAP,QColor("light blue"),ST_PERC,true,0.95); addSlice(CPAP_IPAP,QColor("light blue"),ST_PERC,true,0.95);
addSlice(CPAP_IPAP,QColor("blue"),ST_SETMAX,true); addSlice(CPAP_IPAP,QColor("blue"),ST_SETMAX,true);
} else if (mode>=MODE_APAP) { } else if (mode>=MODE_APAP) {

11
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -604,12 +604,11 @@ int ResmedLoader::Open(QString & path,Profile *profile)
// Note: AutoSV machines don't have both fields // Note: AutoSV machines don't have both fields
sig=stredf.lookupSignal(RMS9_EPR); sig=stredf.lookupSignal(RMS9_EPR);
if (sig) { if (sig) {
int i=sig->data[dn]; sess->settings[CPAP_PresReliefMode]=EventDataType(sig->data[dn])*sig->gain;
sess->settings[CPAP_PresReliefMode]=i;
} }
sig=stredf.lookupSignal(RMS9_EPRSet); sig=stredf.lookupSignal(RMS9_EPRSet);
if (sig) { if (sig) {
sess->settings[CPAP_PresReliefSet]=sig->data[dn]; sess->settings[CPAP_PresReliefSet]=EventDataType(sig->data[dn])*sig->gain;
} }
@ -981,14 +980,12 @@ int ResmedLoader::Open(QString & path,Profile *profile)
// AutoSV machines don't have both fields // AutoSV machines don't have both fields
sig=stredf.lookupSignal(RMS9_EPR); sig=stredf.lookupSignal(RMS9_EPR);
if (sig) { if (sig) {
int i=sig->data[dn]; sess->settings[CPAP_PresReliefMode]=EventDataType(sig->data[dn])*sig->gain;
sess->settings[CPAP_PresReliefMode]=i;
} }
sig=stredf.lookupSignal(RMS9_EPRSet); sig=stredf.lookupSignal(RMS9_EPRSet);
if (sig) { if (sig) {
sess->settings[CPAP_PresReliefSet]=sig->data[dn]; sess->settings[CPAP_PresReliefSet]=EventDataType(sig->data[dn])*sig->gain;
} }