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

Fix AVAPS settings display.

Browse Source
This commit is contained in:
sawinglogz 2020-03-24 21:33:50 -04:00
parent aae1ce28a6
commit 6b581bc303
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar/SleepLib/day.cpp
View File

@ -1534,9 +1534,10 @@ QString Day::getPressureSettings()
arg(validPressure(settings_min(CPAP_PSMax))). arg(validPressure(settings_min(CPAP_PSMax))).
arg(units); arg(units);
} else if (mode == MODE_AVAPS) { } else if (mode == MODE_AVAPS) {
return QObject::tr("EPAP %1 IPAP %2 (%3)"). return QObject::tr("EPAP %1 IPAP %2-%3 (%4)").
arg(validPressure(settings_min(CPAP_EPAP))). arg(validPressure(settings_min(CPAP_EPAP))).
arg(validPressure(settings_max(CPAP_IPAP))). arg(validPressure(settings_max(CPAP_IPAPLo))).
arg(validPressure(settings_max(CPAP_IPAPHi))).
arg(units); arg(units);
} }

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

@ -4172,17 +4172,15 @@ CPAPMode PRS1Import::importMode(int prs1mode)
case PRS1_MODE_BILEVEL: mode = MODE_BILEVEL_FIXED; break; case PRS1_MODE_BILEVEL: mode = MODE_BILEVEL_FIXED; break;
case PRS1_MODE_AUTOBILEVEL: mode = MODE_BILEVEL_AUTO_VARIABLE_PS; break; case PRS1_MODE_AUTOBILEVEL: mode = MODE_BILEVEL_AUTO_VARIABLE_PS; break;
case PRS1_MODE_ASV: mode = MODE_ASV_VARIABLE_EPAP; break; case PRS1_MODE_ASV: mode = MODE_ASV_VARIABLE_EPAP; break;
case PRS1_MODE_S: mode = MODE_BILEVEL_FIXED; break; // TODO case PRS1_MODE_S: mode = MODE_BILEVEL_FIXED; break;
case PRS1_MODE_ST: mode = MODE_BILEVEL_FIXED; break; // TODO, pressure seems variable case PRS1_MODE_ST: mode = MODE_BILEVEL_FIXED; break;
case PRS1_MODE_PC: mode = MODE_AVAPS; break; // TODO, maybe only PC - AVAPS mode case PRS1_MODE_PC: mode = MODE_BILEVEL_FIXED; break;
case PRS1_MODE_ST_AVAPS: mode = MODE_AVAPS; break; // TODO, maybe only PC - AVAPS mode case PRS1_MODE_ST_AVAPS: mode = MODE_AVAPS; break;
case PRS1_MODE_PC_AVAPS: mode = MODE_AVAPS; break; // TODO, maybe only PC - AVAPS mode case PRS1_MODE_PC_AVAPS: mode = MODE_AVAPS; break;
default: default:
UNEXPECTED_VALUE(prs1mode, "known PRS1 mode"); UNEXPECTED_VALUE(prs1mode, "known PRS1 mode");
break; break;
} }
// TODO: fixed vs. variable PS seems to be independent from ventilator mode, for example
// S/T can be fixed (single IPAP pressure) or variable (IPAP min/max).
return mode; return mode;
} }

2
oscar/welcome.cpp
View File

@ -244,7 +244,7 @@ QString Welcome::GenerateCPAPHTML()
EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0);
html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
} else if (cpapmode == MODE_ASV){ } else if (cpapmode == MODE_ASV || cpapmode == MODE_AVAPS){
EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP)); EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP));