Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r38677167535b480612809a53d824b86e11b2e5f9 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 38677167535b480612809a53d824b86e11b2e5f9) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -272,7 +272,9 @@ void MessageDispatcher::onAdjustment(const AdjustDurationConfirmRequestData &vData) { QVariantList mData; - mData += vData.duration; + mData += vData.duration ; + mData += vData.heparinDuration ; + mData += vData.rate ; onActionTransmit(GuiActionType::ID_AdjustDurationConfirmReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r9c2a4c5abe3a93c3b3a7ed3d6fd9e12f0c161b3c -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9c2a4c5abe3a93c3b3a7ed3d6fd9e12f0c161b3c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -163,13 +163,13 @@ // ---- {Gui::GuiActionType::ID_AdjustDurationEditReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustDurationEditRsp , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDurationConfirmReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDurationEditRsp , 6 * 4 }, // 6 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDurationConfirmReq , 3 * 4 }, // 3 parameter each 4bytes {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustSetPointsReq , 10 * 4 }, // 5 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustSetPointsRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustSetPointsRsp , 11 * 4 }, // 11 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustBloodFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml =================================================================== diff -u -r3b09007701d2da7cced59daa8093094df12590cd -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision 3b09007701d2da7cced59daa8093094df12590cd) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -33,8 +33,9 @@ property real ufVolumeGoal : 0 property real ufRate : 0 property int newTreatmentDuration : 0 + property int newHeparinDuration : 0 - signal confirmClicked(int vNewTreatmentDuration) + signal confirmClicked(int vNewTreatmentDuration, int vNewHeparinDuration, real vRate) Row { id: _infoRow objectName: "_infoRow" @@ -57,6 +58,16 @@ valueColor : Colors.ufVolumeGoalText } + LabelUnitText { id: _newHeparinDuration + objectName: "_newHeparinDuration" + width : _infoRow.cellWidth + label : qsTr("New Heparin Duration") + unit : Variables.unitTextDuration + value : _root.newHeparinDuration + valueColor : Colors.ufVolumeGoalText + visible : vSettings.heparinSyringePump + } + LabelUnitText { id: _ufVolumeGoal objectName : "_ufVolumeGoal" width : _infoRow.cellWidth @@ -123,7 +134,9 @@ isDefault : true onClicked : { - _root.confirmClicked(_root.newTreatmentDuration) + _root.confirmClicked(_newTreatmentDuration.value, + _newHeparinDuration.value , + _ufRate.value ) } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationStack.qml =================================================================== diff -u -r5c13b67267f6919fd7fcc7b970bd7c0ee7de12d3 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationStack.qml (.../TreatmentAdjustmentDurationStack.qml) (revision 5c13b67267f6919fd7fcc7b970bd7c0ee7de12d3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationStack.qml (.../TreatmentAdjustmentDurationStack.qml) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -87,10 +87,10 @@ _root.notificationText = "" } - onConfirmClicked : function(vNewTreatmentDuration) { + onConfirmClicked : function(vNewTreatmentDuration, vNewHeparinDuration, vRate) { // send new duration to TD and wait // if accepted moves to confirm screen, otherwise show error in notification - vTreatmentAdjustmentDurationConfirm.doConfirm(vNewTreatmentDuration) + vTreatmentAdjustmentDurationConfirm.doConfirm(vNewTreatmentDuration, vNewHeparinDuration, vRate) } } @@ -100,6 +100,7 @@ notification.text = "" _treatmentAdjustmentDurationConfirm.newTreatmentDuration = vTreatmentAdjustmentDurationEdit.duration + _treatmentAdjustmentDurationConfirm.newHeparinDuration = vTreatmentAdjustmentDurationEdit.heparinDuration _treatmentAdjustmentDurationConfirm.ufVolumeGoal = vTreatmentAdjustmentDurationEdit.ufVolumeGoal _treatmentAdjustmentDurationConfirm.ufRate = vTreatmentAdjustmentDurationEdit.ufRate Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r9c2a4c5abe3a93c3b3a7ed3d6fd9e12f0c161b3c -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 9c2a4c5abe3a93c3b3a7ed3d6fd9e12f0c161b3c) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -151,15 +151,21 @@ * * | Payload || * | || - * | #1:(U32) | \ref duration | + * | #1:(U32) | \ref duration | + * | #2:(U32) | \ref heparinDuration | + * | #3:(F32) | \ref rate | * */ class MAdjustDurationConfirmReq : public MModel { public: - quint32 duration = 0; + quint32 duration = 0; + quint32 heparinDuration = 0; + float rate = 0; QString toString() { - return toString({duration}); + return toString({duration, + heparinDuration, + rate}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustDurationConfirm", vParameters); Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -18,21 +18,23 @@ QVariantList MAdjustDurationEditResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - _data.mDuration .value, - _data.mUFVolumeGoal .value, - _data.mUFRate .value + _data.mAccepted .value, + _data.mReason .value, + _data.mDuration .value, + _data.mHeparinDuration .value, + _data.mUFVolumeGoal .value, + _data.mUFRate .value }; } bool MAdjustDurationEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFVolumeGoal )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeGoal )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; return true ; @@ -49,10 +51,11 @@ */ AdjustDurationEditResponseData MAdjustDurationEditResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mDuration = _data.mDuration .value; - data.mUFVolumeGoal = _data.mUFVolumeGoal .value; - data.mUFRate = _data.mUFRate .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mHeparinDuration = _data.mHeparinDuration.value; + data.mUFVolumeGoal = _data.mUFVolumeGoal .value; + data.mUFRate = _data.mUFRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h =================================================================== diff -u -r8325066ffcce349e21df74e33bd3d298d3042ef3 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h (.../MTreatmentAdjustDurationEditResponse.h) (revision 8325066ffcce349e21df74e33bd3d298d3042ef3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h (.../MTreatmentAdjustDurationEditResponse.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -40,8 +40,9 @@ * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | * | #3:(U32) | \ref Data::mDuration | - * | #4:(F32) | \ref Data::mUFVolumeGoal | - * | #4:(F32) | \ref Data::mUFRate | + * | #4:(U32) | \ref Data::mHeparinDuration | + * | #5:(F32) | \ref Data::mUFVolumeGoal | + * | #6:(F32) | \ref Data::mUFRate | * * \sa Data * @@ -62,11 +63,12 @@ struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mDuration ; - Types::F32 mUFVolumeGoal ; - Types::F32 mUFRate ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mDuration ; + Types::U32 mHeparinDuration ; + Types::F32 mUFVolumeGoal ; + Types::F32 mUFRate ; } _data; public: @@ -79,6 +81,7 @@ bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ quint32 mDuration = 0; /*!< Duration value of type quint32 extracted out */ + quint32 mHeparinDuration= 0; /*!< Heparin Duration value of type quint32 extracted out */ float mUFVolumeGoal = 0; /*!< UF Volume Goal value of type float extracted out */ float mUFRate = 0; /*!< UF Rate value of type float extracted out */ }; Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp =================================================================== diff -u -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -29,9 +29,11 @@ * \details the invocable slot to adjust the treatment duration * \param vDuration - treatment duration */ -void VTreatmentAdjustmentDurationConfirm::doConfirm(const quint32 vDuration) +void VTreatmentAdjustmentDurationConfirm::doConfirm(const quint32 vDuration, const quint32 vHeparinDuration, const float vRate) { - _data.duration = vDuration; + _data.duration = vDuration; + _data.heparinDuration = vHeparinDuration; + _data.rate = vRate; emit didAdjustment(_data); } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h =================================================================== diff -u -r48343520806859178923efdcca8a95f6af8599e9 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision 48343520806859178923efdcca8a95f6af8599e9) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -47,7 +47,7 @@ // ----- Adjust Duration public slots: - void doConfirm(const quint32 vDuration); + void doConfirm(const quint32 vDuration, const quint32 vHeparinDuration, const float vRate); signals: /*! Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp =================================================================== diff -u -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp (.../VTreatmentAdjustmentDurationEdit.cpp) (revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp (.../VTreatmentAdjustmentDurationEdit.cpp) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -40,7 +40,8 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); duration ( vData.mDuration ); - ufVolumeGoal ( vData.mUFVolumeGoal / 1000 ); // mL => L + heparinDuration ( vData.mHeparinDuration ); + ufVolumeGoal ( vData.mUFVolumeGoal ); ufRate ( vData.mUFRate ); // *** has to be the last to let the information to be set and then emit the signal *** Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -re6ffa6d5d1b7820875de07cdbb15f06617400344 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h (.../VTreatmentAdjustmentDurationEdit.h) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h (.../VTreatmentAdjustmentDurationEdit.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) @@ -44,9 +44,10 @@ TRIGGER( bool , adjustment , 0) // Treatment Duration data - READONLY( quint32 , duration , 0) - READONLY( float , ufVolumeGoal , 0) - READONLY( float , ufRate , 0) + READONLY( quint32 , duration , 0) + READONLY( quint32 , heparinDuration , 0) + READONLY( float , ufVolumeGoal , 0) + READONLY( float , ufRate , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationEdit, AdjustDurationEditResponseData)