Index: denali.pro =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- denali.pro (.../denali.pro) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ denali.pro (.../denali.pro) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -74,6 +74,7 @@ sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ @@ -128,6 +129,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ @@ -193,6 +195,7 @@ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ @@ -245,9 +248,10 @@ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ Index: denali.pro.user =================================================================== diff -u -r3ca41db18dc8b7b19e8810e99d732558ce3f7f86 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- denali.pro.user (.../denali.pro.user) (revision 3ca41db18dc8b7b19e8810e99d732558ce3f7f86) +++ denali.pro.user (.../denali.pro.user) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -248,6 +248,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Ultrafiltration Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) +{ + QVariantList mData; + mData += vData.volume; + onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Ultrafiltration State Adjustment Denali message. * \param vData - Data model contains treatment ultrafiltration state adjustment * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -108,7 +108,7 @@ QList _needsAcknow { GuiActionType::ID_AdjustBloodDialysateReq , GuiActionType::ID_AdjustDurationReq , - GuiActionType::ID_AdjustUltrafiltrationReq , + GuiActionType::ID_AdjustUltrafiltrationInitReq , GuiActionType::ID_AdjustUltrafiltrationStateReq , GuiActionType::ID_AdjustUltrafiltrationEditReq , GuiActionType::ID_AdjustUltrafiltrationConfirmReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -98,8 +98,8 @@ {Gui::GuiActionType::ID_AdjustDurationRsp , 4 * 4 }, // 4 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustUltrafiltrationReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationRsp , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp , 3 * 4 }, // 3 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq , 1 * 4 }, // 1 parameter each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r3ca41db18dc8b7b19e8810e99d732558ce3f7f86 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 3ca41db18dc8b7b19e8810e99d732558ce3f7f86) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -219,6 +219,7 @@ case Gui::GuiActionType::ID_PowerOff : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData ); break; case Gui::GuiActionType::ID_AdjustDurationReq : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationInitRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData); break; @@ -324,6 +325,7 @@ case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -32,7 +32,6 @@ #include "VTreatmentBloodFlow.h" #include "VTreatmentDialysateFlow.h" #include "VTreatmentUltrafiltration.h" -#include "VTreatmentAdjustmentUltrafiltrationState.h" #include "VTreatmentPressureOcclusion.h" #include "VTreatmentTime.h" #include "VTreatmentRanges.h" @@ -56,6 +55,8 @@ #include "VTreatmentEnd.h" #include "VTreatmentAdjustmentDuration.h" #include "VTreatmentAdjustmentFlows.h" +#include "VTreatmentAdjustmentUltrafiltrationInit.h" +#include "VTreatmentAdjustmentUltrafiltrationState.h" #include "VTreatmentAdjustmentUltrafiltrationEdit.h" #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" #include "VTreatmentAdjustmentSaline.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -136,8 +136,8 @@ // Ultrafiltration: has also In-Treatment Adjustables but kept together - ID_AdjustUltrafiltrationReq = 0x4F00, // 79 - ID_AdjustUltrafiltrationRsp = 0x5000, // 80 + ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 + ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 Index: sources/gui/qml/main.qml =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/gui/qml/main.qml (.../main.qml) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/gui/qml/main.qml (.../main.qml) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -48,6 +48,7 @@ import VPriming 0.1; import VTreatmentBegin 0.1; import VTreatmentEnd 0.1; +import VTreatmentAdjustmentUltrafiltrationInit 0.1; // Qml imports import "qrc:/globals" @@ -106,6 +107,7 @@ VPriming { id: vPriming } VTreatmentBegin { id: vTreatmentBegin } VTreatmentEnd { id: vTreatmentEnd } + VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } // ----- Follow the below Z order ----- // 1 - Screens Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -112,23 +112,24 @@ } - TouchRect { id: _nextButton + TouchRect { id: _startButton width : 515 height : 70 anchors { top: parent.top topMargin: 650 horizontalCenter: parent.horizontalCenter } - + disabled: ! _volumeSlider.isActive backgroundColor: Colors.backgroundButtonSelect - text { text: qsTr("START") font.weight : Font .DemiBold font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentButton } - // onClicked: nextClicked( _private.adjusted.toFixed(_private.decimal) ) + onClicked: { + clickedStart(vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_volumeSlider.value)) + } } onVisibleChanged: { Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -112,8 +112,8 @@ anchors.topMargin: 50 width: 490 height: 60 - text.text: vPriming.continueBtnText - enabled : vPriming.continueEnabled + text.text: vPriming.continueBtnText + disabled : ! vPriming.primingComplete // vPriming.continueEnabled onEnabledChanged: { if (enabled) { borderColor = Colors.primingReady Index: sources/model/MModel.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/model/MModel.h (.../MModel.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/model/MModel.h (.../MModel.h) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -50,6 +50,7 @@ #include "MTreatmentAdjustRequests.h" #include "MTreatmentAdjustDurationResponse.h" #include "MTreatmentAdjustBloodDialysateResponse.h" +#include "MTreatmentAdjustUltrafiltrationInitResponse.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" @@ -219,6 +220,7 @@ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ @@ -232,6 +234,7 @@ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ @@ -285,9 +288,10 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, StartTreatmentResponseData ) \ @@ -302,6 +306,7 @@ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ @@ -363,9 +368,10 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( StartTreatmentResponseData ) \ @@ -379,6 +385,7 @@ /* Request --------------------------------------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ @@ -396,6 +403,7 @@ /* Request ----------------------- NoEmit -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ @@ -413,6 +421,7 @@ /* Request ----------------------- public -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ @@ -461,9 +470,10 @@ ACTION_RECEIVE_SIGNAL( StartTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( EndTreatmentResponseData ) \ \ - ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentParametersResponseData ) \ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r4bbec52d2257cfdef37604e3453846e501a2af91 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -137,6 +137,33 @@ }; /*! + * \brief The MAdjustUltrafiltrationEditReq class + * \details The ultrafiltration volume change request model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4F00| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Initial Adjustment Request | + * + * | Payload || + * | || + * | #1:(F32) | \ref volume | + * + */ +class MAdjustUltrafiltrationInitReq : public MModel { +public: + float volume = 0; + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({volume}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustUFInit", vParameters); + } +}; + +/*! * \brief The MAdjustUltrafiltrationStateReq class * \details The ultrafiltration pause/resume request model * @@ -566,6 +593,7 @@ typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; typedef Model:: MAdjustDurationReq AdjustDurationRequestData; +typedef Model:: MAdjustUltrafiltrationInitReq AdjustUltrafiltrationInitRequestData; typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MTreatmentAdjustUltrafiltrationInitResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 08-Dec-2020 + * \author (original) Behrouz NematiPour + * \date (original) 08-Dec-2020 + * + */ +#include "MTreatmentAdjustUltrafiltrationInitResponse.h" + +using namespace Model; + +QVariantList MAdjustUltrafiltrationInitResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mVolume .value + }; +} + +bool MAdjustUltrafiltrationInitResponse::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.mVolume )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustUltrafiltrationInitResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustUltrafiltrationInitResponseData MAdjustUltrafiltrationInitResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mVolume = _data.mVolume .value; + return data; +} Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -0,0 +1,86 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MTreatmentAdjustUltrafiltrationInitResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 08-Dec-2020 + * \author (original) Behrouz NematiPour + * \date (original) 08-Dec-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustUltrafiltrationInitResponse class + * \details The UF vol. change response model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x5000| 0x020 | 6 | Rsp | Y | HD | UI | UF Vol. Initial adjustment Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(F32) | \ref Data::mVolume | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustUFInit | + * + */ +class MAdjustUltrafiltrationInitResponse : public MAbstract +{ + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; ///< Accepted or rejected + Types::U32 mReason ; ///< the rejections reason + Types::F32 mVolume ; ///< The Ultrafiltration volume accepted + } _data; + +public: + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("AdjustUFInit"); } + + struct Data { + bool mAccepted = 0; ///< Accepted value of type quint32 extracted out + quint32 mReason = 0; ///< Reason value of type quint32 extracted out + float mVolume = 0; ///< volume value of type float extracted out + }; + +public: + MAdjustUltrafiltrationInitResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustUltrafiltrationInitResponse::Data AdjustUltrafiltrationInitResponseData; Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -886,12 +886,12 @@ /** * @brief VCreateTreatment::doCancelConfirmParameters - * Notifies FW the user has cancelled confirming the treatment parameters + * Notifies FW the user has canceled confirming the treatment parameters */ void VTreatmentCreate::doCancelConfirmParameters() { // Tell FW we cancel confirm - qDebug() << "Telling FW user is cancelling confirm treatment parameters..."; + qDebug() << "Telling FW user is canceling confirm treatment parameters..."; confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eCancel; emit requestConfirm(confirmTreatmentRequest); goToNextPage(false); Index: sources/view/VView.h =================================================================== diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r28f3f8dd18981262995386d29d3c2ab31418bfc4 --- sources/view/VView.h (.../VView.h) (revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53) +++ sources/view/VView.h (.../VView.h) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -128,6 +128,7 @@ \ REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationInit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -0,0 +1,55 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VTreatmentAdjustmentUltrafiltrationInit.cpp + * \author (last) Behrouz NematiPour + * \date (last) 08-Dec-2020 + * \author (original) Behrouz NematiPour + * \date (original) 08-Dec-2020 + * + */ +#include "VTreatmentAdjustmentUltrafiltrationInit.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationInit, AdjustUltrafiltrationInitResponseData) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VTreatmentAdjustmentUltrafiltrationInit::initConnections() { + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationInitResponseData); + ADJUST_VIEW_CONNECTION(AdjustUltrafiltrationInitRequestData ); +} + +/*! + * \brief VTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VTreatmentAdjustmentUltrafiltrationInit::onActionReceive(const AdjustUltrafiltrationInitResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + volume ( vData.mVolume / 1000 ); // mL => L + + // *** 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. *** + adjustment ( true ); +} + +/*! + * \brief View::VTreatmentAdjustmentUltrafiltrationInit::doAdjustment + * \details the invocable slot to adjust the treatment ultrafiltration volume + * \param vVolume - requested ultrafiltration volume + */ +void View::VTreatmentAdjustmentUltrafiltrationInit::doAdjustment(float vVolume) { + _data.volume = vVolume * 1000; // L => mL + emit didAdjustment(_data); +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) @@ -0,0 +1,66 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VTreatmentAdjustmentUltrafiltrationInit.h + * \author (last) Behrouz NematiPour + * \date (last) 08-Dec-2020 + * \author (original) Behrouz NematiPour + * \date (original) 08-Dec-2020 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentUltrafiltrationInit class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustUltrafiltrationInitResponse + * + */ +class VTreatmentAdjustmentUltrafiltrationInit : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustUltrafiltrationInitRequestData _data; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustment , 0) + // coco end + + // Treatment Ultrafiltration data + PROPERTY( float , volume , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationInit, AdjustUltrafiltrationInitResponseData) + + // ----------- Adjust Ultrafiltration +public slots: + void doAdjustment(float vVolume); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the treatment ultrafiltration volume + * \param vData - data model for edit the treatment ultrafiltration volume adjustment request + */ + void didAdjustment(const AdjustUltrafiltrationInitRequestData &vData); +}; +}