Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -rf433eeefae34530e7cc3dc4e5576e43729b236f2 -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision f433eeefae34530e7cc3dc4e5576e43729b236f2) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) @@ -66,7 +66,7 @@ heparinDispensingRateMax ( vData.mHepDispRateMax ); heparinDispensingRateDef ( vData.mHepDispRateDef ); heparinStopTimeMin ( vData.mHepStopTimeMin ); - + vitalsInterval ( vData.mVitalsIntervalDef ); acidConcentratePotassiumMin ( vData.mPotassiumMin ); acidConcentratePotassiumMax ( vData.mPotassiumMax ); acidConcentrateCalciumMin ( vData.mCalciumMin ); @@ -229,20 +229,22 @@ isConfigsOk = isConfigsOk && !_dryBicabCartridgeSizeOptions .isEmpty(); isConfigsOk = isConfigsOk && !_waterSampleTestResultRequired.isEmpty(); + vitalsInterval(_bloodPressureMeasureInterval.indexOf(_vitalsDef)); + FROMVARIANT_WITHRETURN ( dialysateTempDef , "Dialysate Temperature" , "Dialysate_Temperature_Def" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateTempMin , "Dialysate Temperature" , "Dialysate_Temperature_Min" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateTempMax , "Dialysate Temperature" , "Dialysate_Temperature_Max" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateTempRes , "Dialysate Temperature" , "Dialysate_Temperature_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Def" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowMin , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Min" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowMax , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Max" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowRes , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Res" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowDef , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Def" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowMin , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowMax , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowRes , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Res" , Int , isConfigsOk ); - // trancembrncPressureMonitor: Def intentionally omitted (see config/configurations/Parameters/DataList.conf) - FROMVARIANT_WITHRETURN ( trancembrncPressureMonitorMin , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Min" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureMonitorMax , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Max" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureMonitorRes , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Res" , Int , isConfigsOk ); + // transmembranePressureMonitor: Def intentionally omitted (see config/configurations/Parameters/DataList.conf) + FROMVARIANT_WITHRETURN ( transmembranePressureMonitorMin , "Transmembrane Pressure Ranges" , "Transmembrane_Monitor_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureMonitorMax , "Transmembrane Pressure Ranges" , "Transmembrane_Monitor_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureMonitorRes , "Transmembrane Pressure Ranges" , "Transmembrane_Monitor_Res" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowMin , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Min" , Int , isConfigsOk );