Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp =================================================================== diff -u -r67d114070507df5bfb72c8020cd4f796be987f53 -ra484453d914fef16997b07ce562fd8b9549b19c5 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 67d114070507df5bfb72c8020cd4f796be987f53) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision a484453d914fef16997b07ce562fd8b9549b19c5) @@ -46,7 +46,7 @@ _data.mMinHepBolVolumeML .value, _data.mMaxHepBolVolumeML .value, _data.mEnableChemicalDisinfect .value, - _data.mMaxRORejectionRatio .value, + _data.mMinRORejectionRatioPCT .value, _data.mMinInletWaterCondALarmLimitUSPCM .value, }; } @@ -80,7 +80,7 @@ if (GetValue(vByteArray, index, _data.mMinHepBolVolumeML )) if (GetValue(vByteArray, index, _data.mMaxHepBolVolumeML )) if (GetValue(vByteArray, index, _data.mEnableChemicalDisinfect )) - if (GetValue(vByteArray, index, _data.mMaxRORejectionRatio )) + if (GetValue(vByteArray, index, _data.mMinRORejectionRatioPCT )) if (GetValue(vByteArray, index, _data.mMinInletWaterCondALarmLimitUSPCM )) return true ; else { if(vIndex) *vIndex = index; return false; } @@ -148,7 +148,7 @@ data.mMinHepBolVolumeML = _data.mMinHepBolVolumeML .value; data.mMaxHepBolVolumeML = _data.mMaxHepBolVolumeML .value; data.mEnableChemicalDisinfect = _data.mEnableChemicalDisinfect .value; - data.mMaxRORejectionRatio = _data.mMaxRORejectionRatio .value; + data.mMinRORejectionRatioPCT = _data.mMinRORejectionRatioPCT .value; data.mMinInletWaterCondALarmLimitUSPCM = _data.mMinInletWaterCondALarmLimitUSPCM .value; return data; } Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -r67d114070507df5bfb72c8020cd4f796be987f53 -ra484453d914fef16997b07ce562fd8b9549b19c5 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 67d114070507df5bfb72c8020cd4f796be987f53) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision a484453d914fef16997b07ce562fd8b9549b19c5) @@ -63,7 +63,7 @@ * | #25:(F32) | \ref Data::mMinHepBolVolumeML | * | #26:(F32) | \ref Data::mMaxHepBolVolumeML | * | #27:(U32) | \ref Data::mEnableChemicalDisinfect | - * | #28:(F32) | \ref Data::mMaxRORejectionRatio | + * | #28:(U32) | \ref Data::mMinRORejectionRatioPCT | * | #29:(F32) | \ref Data::mMinInletWaterCondALarmLimitUSPCM | * * \sa Data @@ -111,7 +111,7 @@ Types::F32 mMinHepBolVolumeML ; Types::F32 mMaxHepBolVolumeML ; Types::U32 mEnableChemicalDisinfect ; - Types::F32 mMaxRORejectionRatio ; + Types::U32 mMinRORejectionRatioPCT ; Types::F32 mMinInletWaterCondALarmLimitUSPCM ; } _data; @@ -148,7 +148,7 @@ float mMinHepBolVolumeML ; float mMaxHepBolVolumeML ; quint32 mEnableChemicalDisinfect ; - float mMaxRORejectionRatio ; + quint32 mMinRORejectionRatioPCT ; float mMinInletWaterCondALarmLimitUSPCM; }; Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -r67d114070507df5bfb72c8020cd4f796be987f53 -ra484453d914fef16997b07ce562fd8b9549b19c5 --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 67d114070507df5bfb72c8020cd4f796be987f53) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision a484453d914fef16997b07ce562fd8b9549b19c5) @@ -55,7 +55,7 @@ minHepBolVolumeML ( vData.mMinHepBolVolumeML ); maxHepBolVolumeML ( vData.mMaxHepBolVolumeML ); enableChemicalDisinfect ( vData.mEnableChemicalDisinfect ); - maxRORejectionRatio ( vData.mMaxRORejectionRatio ); + minRORejectionRatioPCT ( vData.mMinRORejectionRatioPCT ); minInletWaterCondAlarmLimituSPCm ( vData.mMinInletWaterCondALarmLimitUSPCM ); @@ -73,7 +73,7 @@ values << QString("%1 - %2").arg(vData.mMinHepDispRateMLPM ).arg(vData.mMaxHepDispRateMLPM ); values << QString("%1 - %2").arg(vData.mMinHepBolVolumeML ).arg(vData.mMaxHepBolVolumeML ); values << QString("%1") .arg(vData.mEnableChemicalDisinfect ? tr("Enabled") : tr("Disabled") ); - values << QString("%1") .arg(vData.mMaxRORejectionRatio ) ; + values << QString("%1") .arg(vData.mMinRORejectionRatioPCT ) ; values << QString("%1") .arg(vData.mMinInletWaterCondALarmLimitUSPCM ) ; parametersText(values); Index: sources/view/settings/VAdjustmentInstitutionalRecord.h =================================================================== diff -u -r67d114070507df5bfb72c8020cd4f796be987f53 -ra484453d914fef16997b07ce562fd8b9549b19c5 --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 67d114070507df5bfb72c8020cd4f796be987f53) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision a484453d914fef16997b07ce562fd8b9549b19c5) @@ -52,7 +52,7 @@ tr("Heparin Dispense Rate" ), tr("Heparin Bolus Volume" ), tr("Chemical Disinfect" ), - tr("Max RO Rejection Ratio" ), + tr("Min RO Rejection Ratio" ), tr("Min Inlet Water Cond Limit" ), }; @@ -70,7 +70,7 @@ tr("mL/hr" ), tr("mL" ), tr("" ), - tr("" ), + tr("%" ), tr("uS/Cm" ), }; @@ -108,7 +108,7 @@ PROPERTY(float , minHepBolVolumeML , 0.0 ) PROPERTY(float , maxHepBolVolumeML , 0.0 ) PROPERTY(bool , enableChemicalDisinfect , true ) - PROPERTY(float , maxRORejectionRatio , 0.0 ) + PROPERTY(qint32 , minRORejectionRatioPCT , 0 ) PROPERTY(float , minInletWaterCondAlarmLimituSPCm , 0.0 ) PROPERTY(QStringList , parametersTitle , titles())