Index: sources/view/td/data/VTreatmentRanges.cpp =================================================================== diff -u -r6e41d2d9f431580bb350db71cc52dd40e60e1a28 -r2412bc874fd22ad193af84aacec73e830fae938f --- sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28) +++ sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 2412bc874fd22ad193af84aacec73e830fae938f) @@ -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,6 +229,8 @@ 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 ); @@ -324,10 +326,5 @@ FROMVARIANT_WITHRETURN ( chlorineWaterSampleCheckMax , "Chlorine Water Sample Check" , "Chlorine_Water_Sample_Check_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( chlorineWaterSampleCheckRes , "Chlorine Water Sample Check" , "Chlorine_Water_Sample_Check_Res" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( isolatedUFDurationDef , "Isolated UF Duration Ranges" , "Isolated_UF_Duration_Def" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( isolatedUFDurationMin , "Isolated UF Duration Ranges" , "Isolated_UF_Duration_Min" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( isolatedUFDurationMax , "Isolated UF Duration Ranges" , "Isolated_UF_Duration_Max" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( isolatedUFDurationRes , "Isolated UF Duration Ranges" , "Isolated_UF_Duration_Res" , UInt , isConfigsOk ); - emit didTreatmentRangesDone( isConfigsOk ); } Index: sources/view/td/data/VTreatmentRanges.h =================================================================== diff -u -r6e41d2d9f431580bb350db71cc52dd40e60e1a28 -r2412bc874fd22ad193af84aacec73e830fae938f --- sources/view/td/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28) +++ sources/view/td/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 2412bc874fd22ad193af84aacec73e830fae938f) @@ -37,6 +37,8 @@ { Q_OBJECT + const QString _vitalsDef = "30"; // LEAHI_PRS_215 + // Real-time properties received from TD from TreatmentRangesData READONLY( quint32 , treatmentRanges_Duration_Min , 0) READONLY( quint32 , treatmentRanges_Duration_Max , 0) @@ -63,6 +65,8 @@ READONLY( QStringList , bicarbonateConcentrateOptions ,{}) READONLY( QStringList , dialyzerTypeOptions ,{}) READONLY( QStringList , bloodPressureMeasureInterval ,{}) + VALUESET( quint32 , vitalsInterval , 0) + RANGESET( float , dialysateTemp , 0) RANGESET( quint32 , salineBolusVolume , 0) @@ -104,9 +108,6 @@ // ultrafiltration RANGESET( float , ultrafiltrationVolume , 0) - // isolated UF - RANGESET( quint32 , isolatedUFDuration , 0) - VIEW_DEC_CLASS(VTreatmentRanges ) VIEW_DEC_SLOT(TreatmentRangesData ) VIEW_DEC_SLOT(SettingsData )