Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -482,6 +482,7 @@ mData += vData.mArterialPressureLimitWindow ; mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; + mData += vData.mTmpLimitWindow ; onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -170,8 +170,8 @@ {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 5 * 4 }, // 5 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 3 * 4 }, // 3 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 4 * 4 }, // 4 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 6 * 4 }, // 6 parameters each 4bytes // Pre-Treatment // Create Parameters Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -243,8 +243,8 @@ ID_AdjustBloodDialysateReq = 0x1700, // 23 ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustPressuresLimitsReq = 0x470F, // 70 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustPressuresLimitsRsp = 0x480F, // 71 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPressuresLimitsReq = 0x7800, // 120 //// ----- @LEAHIZED + ID_AdjustPressuresLimitsRsp = 0x7900, // 121 //// ----- @LEAHIZED ID_AdjustSalineReq = 0x5F00, // 95 ID_AdjustSalineRsp = 0x6000, // 96 Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rd5e9940fa96373f6cc118dfa9761d95f361689a5 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision d5e9940fa96373f6cc118dfa9761d95f361689a5) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -105,7 +105,7 @@ _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow , _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow , _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc , - _treatmentAdjustmentPressuresLimits.tmpPressureLimitWindow + _treatmentAdjustmentPressuresLimits.tmpLimitWindow ) } } @@ -141,17 +141,11 @@ Connections { target: vTreatmentAdjustmentPressuresLimits function onAdjustmentTriggered ( vValue ) { - // values have to be update even when rejected HD is reverting back the values. - // if accepted will be updated for later [may need refresh later] - _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow - _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow - _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc = vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc - if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) { _treatmentAdjustmentPressuresLimits.close() } else { - _treatmentAdjustmentPressuresLimits.notification.text = vTreatmentAdjustmentPressuresLimits.text() + _treatmentAdjustmentPressuresLimits.notification.text = vTreatmentAdjustmentPressuresLimits.adjustment_ReasonText } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rd5e9940fa96373f6cc118dfa9761d95f361689a5 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision d5e9940fa96373f6cc118dfa9761d95f361689a5) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -28,17 +28,30 @@ * To adjust the treatment inline blood pressure ranges of Arterial and venous */ TreatmentAdjustmentBase { id: _root - objectName: "_TreatmentAdjustmentPressures" // SquishQt testability + objectName: "_TreatmentAdjustmentPressuresLimits" // SquishQt testability readonly property alias arterialPressureLimitWindow : _arterialWindow.value readonly property alias venousPressureLimitWindow : _venousWindow.value readonly property alias venousPressureLimitAsymtrc : _venousAsymmetricWindow.value - readonly property alias tmpPressureLimitWindow : _tmpWindow.value + readonly property alias tmpLimitWindow : _tmpWindow.value titleText: qsTr("Pressure Window Limit Settings") - contentItem: Item { id: _contentItem + onAboutToShow: { + _arterialWindow.value = vTreatmentCreate.arterialPressureLimitWindow + _venousWindow.value = vTreatmentCreate.venousPressureLimitWindow + _venousAsymmetricWindow.value = vTreatmentCreate.venousPressureLimitAsymtrc + _tmpWindow.value = vTreatmentCreate.trancembrncPressureLimitWindow + } + + Item { id: _contentItem objectName: "_contentItem" + anchors { + top: parent.top + bottom: notification.top + left: parent.left + right: parent.right + } Item { id: _contentArea objectName: "_contentArea" @@ -60,10 +73,13 @@ titleFontPixelSize : Fonts.fontPixelContainerTitleSmall unitText : Variables.unitTextPressure unitFontPixelSize : Fonts.fontPixelContainerUnitSmall + isActive : true minimum : vTreatmentRanges.arterialPressureLimitWindowMin maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes value : { value = vTreatmentRanges.arterialPressureLimitWindowDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } LabelUnitValueAdjuster { id: _venousWindow @@ -72,10 +88,13 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize + isActive : true minimum : vTreatmentRanges.venousPressureLimitWindowMin maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes value : { value = vTreatmentRanges.venousPressureLimitWindowDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } LabelUnitValueAdjuster { id: _venousAsymmetricWindow @@ -84,10 +103,13 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize + isActive : true minimum : vTreatmentRanges.venousPressureLimitAsymtrcMin maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes value : { value = vTreatmentRanges.venousPressureLimitAsymtrcDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } LabelUnitValueAdjuster { id: _tmpWindow @@ -96,10 +118,13 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize - minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin - maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax - step : vTreatmentRanges.trancembrncPressureLimitWindowRes - value : { value = vTreatmentRanges.trancembrncPressureLimitWindowDef } // set without binding + isActive : true + minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin + maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax + step : vTreatmentRanges.trancembrncPressureLimitWindowRes + value : { value = vTreatmentRanges.trancembrncPressureLimitWindowDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } } } @@ -108,6 +133,7 @@ objectName : "_confirmButton" anchors { bottom : parent.bottom + bottomMargin : Variables.defaultMargin horizontalCenter: parent.horizontalCenter } width : Variables.defaultButtonWidth @@ -119,14 +145,8 @@ isDefault : true onClicked : { - _root.onConfirmClicked() + _root.confirmClicked() } } } - - footer: Item { id: _footerItem - objectName : "_footerItem" - width : parent.width - height : Variables.notificationHeight - } } Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------:| - * |0x4700| 0x020 | 6 | Rsp | Y | HD | UI | A/V BP Limit Change Response | + * |0x7200| 0x020 | 6 | Rsp | Y | HD | UI | A/V BP Limit Change Response | * * | Payload || * | || @@ -41,6 +41,7 @@ * | #3:(S32) | \ref Data::mArterialPressureLimitWindow | * | #4:(S32) | \ref Data::mVenousPressureLimitWindow | * | #5:(S32) | \ref Data::mVenousPressureLimitAsymtrc | + * | #6:(S32) | \ref Data::mTmpLimitWindow | * * \sa Data * \sa MAdjustPressureLimitsReq : Pressures limits adjustment request @@ -67,6 +68,7 @@ Types::S32 mArterialPressureLimitWindow ; Types::S32 mVenousPressureLimitWindow ; Types::S32 mVenousPressureLimitAsymtrc ; + Types::S32 mTmpLimitWindow ; } _data; public: @@ -81,6 +83,7 @@ qint32 mArterialPressureLimitWindow = 0; /*!< ArterialLimitWindow value of type qint32 extracted out */ qint32 mVenousPressureLimitWindow = 0; /*!< VenousLimitWindow value of type qint32 extracted out */ qint32 mVenousPressureLimitAsymtrc = 0; /*!< VenousLimitAsymmetric value of type qint32 extracted out */ + qint32 mTmpLimitWindow = 0; /*!< TmpLimitWindow value of type qint32 extracted out */ }; MAdjustPressuresLimitsResponse () { } Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -309,22 +309,25 @@ * | #1:(S32) | \ref mArterialPressureLimitWindow | (mmHg) | * | #2:(S32) | \ref mVenousPressureLimitWindow | (mmHg) | * | #3:(S32) | \ref mVenousPressureLimitAsymtrc | (mmHg) | + * | #4:(S32) | \ref mTmpPressureLimitWindow | (mmHg) | * * \sa MPressureOcclusion : Pressure data broadcast * \sa MAdjustPressuresResponse : Pressures limit adjustment response * */ class MAdjustPressuresLimitsReq : public MModel { public: - qint32 mArterialPressureLimitWindow = 0; ///< (S32) Arterial Pressure Limit Window (mmHg) - qint32 mVenousPressureLimitWindow = 0; ///< (S32) Venous Pressure Limit Window (mmHg) - qint32 mVenousPressureLimitAsymtrc = 0; ///< (S32) Venous Pressure Limit Asymmetric(mmHg) + qint32 mArterialPressureLimitWindow = 0; ///< (S32) Arterial Pressure Limit Window (mmHg) + qint32 mVenousPressureLimitWindow = 0; ///< (S32) Venous Pressure Limit Window (mmHg) + qint32 mVenousPressureLimitAsymtrc = 0; ///< (S32) Venous Pressure Limit Asymmetric (mmHg) + qint32 mTmpLimitWindow = 0; ///< (S32) Transmembrane Pressure Limit Window (mmHg) QString toString() { return toString ({ mArterialPressureLimitWindow , mVenousPressureLimitWindow , - mVenousPressureLimitAsymtrc + mVenousPressureLimitAsymtrc , + mTmpLimitWindow }); } static QString toString(const QVariantList &vParameters) { Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -25,6 +25,27 @@ } /*! + * \brief View::VTreatmentAdjustmentPressuresLimits::doAdjustment + * \details the invocable slot to adjust the treatment pressure limits + * \param vArterialPressureLimitWindow - requested arterial pressure window limit + * \param vVenousPressureLimitWindow - requested venous pressure window limit + * \param vVenousPressureLimitAsymtrc - requested venous pressure asymmetrics limit + * \param vTmpLimitWindow - requested TMP window limit + */ +void VTreatmentAdjustmentPressuresLimits::doAdjustment( + qint32 vArterialPressureLimitWindow, + qint32 vVenousPressureLimitWindow, + qint32 vVenousPressureLimitAsymtrc, + qint32 vTmpLimitWindow) +{ + _data.mArterialPressureLimitWindow = vArterialPressureLimitWindow ; + _data.mVenousPressureLimitWindow = vVenousPressureLimitWindow ; + _data.mVenousPressureLimitAsymtrc = vVenousPressureLimitAsymtrc ; + _data.mTmpLimitWindow = vTmpLimitWindow ; + emit didAdjustment(_data); +} + +/*! * \brief VTreatmentAdjustmentPressures::onActionReceive * \details Model data received message handler. * When signal received this method is called to update the view properties. @@ -37,6 +58,7 @@ arterialPressureLimitWindow ( vData.mArterialPressureLimitWindow ); venousPressureLimitWindow ( vData.mVenousPressureLimitWindow ); venousPressureLimitAsymtrc ( vData.mVenousPressureLimitAsymtrc ); + tmpLimitWindow ( vData.mTmpLimitWindow ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -48,9 +48,9 @@ PROPERTY( qint32 , arterialPressureLimitWindow , 0) PROPERTY( qint32 , venousPressureLimitWindow , 0) PROPERTY( qint32 , venousPressureLimitAsymtrc , 0) + PROPERTY( qint32 , tmpLimitWindow , 0) - VIEW_DEC_CLASS (VTreatmentAdjustmentPressuresLimits) - VIEW_DEC_SLOT (AdjustPressuresLimitsResponseData) + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) public slots: /*! @@ -59,15 +59,12 @@ * \param vArterialLimitWindow * \param vVenousLimitWindow * \param vVenousLimitAsymtrc + * \param vTmpLimitWindow */ void doAdjustment( qint32 vArterialPressureLimitWindow , qint32 vVenousPressureLimitWindow , - qint32 vVenousPressureLimitAsymtrc ) { - _data.mArterialPressureLimitWindow = vArterialPressureLimitWindow ; - _data.mVenousPressureLimitWindow = vVenousPressureLimitWindow ; - _data.mVenousPressureLimitAsymtrc = vVenousPressureLimitAsymtrc ; - emit didAdjustment(_data); - } + qint32 vVenousPressureLimitAsymtrc , + qint32 vTmpLimitWindow ); signals: /*!