Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r78bab967bf837a13490aaa763f0b9c1d64fdb6e8 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 78bab967bf837a13490aaa763f0b9c1d64fdb6e8) @@ -272,7 +272,7 @@ {Gui::GuiActionType::ID_DGGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInstitutionalRecordReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 26 * 4 }, //26 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 27 * 4 }, //27 parameters each 4 bytes }; /*! Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r78bab967bf837a13490aaa763f0b9c1d64fdb6e8 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 78bab967bf837a13490aaa763f0b9c1d64fdb6e8) @@ -38,7 +38,7 @@ colCount : 2 colSpacing : 50 - rowCount : 6 // this number indicates when to move to the next column + rowCount : 7 // this number indicates when to move to the next column rowSpacing : 0 itemHeight : 50 itemWidth : 550 Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r78bab967bf837a13490aaa763f0b9c1d64fdb6e8 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 78bab967bf837a13490aaa763f0b9c1d64fdb6e8) @@ -41,10 +41,11 @@ _data.mMaxVenAsymPressLimitMMHG .value, _data.mMinUltrafiltrationVolumeL .value, _data.mMaxUltrafiltrationVolumeL .value, - _data.mMinHepDispRateMLPHR .value, - _data.mMaxHepDispRateMLPHR .value, + _data.mMinHepDispRateMLPHR .value, + _data.mMaxHepDispRateMLPHR .value, _data.mMinHepBolVolumeML .value, _data.mMaxHepBolVolumeML .value, + _data.mEnableChemicalDisinfect .value, }; } @@ -72,10 +73,11 @@ if (GetValue(vByteArray, index, _data.mMaxVenAsymPressLimitMMHG )) if (GetValue(vByteArray, index, _data.mMinUltrafiltrationVolumeL )) if (GetValue(vByteArray, index, _data.mMaxUltrafiltrationVolumeL )) - if (GetValue(vByteArray, index, _data.mMinHepDispRateMLPHR )) - if (GetValue(vByteArray, index, _data.mMaxHepDispRateMLPHR )) + if (GetValue(vByteArray, index, _data.mMinHepDispRateMLPHR )) + if (GetValue(vByteArray, index, _data.mMaxHepDispRateMLPHR )) if (GetValue(vByteArray, index, _data.mMinHepBolVolumeML )) if (GetValue(vByteArray, index, _data.mMaxHepBolVolumeML )) + if (GetValue(vByteArray, index, _data.mEnableChemicalDisinfect )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -103,6 +105,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -134,9 +137,10 @@ data.mMaxVenAsymPressLimitMMHG = _data.mMaxVenAsymPressLimitMMHG .value; data.mMinUltrafiltrationVolumeL = _data.mMinUltrafiltrationVolumeL .value; data.mMaxUltrafiltrationVolumeL = _data.mMaxUltrafiltrationVolumeL .value; - data.mMinHepDispRateMLPM = _data.mMinHepDispRateMLPHR .value; - data.mMaxHepDispRateMLPM = _data.mMaxHepDispRateMLPHR .value; + data.mMinHepDispRateMLPM = _data.mMinHepDispRateMLPHR .value; + data.mMaxHepDispRateMLPM = _data.mMaxHepDispRateMLPHR .value; data.mMinHepBolVolumeML = _data.mMinHepBolVolumeML .value; data.mMaxHepBolVolumeML = _data.mMaxHepBolVolumeML .value; + data.mEnableChemicalDisinfect = _data.mEnableChemicalDisinfect .value; return data; } Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r78bab967bf837a13490aaa763f0b9c1d64fdb6e8 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 78bab967bf837a13490aaa763f0b9c1d64fdb6e8) @@ -107,6 +107,7 @@ Types::F32 mMaxHepDispRateMLPHR ; Types::F32 mMinHepBolVolumeML ; Types::F32 mMaxHepBolVolumeML ; + Types::U32 mEnableChemicalDisinfect ; } _data; public: @@ -141,6 +142,7 @@ float mMaxHepDispRateMLPM ; float mMinHepBolVolumeML ; float mMaxHepBolVolumeML ; + quint32 mEnableChemicalDisinfect ; }; MAdjustInstitutionalRecordResponse () { } Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r78bab967bf837a13490aaa763f0b9c1d64fdb6e8 --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 78bab967bf837a13490aaa763f0b9c1d64fdb6e8) @@ -54,6 +54,7 @@ maxHepDispRateMLPM ( vData.mMaxHepDispRateMLPM ); minHepBolVolumeML ( vData.mMinHepBolVolumeML ); maxHepBolVolumeML ( vData.mMaxHepBolVolumeML ); + enableChemicalDisinfect ( vData.mEnableChemicalDisinfect ); QStringList values; @@ -69,6 +70,7 @@ values << QString("%1 - %2").arg(vData.mMinUltrafiltrationVolumeL).arg(vData.mMaxUltrafiltrationVolumeL); 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); parametersText(values); // *** has to be the last to let the information to be set and then emit the signal *** Index: sources/view/settings/VAdjustmentInstitutionalRecord.h =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r78bab967bf837a13490aaa763f0b9c1d64fdb6e8 --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 78bab967bf837a13490aaa763f0b9c1d64fdb6e8) @@ -51,6 +51,7 @@ tr("Prescribed UF Volume" ), tr("Heparin Dispense Rate" ), tr("Heparin Bolus Volume" ), + tr("Enable Chemical Disinfect" ), }; const QStringList _units { @@ -66,6 +67,7 @@ tr("L" ), tr("mL/hr" ), tr("mL" ), + tr("" ), }; @@ -101,6 +103,7 @@ PROPERTY(float , maxHepDispRateMLPM , 0.0 ) PROPERTY(float , minHepBolVolumeML , 0.0 ) PROPERTY(float , maxHepBolVolumeML , 0.0 ) + PROPERTY(quint32 , enableChemicalDisinfect , 0 ) PROPERTY(QStringList , parametersTitle , titles()) PROPERTY(QStringList , parametersUnit , units ())