mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-08 20:20:44 +00:00
Restrict vAuto options to correct modes
This commit is contained in:
parent
81d21a878d
commit
be81c5f398
@ -1430,6 +1430,9 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
|
|||||||
case 11:
|
case 11:
|
||||||
mode = MODE_APAP; // For her is a special apap
|
mode = MODE_APAP; // For her is a special apap
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
mode = MODE_UNKNOWN; // it's PAC, whatever that is
|
||||||
|
break;
|
||||||
case 9:
|
case 9:
|
||||||
mode = MODE_AVAPS;
|
mode = MODE_AVAPS;
|
||||||
break;
|
break;
|
||||||
@ -1872,15 +1875,19 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
|
|||||||
if ((sig = str.lookupLabel("S.Tube"))) {
|
if ((sig = str.lookupLabel("S.Tube"))) {
|
||||||
R.s_Tube = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
R.s_Tube = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
}
|
}
|
||||||
|
if ((R.rms9_mode >= 2) && (R.rms9_mode <= 5)) { // S, ST, or T modes
|
||||||
|
if (R.rms9_mode == 3) { S mode only
|
||||||
if ((sig = str.lookupLabel("S.EasyBreathe"))) {
|
if ((sig = str.lookupLabel("S.EasyBreathe"))) {
|
||||||
R.s_EasyBreathe = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
R.s_EasyBreathe = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if ((sig = str.lookupLabel("S.RiseEnable"))) {
|
if ((sig = str.lookupLabel("S.RiseEnable"))) {
|
||||||
R.s_RiseEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
R.s_RiseEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
}
|
}
|
||||||
if ((sig = str.lookupLabel("S.RiseTime"))) {
|
if ((sig = str.lookupLabel("S.RiseTime"))) {
|
||||||
R.s_RiseTime = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
R.s_RiseTime = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
}
|
}
|
||||||
|
if ((R.rms9_mode ==3) || (R.rms9_mode ==4)) { // S or ST mode
|
||||||
if ((sig = str.lookupLabel("S.Cycle"))) {
|
if ((sig = str.lookupLabel("S.Cycle"))) {
|
||||||
R.s_Cycle = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
R.s_Cycle = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
}
|
}
|
||||||
@ -1893,6 +1900,22 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
|
|||||||
if ((sig = str.lookupLabel("S.TiMin"))) {
|
if ((sig = str.lookupLabel("S.TiMin"))) {
|
||||||
R.s_TiMin = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
R.s_TiMin = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (R.rms9_mode == 6) { // vAuto mode
|
||||||
|
if ((sig = str.lookupLabel("S.Cycle"))) {
|
||||||
|
R.s_Cycle = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
|
}
|
||||||
|
if ((sig = str.lookupLabel("S.Trigger"))) {
|
||||||
|
R.s_Trigger = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
|
}
|
||||||
|
if ((sig = str.lookupLabel("S.TiMax"))) {
|
||||||
|
R.s_TiMax = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
|
}
|
||||||
|
if ((sig = str.lookupLabel("S.TiMin"))) {
|
||||||
|
R.s_TiMin = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||||
|
}
|
||||||
|
}
|
||||||
if ( R.min_pressure == 0 ) {
|
if ( R.min_pressure == 0 ) {
|
||||||
qDebug() << "Min Pressure is zero on" << date.toString();
|
qDebug() << "Min Pressure is zero on" << date.toString();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user