Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r51625aec73fca715ee12c3b82c6ea7e824851a64 -r67d114070507df5bfb72c8020cd4f796be987f53 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 51625aec73fca715ee12c3b82c6ea7e824851a64) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 67d114070507df5bfb72c8020cd4f796be987f53) @@ -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 , 27 * 4 }, //27 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 29 * 4 }, //29 parameters each 4 bytes // HD reset request in service mode {Gui::GuiActionType::ID_ResetHDInServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r67d114070507df5bfb72c8020cd4f796be987f53 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 67d114070507df5bfb72c8020cd4f796be987f53) @@ -38,7 +38,7 @@ colCount : 2 colSpacing : 50 - rowCount : 7 // this number indicates when to move to the next column + rowCount : 8 // 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 -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r67d114070507df5bfb72c8020cd4f796be987f53 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 67d114070507df5bfb72c8020cd4f796be987f53) @@ -19,65 +19,69 @@ QVariantList MAdjustInstitutionalRecordResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - _data.mMinBloodFlowMLPM .value, - _data.mMaxBloodFlowMLPM .value, - _data.mMinDialysateFlowMLPM .value, - _data.mMaxDialysateFlowMLPM .value, - _data.mMinTxDurationMIN .value, - _data.mMaxTxDurationMIN .value, - _data.mMinStopHepDispBeforeTxEndMIN .value, - _data.mMaxStopHepDispBeforeTxEndMIN .value, - _data.mMinSalineBolVolumeML .value, - _data.mMaxSalineBolVolumeML .value, - _data.mMinDialysateTempC .value, - _data.mMaxDialysateTempC .value, - _data.mMinArtPressLimitWindowMMHG .value, - _data.mMaxArtPressLimitWindowMMHG .value, - _data.mMinVenPressLimitWindowMMHG .value, - _data.mMaxVenPressLimitWindowMMHG .value, - _data.mMinVenAsymPressLimitMMHG .value, - _data.mMaxVenAsymPressLimitMMHG .value, - _data.mMinUltrafiltrationVolumeL .value, - _data.mMaxUltrafiltrationVolumeL .value, - _data.mMinHepDispRateMLPHR .value, - _data.mMaxHepDispRateMLPHR .value, - _data.mMinHepBolVolumeML .value, - _data.mMaxHepBolVolumeML .value, - _data.mEnableChemicalDisinfect .value, + _data.mAccepted .value, + _data.mReason .value, + _data.mMinBloodFlowMLPM .value, + _data.mMaxBloodFlowMLPM .value, + _data.mMinDialysateFlowMLPM .value, + _data.mMaxDialysateFlowMLPM .value, + _data.mMinTxDurationMIN .value, + _data.mMaxTxDurationMIN .value, + _data.mMinStopHepDispBeforeTxEndMIN .value, + _data.mMaxStopHepDispBeforeTxEndMIN .value, + _data.mMinSalineBolVolumeML .value, + _data.mMaxSalineBolVolumeML .value, + _data.mMinDialysateTempC .value, + _data.mMaxDialysateTempC .value, + _data.mMinArtPressLimitWindowMMHG .value, + _data.mMaxArtPressLimitWindowMMHG .value, + _data.mMinVenPressLimitWindowMMHG .value, + _data.mMaxVenPressLimitWindowMMHG .value, + _data.mMinVenAsymPressLimitMMHG .value, + _data.mMaxVenAsymPressLimitMMHG .value, + _data.mMinUltrafiltrationVolumeL .value, + _data.mMaxUltrafiltrationVolumeL .value, + _data.mMinHepDispRateMLPHR .value, + _data.mMaxHepDispRateMLPHR .value, + _data.mMinHepBolVolumeML .value, + _data.mMaxHepBolVolumeML .value, + _data.mEnableChemicalDisinfect .value, + _data.mMaxRORejectionRatio .value, + _data.mMinInletWaterCondALarmLimitUSPCM .value, }; } bool MAdjustInstitutionalRecordResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mAccepted )) - if (GetValue(vByteArray, index, _data.mReason )) - if (GetValue(vByteArray, index, _data.mMinBloodFlowMLPM )) - if (GetValue(vByteArray, index, _data.mMaxBloodFlowMLPM )) - if (GetValue(vByteArray, index, _data.mMinDialysateFlowMLPM )) - if (GetValue(vByteArray, index, _data.mMaxDialysateFlowMLPM )) - if (GetValue(vByteArray, index, _data.mMinTxDurationMIN )) - if (GetValue(vByteArray, index, _data.mMaxTxDurationMIN )) - if (GetValue(vByteArray, index, _data.mMinStopHepDispBeforeTxEndMIN )) - if (GetValue(vByteArray, index, _data.mMaxStopHepDispBeforeTxEndMIN )) - if (GetValue(vByteArray, index, _data.mMinSalineBolVolumeML )) - if (GetValue(vByteArray, index, _data.mMaxSalineBolVolumeML )) - if (GetValue(vByteArray, index, _data.mMinDialysateTempC )) - if (GetValue(vByteArray, index, _data.mMaxDialysateTempC )) - if (GetValue(vByteArray, index, _data.mMinArtPressLimitWindowMMHG )) - if (GetValue(vByteArray, index, _data.mMaxArtPressLimitWindowMMHG )) - if (GetValue(vByteArray, index, _data.mMinVenPressLimitWindowMMHG )) - if (GetValue(vByteArray, index, _data.mMaxVenPressLimitWindowMMHG )) - if (GetValue(vByteArray, index, _data.mMinVenAsymPressLimitMMHG )) - 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.mMinHepBolVolumeML )) - if (GetValue(vByteArray, index, _data.mMaxHepBolVolumeML )) - if (GetValue(vByteArray, index, _data.mEnableChemicalDisinfect )) + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mMinBloodFlowMLPM )) + if (GetValue(vByteArray, index, _data.mMaxBloodFlowMLPM )) + if (GetValue(vByteArray, index, _data.mMinDialysateFlowMLPM )) + if (GetValue(vByteArray, index, _data.mMaxDialysateFlowMLPM )) + if (GetValue(vByteArray, index, _data.mMinTxDurationMIN )) + if (GetValue(vByteArray, index, _data.mMaxTxDurationMIN )) + if (GetValue(vByteArray, index, _data.mMinStopHepDispBeforeTxEndMIN )) + if (GetValue(vByteArray, index, _data.mMaxStopHepDispBeforeTxEndMIN )) + if (GetValue(vByteArray, index, _data.mMinSalineBolVolumeML )) + if (GetValue(vByteArray, index, _data.mMaxSalineBolVolumeML )) + if (GetValue(vByteArray, index, _data.mMinDialysateTempC )) + if (GetValue(vByteArray, index, _data.mMaxDialysateTempC )) + if (GetValue(vByteArray, index, _data.mMinArtPressLimitWindowMMHG )) + if (GetValue(vByteArray, index, _data.mMaxArtPressLimitWindowMMHG )) + if (GetValue(vByteArray, index, _data.mMinVenPressLimitWindowMMHG )) + if (GetValue(vByteArray, index, _data.mMaxVenPressLimitWindowMMHG )) + if (GetValue(vByteArray, index, _data.mMinVenAsymPressLimitMMHG )) + 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.mMinHepBolVolumeML )) + if (GetValue(vByteArray, index, _data.mMaxHepBolVolumeML )) + if (GetValue(vByteArray, index, _data.mEnableChemicalDisinfect )) + if (GetValue(vByteArray, index, _data.mMaxRORejectionRatio )) + if (GetValue(vByteArray, index, _data.mMinInletWaterCondALarmLimitUSPCM )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -106,6 +110,8 @@ 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -115,32 +121,34 @@ */ AdjustInstitutionalRecordResponseData MAdjustInstitutionalRecordResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mMinBloodFlowMLPM = _data.mMinBloodFlowMLPM .value; - data.mMaxBloodFlowMLPM = _data.mMaxBloodFlowMLPM .value; - data.mMinDialysateFlowMLPM = _data.mMinDialysateFlowMLPM .value; - data.mMaxDialysateFlowMLPM = _data.mMaxDialysateFlowMLPM .value; - data.mMinTxDurationMIN = _data.mMinTxDurationMIN .value; - data.mMaxTxDurationMIN = _data.mMaxTxDurationMIN .value; - data.mMinStopHepDispBeforeTxEndMIN = _data.mMinStopHepDispBeforeTxEndMIN .value; - data.mMaxStopHepDispBeforeTxEndMIN = _data.mMaxStopHepDispBeforeTxEndMIN .value; - data.mMinSalineBolVolumeML = _data.mMinSalineBolVolumeML .value; - data.mMaxSalineBolVolumeML = _data.mMaxSalineBolVolumeML .value; - data.mMinDialysateTempC = _data.mMinDialysateTempC .value; - data.mMaxDialysateTempC = _data.mMaxDialysateTempC .value; - data.mMinArtPressLimitWindowMMHG = _data.mMinArtPressLimitWindowMMHG .value; - data.mMaxArtPressLimitWindowMMHG = _data.mMaxArtPressLimitWindowMMHG .value; - data.mMinVenPressLimitWindowMMHG = _data.mMinVenPressLimitWindowMMHG .value; - data.mMaxVenPressLimitWindowMMHG = _data.mMaxVenPressLimitWindowMMHG .value; - data.mMinVenAsymPressLimitMMHG = _data.mMinVenAsymPressLimitMMHG .value; - 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.mMinHepBolVolumeML = _data.mMinHepBolVolumeML .value; - data.mMaxHepBolVolumeML = _data.mMaxHepBolVolumeML .value; - data.mEnableChemicalDisinfect = _data.mEnableChemicalDisinfect .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mMinBloodFlowMLPM = _data.mMinBloodFlowMLPM .value; + data.mMaxBloodFlowMLPM = _data.mMaxBloodFlowMLPM .value; + data.mMinDialysateFlowMLPM = _data.mMinDialysateFlowMLPM .value; + data.mMaxDialysateFlowMLPM = _data.mMaxDialysateFlowMLPM .value; + data.mMinTxDurationMIN = _data.mMinTxDurationMIN .value; + data.mMaxTxDurationMIN = _data.mMaxTxDurationMIN .value; + data.mMinStopHepDispBeforeTxEndMIN = _data.mMinStopHepDispBeforeTxEndMIN .value; + data.mMaxStopHepDispBeforeTxEndMIN = _data.mMaxStopHepDispBeforeTxEndMIN .value; + data.mMinSalineBolVolumeML = _data.mMinSalineBolVolumeML .value; + data.mMaxSalineBolVolumeML = _data.mMaxSalineBolVolumeML .value; + data.mMinDialysateTempC = _data.mMinDialysateTempC .value; + data.mMaxDialysateTempC = _data.mMaxDialysateTempC .value; + data.mMinArtPressLimitWindowMMHG = _data.mMinArtPressLimitWindowMMHG .value; + data.mMaxArtPressLimitWindowMMHG = _data.mMaxArtPressLimitWindowMMHG .value; + data.mMinVenPressLimitWindowMMHG = _data.mMinVenPressLimitWindowMMHG .value; + data.mMaxVenPressLimitWindowMMHG = _data.mMaxVenPressLimitWindowMMHG .value; + data.mMinVenAsymPressLimitMMHG = _data.mMinVenAsymPressLimitMMHG .value; + 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.mMinHepBolVolumeML = _data.mMinHepBolVolumeML .value; + data.mMaxHepBolVolumeML = _data.mMaxHepBolVolumeML .value; + data.mEnableChemicalDisinfect = _data.mEnableChemicalDisinfect .value; + data.mMaxRORejectionRatio = _data.mMaxRORejectionRatio .value; + data.mMinInletWaterCondALarmLimitUSPCM = _data.mMinInletWaterCondALarmLimitUSPCM .value; return data; } Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r67d114070507df5bfb72c8020cd4f796be987f53 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 67d114070507df5bfb72c8020cd4f796be987f53) @@ -36,33 +36,35 @@ * * | Payload || * | || - * | #1: (U32) | \ref Data::mAccepted | - * | #2: (U32) | \ref Data::mReason | - * | #3: (U32) | \ref Data::mMinBloodFlowMLPM | - * | #4: (U32) | \ref Data::mMaxBloodFlowMLPM | - * | #5: (U32) | \ref Data::mMinDialysateFlowMLPM | - * | #6: (U32) | \ref Data::mMaxDialysateFlowMLPM | - * | #7: (U32) | \ref Data::mMinTxDurationMIN | - * | #8: (U32) | \ref Data::mMaxTxDurationMIN | - * | #9: (U32) | \ref Data::mMinStopHepDispBeforeTxEndMIN | - * | #10:(U32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN | - * | #11:(U32) | \ref Data::mMinSalineBolVolumeML | - * | #12:(U32) | \ref Data::mMaxSalineBolVolumeML | - * | #13:(F32) | \ref Data::mMinDialysateTempC | - * | #14:(F32) | \ref Data::mMaxDialysateTempC | - * | #15:(S32) | \ref Data::mMinArtPressLimitWindowMMHG | - * | #16:(S32) | \ref Data::mMaxArtPressLimitWindowMMHG | - * | #17:(S32) | \ref Data::mMinVenPressLimitWindowMMHG | - * | #18:(S32) | \ref Data::mMaxVenPressLimitWindowMMHG | - * | #19:(S32) | \ref Data::mMinVenAsymPressLimitMMHG | - * | #20:(S32) | \ref Data::mMaxVenAsymPressLimitMMHG | - * | #21:(F32) | \ref Data::mMinUltrafiltrationVolumeL | - * | #22:(F32) | \ref Data::mMaxUltrafiltrationVolumeL | - * | #23:(F32) | \ref Data::mMinHepDispRateMLPHR | - * | #24:(F32) | \ref Data::mMaxHepDispRateMLPHR | - * | #25:(F32) | \ref Data::mMinHepBolVolumeML | - * | #26:(F32) | \ref Data::mMaxHepBolVolumeML | - * | #27:(U32) | \ref Data::mEnableChemicalDisinfect | + * | #1: (U32) | \ref Data::mAccepted | + * | #2: (U32) | \ref Data::mReason | + * | #3: (U32) | \ref Data::mMinBloodFlowMLPM | + * | #4: (U32) | \ref Data::mMaxBloodFlowMLPM | + * | #5: (U32) | \ref Data::mMinDialysateFlowMLPM | + * | #6: (U32) | \ref Data::mMaxDialysateFlowMLPM | + * | #7: (U32) | \ref Data::mMinTxDurationMIN | + * | #8: (U32) | \ref Data::mMaxTxDurationMIN | + * | #9: (U32) | \ref Data::mMinStopHepDispBeforeTxEndMIN | + * | #10:(U32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN | + * | #11:(U32) | \ref Data::mMinSalineBolVolumeML | + * | #12:(U32) | \ref Data::mMaxSalineBolVolumeML | + * | #13:(F32) | \ref Data::mMinDialysateTempC | + * | #14:(F32) | \ref Data::mMaxDialysateTempC | + * | #15:(S32) | \ref Data::mMinArtPressLimitWindowMMHG | + * | #16:(S32) | \ref Data::mMaxArtPressLimitWindowMMHG | + * | #17:(S32) | \ref Data::mMinVenPressLimitWindowMMHG | + * | #18:(S32) | \ref Data::mMaxVenPressLimitWindowMMHG | + * | #19:(S32) | \ref Data::mMinVenAsymPressLimitMMHG | + * | #20:(S32) | \ref Data::mMaxVenAsymPressLimitMMHG | + * | #21:(F32) | \ref Data::mMinUltrafiltrationVolumeL | + * | #22:(F32) | \ref Data::mMaxUltrafiltrationVolumeL | + * | #23:(F32) | \ref Data::mMinHepDispRateMLPHR | + * | #24:(F32) | \ref Data::mMaxHepDispRateMLPHR | + * | #25:(F32) | \ref Data::mMinHepBolVolumeML | + * | #26:(F32) | \ref Data::mMaxHepBolVolumeML | + * | #27:(U32) | \ref Data::mEnableChemicalDisinfect | + * | #28:(F32) | \ref Data::mMaxRORejectionRatio | + * | #29:(F32) | \ref Data::mMinInletWaterCondALarmLimitUSPCM | * * \sa Data * @@ -82,33 +84,35 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mMinBloodFlowMLPM ; - Types::U32 mMaxBloodFlowMLPM ; - Types::U32 mMinDialysateFlowMLPM ; - Types::U32 mMaxDialysateFlowMLPM ; - Types::U32 mMinTxDurationMIN ; - Types::U32 mMaxTxDurationMIN ; - Types::U32 mMinStopHepDispBeforeTxEndMIN ; - Types::U32 mMaxStopHepDispBeforeTxEndMIN ; - Types::U32 mMinSalineBolVolumeML ; - Types::U32 mMaxSalineBolVolumeML ; - Types::F32 mMinDialysateTempC ; - Types::F32 mMaxDialysateTempC ; - Types::S32 mMinArtPressLimitWindowMMHG ; - Types::S32 mMaxArtPressLimitWindowMMHG ; - Types::S32 mMinVenPressLimitWindowMMHG ; - Types::S32 mMaxVenPressLimitWindowMMHG ; - Types::S32 mMinVenAsymPressLimitMMHG ; - Types::S32 mMaxVenAsymPressLimitMMHG ; - Types::F32 mMinUltrafiltrationVolumeL ; - Types::F32 mMaxUltrafiltrationVolumeL ; - Types::F32 mMinHepDispRateMLPHR ; - Types::F32 mMaxHepDispRateMLPHR ; - Types::F32 mMinHepBolVolumeML ; - Types::F32 mMaxHepBolVolumeML ; - Types::U32 mEnableChemicalDisinfect ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mMinBloodFlowMLPM ; + Types::U32 mMaxBloodFlowMLPM ; + Types::U32 mMinDialysateFlowMLPM ; + Types::U32 mMaxDialysateFlowMLPM ; + Types::U32 mMinTxDurationMIN ; + Types::U32 mMaxTxDurationMIN ; + Types::U32 mMinStopHepDispBeforeTxEndMIN ; + Types::U32 mMaxStopHepDispBeforeTxEndMIN ; + Types::U32 mMinSalineBolVolumeML ; + Types::U32 mMaxSalineBolVolumeML ; + Types::F32 mMinDialysateTempC ; + Types::F32 mMaxDialysateTempC ; + Types::S32 mMinArtPressLimitWindowMMHG ; + Types::S32 mMaxArtPressLimitWindowMMHG ; + Types::S32 mMinVenPressLimitWindowMMHG ; + Types::S32 mMaxVenPressLimitWindowMMHG ; + Types::S32 mMinVenAsymPressLimitMMHG ; + Types::S32 mMaxVenAsymPressLimitMMHG ; + Types::F32 mMinUltrafiltrationVolumeL ; + Types::F32 mMaxUltrafiltrationVolumeL ; + Types::F32 mMinHepDispRateMLPHR ; + Types::F32 mMaxHepDispRateMLPHR ; + Types::F32 mMinHepBolVolumeML ; + Types::F32 mMaxHepBolVolumeML ; + Types::U32 mEnableChemicalDisinfect ; + Types::F32 mMaxRORejectionRatio ; + Types::F32 mMinInletWaterCondALarmLimitUSPCM ; } _data; public: @@ -144,6 +148,8 @@ float mMinHepBolVolumeML ; float mMaxHepBolVolumeML ; quint32 mEnableChemicalDisinfect ; + float mMaxRORejectionRatio ; + float mMinInletWaterCondALarmLimitUSPCM; }; MAdjustInstitutionalRecordResponse () { } Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r67d114070507df5bfb72c8020cd4f796be987f53 --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 67d114070507df5bfb72c8020cd4f796be987f53) @@ -28,49 +28,53 @@ void View::VAdjustmentInstitutionalRecord::onActionReceive(const AdjustInstitutionalRecordResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - minBloodFlowMLPM ( vData.mMinBloodFlowMLPM ); - maxBloodFlowMLPM ( vData.mMaxBloodFlowMLPM ); - minDialysateFlowMLPM ( vData.mMinDialysateFlowMLPM ); - maxDialysateFlowMLPM ( vData.mMaxDialysateFlowMLPM ); - minTxDurationMIN ( vData.mMinTxDurationMIN ); - maxTxDurationMIN ( vData.mMaxTxDurationMIN ); - minStopHepDispBeforeTxEndMIN ( vData.mMinStopHepDispBeforeTxEndMIN ); - maxStopHepDispBeforeTxEndMIN ( vData.mMaxStopHepDispBeforeTxEndMIN ); - minSalineBolVolumeML ( vData.mMinSalineBolVolumeML ); - maxSalineBolVolumeML ( vData.mMaxSalineBolVolumeML ); - minDialysateTempC ( vData.mMinDialysateTempC ); - maxDialysateTempC ( vData.mMaxDialysateTempC ); - minArtPressLimitWindowMMHG ( vData.mMinArtPressLimitWindowMMHG ); - maxArtPressLimitWindowMMHG ( vData.mMaxArtPressLimitWindowMMHG ); - minVenPressLimitWindowMMHG ( vData.mMinVenPressLimitWindowMMHG ); - maxVenPressLimitWindowMMHG ( vData.mMaxVenPressLimitWindowMMHG ); - minVenAsymPressLimitMMHG ( vData.mMinVenAsymPressLimitMMHG ); - maxVenAsymPressLimitMMHG ( vData.mMaxVenAsymPressLimitMMHG ); - minUltrafiltrationVolumeL ( vData.mMinUltrafiltrationVolumeL ); - maxUltrafiltrationVolumeL ( vData.mMaxUltrafiltrationVolumeL ); - minHepDispRateMLPM ( vData.mMinHepDispRateMLPM ); - maxHepDispRateMLPM ( vData.mMaxHepDispRateMLPM ); - minHepBolVolumeML ( vData.mMinHepBolVolumeML ); - maxHepBolVolumeML ( vData.mMaxHepBolVolumeML ); - enableChemicalDisinfect ( vData.mEnableChemicalDisinfect ); + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + minBloodFlowMLPM ( vData.mMinBloodFlowMLPM ); + maxBloodFlowMLPM ( vData.mMaxBloodFlowMLPM ); + minDialysateFlowMLPM ( vData.mMinDialysateFlowMLPM ); + maxDialysateFlowMLPM ( vData.mMaxDialysateFlowMLPM ); + minTxDurationMIN ( vData.mMinTxDurationMIN ); + maxTxDurationMIN ( vData.mMaxTxDurationMIN ); + minStopHepDispBeforeTxEndMIN ( vData.mMinStopHepDispBeforeTxEndMIN ); + maxStopHepDispBeforeTxEndMIN ( vData.mMaxStopHepDispBeforeTxEndMIN ); + minSalineBolVolumeML ( vData.mMinSalineBolVolumeML ); + maxSalineBolVolumeML ( vData.mMaxSalineBolVolumeML ); + minDialysateTempC ( vData.mMinDialysateTempC ); + maxDialysateTempC ( vData.mMaxDialysateTempC ); + minArtPressLimitWindowMMHG ( vData.mMinArtPressLimitWindowMMHG ); + maxArtPressLimitWindowMMHG ( vData.mMaxArtPressLimitWindowMMHG ); + minVenPressLimitWindowMMHG ( vData.mMinVenPressLimitWindowMMHG ); + maxVenPressLimitWindowMMHG ( vData.mMaxVenPressLimitWindowMMHG ); + minVenAsymPressLimitMMHG ( vData.mMinVenAsymPressLimitMMHG ); + maxVenAsymPressLimitMMHG ( vData.mMaxVenAsymPressLimitMMHG ); + minUltrafiltrationVolumeL ( vData.mMinUltrafiltrationVolumeL ); + maxUltrafiltrationVolumeL ( vData.mMaxUltrafiltrationVolumeL ); + minHepDispRateMLPM ( vData.mMinHepDispRateMLPM ); + maxHepDispRateMLPM ( vData.mMaxHepDispRateMLPM ); + minHepBolVolumeML ( vData.mMinHepBolVolumeML ); + maxHepBolVolumeML ( vData.mMaxHepBolVolumeML ); + enableChemicalDisinfect ( vData.mEnableChemicalDisinfect ); + maxRORejectionRatio ( vData.mMaxRORejectionRatio ); + minInletWaterCondAlarmLimituSPCm ( vData.mMinInletWaterCondALarmLimitUSPCM ); QStringList values; - values << QString("%1 - %2").arg(vData.mMinBloodFlowMLPM ).arg(vData.mMaxBloodFlowMLPM ); - values << QString("%1 - %2").arg(vData.mMinDialysateFlowMLPM ).arg(vData.mMaxDialysateFlowMLPM ); - values << QString("%1 - %2").arg(vData.mMinTxDurationMIN ).arg(vData.mMaxTxDurationMIN ); - values << QString("%1 - %2").arg(vData.mMinStopHepDispBeforeTxEndMIN ).arg(vData.mMaxStopHepDispBeforeTxEndMIN ); - values << QString("%1 - %2").arg(vData.mMinSalineBolVolumeML ).arg(vData.mMaxSalineBolVolumeML ); - values << QString("%1 - %2").arg(vData.mMinDialysateTempC ).arg(vData.mMaxDialysateTempC ); - values << QString("%1 - %2").arg(vData.mMinArtPressLimitWindowMMHG ).arg(vData.mMaxArtPressLimitWindowMMHG ); - values << QString("%1 - %2").arg(vData.mMinVenPressLimitWindowMMHG ).arg(vData.mMaxVenPressLimitWindowMMHG ); - values << QString("%1 - %2").arg(vData.mMinVenAsymPressLimitMMHG ).arg(vData.mMaxVenAsymPressLimitMMHG ); - 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 ? tr("Enabled") : tr("Disabled") ); + values << QString("%1 - %2").arg(vData.mMinBloodFlowMLPM ).arg(vData.mMaxBloodFlowMLPM ); + values << QString("%1 - %2").arg(vData.mMinDialysateFlowMLPM ).arg(vData.mMaxDialysateFlowMLPM ); + values << QString("%1 - %2").arg(vData.mMinTxDurationMIN ).arg(vData.mMaxTxDurationMIN ); + values << QString("%1 - %2").arg(vData.mMinStopHepDispBeforeTxEndMIN ).arg(vData.mMaxStopHepDispBeforeTxEndMIN ); + values << QString("%1 - %2").arg(vData.mMinSalineBolVolumeML ).arg(vData.mMaxSalineBolVolumeML ); + values << QString("%1 - %2").arg(vData.mMinDialysateTempC ).arg(vData.mMaxDialysateTempC ); + values << QString("%1 - %2").arg(vData.mMinArtPressLimitWindowMMHG ).arg(vData.mMaxArtPressLimitWindowMMHG ); + values << QString("%1 - %2").arg(vData.mMinVenPressLimitWindowMMHG ).arg(vData.mMaxVenPressLimitWindowMMHG ); + values << QString("%1 - %2").arg(vData.mMinVenAsymPressLimitMMHG ).arg(vData.mMaxVenAsymPressLimitMMHG ); + 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 ? tr("Enabled") : tr("Disabled") ); + values << QString("%1") .arg(vData.mMaxRORejectionRatio ) ; + values << QString("%1") .arg(vData.mMinInletWaterCondALarmLimitUSPCM ) ; 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 -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r67d114070507df5bfb72c8020cd4f796be987f53 --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 67d114070507df5bfb72c8020cd4f796be987f53) @@ -39,19 +39,21 @@ friend class ::tst_views; const QStringList _titles { - tr("Blood Flow Rate" ), - tr("Dialysate Flow Rate" ), - tr("Treatment Duration" ), - tr("Heparin Stop" ), - tr("Saline Bolus Volume" ), - tr("Dialysate Temperature" ), - tr("Arterial Pressure Limit" ), - tr("Venous Pressure Limit" ), - tr("Venous Asym Pressure Limit" ), - tr("Prescribed UF Volume" ), - tr("Heparin Dispense Rate" ), - tr("Heparin Bolus Volume" ), - tr("Chemical Disinfect" ), + tr("Blood Flow Rate" ), + tr("Dialysate Flow Rate" ), + tr("Treatment Duration" ), + tr("Heparin Stop" ), + tr("Saline Bolus Volume" ), + tr("Dialysate Temperature" ), + tr("Arterial Pressure Limit" ), + tr("Venous Pressure Limit" ), + tr("Venous Asym Pressure Limit" ), + tr("Prescribed UF Volume" ), + tr("Heparin Dispense Rate" ), + tr("Heparin Bolus Volume" ), + tr("Chemical Disinfect" ), + tr("Max RO Rejection Ratio" ), + tr("Min Inlet Water Cond Limit" ), }; const QStringList _units { @@ -68,6 +70,8 @@ tr("mL/hr" ), tr("mL" ), tr("" ), + tr("" ), + tr("uS/Cm" ), }; @@ -79,31 +83,33 @@ TRIGGER( bool , adjustment , 0) // disabled coco end - PROPERTY(quint32 , minBloodFlowMLPM , 0 ) - PROPERTY(quint32 , maxBloodFlowMLPM , 0 ) - PROPERTY(quint32 , minDialysateFlowMLPM , 0 ) - PROPERTY(quint32 , maxDialysateFlowMLPM , 0 ) - PROPERTY(quint32 , minTxDurationMIN , 0 ) - PROPERTY(quint32 , maxTxDurationMIN , 0 ) - PROPERTY(quint32 , minStopHepDispBeforeTxEndMIN , 0 ) - PROPERTY(quint32 , maxStopHepDispBeforeTxEndMIN , 0 ) - PROPERTY(quint32 , minSalineBolVolumeML , 0 ) - PROPERTY(quint32 , maxSalineBolVolumeML , 0 ) - PROPERTY(float , minDialysateTempC , 0.0 ) - PROPERTY(float , maxDialysateTempC , 0.0 ) - PROPERTY(qint32 , minArtPressLimitWindowMMHG , 0 ) - PROPERTY(qint32 , maxArtPressLimitWindowMMHG , 0 ) - PROPERTY(qint32 , minVenPressLimitWindowMMHG , 0 ) - PROPERTY(qint32 , maxVenPressLimitWindowMMHG , 0 ) - PROPERTY(qint32 , minVenAsymPressLimitMMHG , 0 ) - PROPERTY(qint32 , maxVenAsymPressLimitMMHG , 0 ) - PROPERTY(float , minUltrafiltrationVolumeL , 0.0 ) - PROPERTY(float , maxUltrafiltrationVolumeL , 0.0 ) - PROPERTY(float , minHepDispRateMLPM , 0.0 ) - PROPERTY(float , maxHepDispRateMLPM , 0.0 ) - PROPERTY(float , minHepBolVolumeML , 0.0 ) - PROPERTY(float , maxHepBolVolumeML , 0.0 ) - PROPERTY(bool , enableChemicalDisinfect , true ) + PROPERTY(quint32 , minBloodFlowMLPM , 0 ) + PROPERTY(quint32 , maxBloodFlowMLPM , 0 ) + PROPERTY(quint32 , minDialysateFlowMLPM , 0 ) + PROPERTY(quint32 , maxDialysateFlowMLPM , 0 ) + PROPERTY(quint32 , minTxDurationMIN , 0 ) + PROPERTY(quint32 , maxTxDurationMIN , 0 ) + PROPERTY(quint32 , minStopHepDispBeforeTxEndMIN , 0 ) + PROPERTY(quint32 , maxStopHepDispBeforeTxEndMIN , 0 ) + PROPERTY(quint32 , minSalineBolVolumeML , 0 ) + PROPERTY(quint32 , maxSalineBolVolumeML , 0 ) + PROPERTY(float , minDialysateTempC , 0.0 ) + PROPERTY(float , maxDialysateTempC , 0.0 ) + PROPERTY(qint32 , minArtPressLimitWindowMMHG , 0 ) + PROPERTY(qint32 , maxArtPressLimitWindowMMHG , 0 ) + PROPERTY(qint32 , minVenPressLimitWindowMMHG , 0 ) + PROPERTY(qint32 , maxVenPressLimitWindowMMHG , 0 ) + PROPERTY(qint32 , minVenAsymPressLimitMMHG , 0 ) + PROPERTY(qint32 , maxVenAsymPressLimitMMHG , 0 ) + PROPERTY(float , minUltrafiltrationVolumeL , 0.0 ) + PROPERTY(float , maxUltrafiltrationVolumeL , 0.0 ) + PROPERTY(float , minHepDispRateMLPM , 0.0 ) + PROPERTY(float , maxHepDispRateMLPM , 0.0 ) + PROPERTY(float , minHepBolVolumeML , 0.0 ) + PROPERTY(float , maxHepBolVolumeML , 0.0 ) + PROPERTY(bool , enableChemicalDisinfect , true ) + PROPERTY(float , maxRORejectionRatio , 0.0 ) + PROPERTY(float , minInletWaterCondAlarmLimituSPCm , 0.0 ) PROPERTY(QStringList , parametersTitle , titles()) PROPERTY(QStringList , parametersText , {} )