Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -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 , 29 * 4 }, //29 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 31 * 4 }, //31 parameters each 4 bytes // HD reset request in service mode {Gui::GuiActionType::ID_ResetHDInServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -448,7 +448,7 @@ case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; case Gui::GuiActionType::ID_HDUsageInfoRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp ); break; - case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp ); break; + case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp ); break; // ----- States case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break; case Gui::GuiActionType::ID_PreTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates ); break; Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -38,7 +38,7 @@ colCount : 2 colSpacing : 50 - rowCount : 8 // this number indicates when to move to the next column + rowCount : 9 // 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 -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp (.../MAdjustHDInstitutionalRecordResponse.cpp) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -49,6 +49,7 @@ _data.mMinRORejectionRatioPCT .value, _data.mMinInletWaterCondALarmLimitUSPCM .value, _data.mMinVenPressWideLimitWindowMMHG .value, + _data.mTreatmentEndBloodFlowMLPM .value, }; } @@ -84,6 +85,7 @@ if (GetValue(vByteArray, index, _data.mMinRORejectionRatioPCT )) if (GetValue(vByteArray, index, _data.mMinInletWaterCondALarmLimitUSPCM )) if (GetValue(vByteArray, index, _data.mMinVenPressWideLimitWindowMMHG )) + if (GetValue(vByteArray, index, _data.mTreatmentEndBloodFlowMLPM )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -115,6 +117,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; } } /*! @@ -154,5 +157,6 @@ data.mMinRORejectionRatioPCT = _data.mMinRORejectionRatioPCT .value; data.mMinInletWaterCondALarmLimitUSPCM = _data.mMinInletWaterCondALarmLimitUSPCM .value; data.mMinVenPressWideLimitWindowMMHG = _data.mMinVenPressWideLimitWindowMMHG .value; + data.mTreatmentEndBloodFlowMLPM = _data.mTreatmentEndBloodFlowMLPM .value; return data; } Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -66,6 +66,7 @@ * | #28:(U32) | \ref Data::mMinRORejectionRatioPCT | * | #29:(F32) | \ref Data::mMinInletWaterCondALarmLimitUSPCM | * | #30:(S32) | \ref Data::mMinVenPressWideLimitWindowMMHG | + * | #31:(U32) | \ref Data::mTreatmentEndBloodFlowMLPM | * * \sa Data * @@ -115,6 +116,7 @@ Types::U32 mMinRORejectionRatioPCT ; Types::F32 mMinInletWaterCondALarmLimitUSPCM ; Types::S32 mMinVenPressWideLimitWindowMMHG ; + Types::U32 mTreatmentEndBloodFlowMLPM ; } _data; public: @@ -153,6 +155,7 @@ quint32 mMinRORejectionRatioPCT ; float mMinInletWaterCondALarmLimitUSPCM; qint32 mMinVenPressWideLimitWindowMMHG ; + quint32 mTreatmentEndBloodFlowMLPM ; }; MAdjustInstitutionalRecordResponse () { } Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -58,6 +58,7 @@ minRORejectionRatioPCT ( vData.mMinRORejectionRatioPCT ); minInletWaterCondAlarmLimituSPCm ( vData.mMinInletWaterCondALarmLimitUSPCM ); minVenPressWideLimitWindowMMHG ( vData.mMinVenPressWideLimitWindowMMHG ); + treatmentEndBloodFlowMLPM ( vData.mTreatmentEndBloodFlowMLPM ); QStringList values; @@ -77,6 +78,7 @@ values << QString("%1") .arg(vData.mMinRORejectionRatioPCT ) ; values << QString("%1") .arg(vData.mMinInletWaterCondALarmLimitUSPCM ) ; values << QString("%1") .arg(vData.mMinVenPressWideLimitWindowMMHG ) ; + values << QString("%1") .arg(vData.mTreatmentEndBloodFlowMLPM ) ; 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 -r52bd89b3860281744d9794f0f003c36c4d59a2dc -r9d3c1f1f716d92d21894c81552421b81063ada64 --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 52bd89b3860281744d9794f0f003c36c4d59a2dc) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 9d3c1f1f716d92d21894c81552421b81063ada64) @@ -55,6 +55,7 @@ tr("RO Rejection Ratio" ), tr("Min Inlet Water Cond Limit" ), tr("Min Venous Wide Limit" ), + tr("End Blood Flow Rate" ), }; const QStringList _units { @@ -74,6 +75,7 @@ tr("%" ), tr("uS/Cm" ), tr("mmHg" ), + tr("mL/min" ), }; @@ -113,6 +115,7 @@ PROPERTY(qint32 , minRORejectionRatioPCT , 0 ) PROPERTY(float , minInletWaterCondAlarmLimituSPCm , 0.0 ) PROPERTY(qint32 , minVenPressWideLimitWindowMMHG , 0 ) + PROPERTY(quint32 , treatmentEndBloodFlowMLPM , 0 ) PROPERTY(QStringList , parametersTitle , titles()) PROPERTY(QStringList , parametersText , {} )