Index: leahi.pro =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -r4035fe64301494f2e1b5c9811e55efa2c6c55aa1 --- leahi.pro (.../leahi.pro) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ leahi.pro (.../leahi.pro) (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -64,6 +64,7 @@ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ sources/model/td/adjustment/treatment \ + sources/model/td/adjustment/pretreatment \ sources/model/dd \ sources/model/dd/data \ sources/model/dd/adjustment \ @@ -77,6 +78,7 @@ sources/view/td/data \ sources/view/td/data/treatment \ sources/view/td/adjustment/treatment \ + sources/view/td/adjustment/pretreatment \ sources/view/dd \ sources/view/dd/data \ sources/view/confirm \ @@ -261,6 +263,9 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h \ + \ # ---------- Views - TD - Adjustment - Pre-Treatment + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ \ # ---------- Models - TD - Adjustment - Settings @@ -271,6 +276,9 @@ sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ \ # ---------- Models - TD - Adjustment - End-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \ + \ # ---------- Models - TD - Adjustment - Pre-Treatment + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -307,12 +315,10 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ @@ -418,12 +424,10 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -615,6 +619,9 @@ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + \ # ---------- Models - TD - Adjustment - Pre-Treatment + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ \ # ---------- Models - HD - Adjustment @@ -625,12 +632,10 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ @@ -724,6 +729,9 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \ + \ # ---------- Views - TD - Adjustment - Pre-Treatment + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -754,12 +762,10 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -r4035fe64301494f2e1b5c9811e55efa2c6c55aa1 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -358,7 +358,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x7100| 0x100 | 9 | Req | Y | UI | HD | Start Treatment Request | + * |0x7100| 0x100 | 9 | Req | Y | UI | TD | Start Treatment Request | * * | Payload || * | || Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp (revision 0) +++ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2022-2024 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 MPreTreatmentAdjustDisposablesConfirmResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 23-Feb-2022 + * \author (original) Behrouz NematiPour + * \date (original) 23-Feb-2022 + * + */ +#include "MPreTreatmentAdjustDisposablesConfirmResponse.h" + +using namespace Model; + +QVariantList MAdjustDisposablesConfirmResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustDisposablesConfirmResponse::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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDisposablesConfirmResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDisposablesConfirmResponseData MAdjustDisposablesConfirmResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h =================================================================== diff -u --- sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h (revision 0) +++ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,84 @@ +/*! + * + * Copyright (c) 2022-2024 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 MPreTreatmentAdjustDisposablesConfirmResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 23-Feb-2022 + * \author (original) Behrouz NematiPour + * \date (original) 23-Feb-2022 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDisposablesConfirmResponse class + * \details The DisposablesConfirm adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x9300| 0x020 | Rsp | Y | TD | UI | DisposablesConfirm Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * \sa MAdjustDisposablesConfirmReq : DisposablesConfirm Request + * \sa MTreatmentDisposablesConfirm : DisposablesConfirm Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | TD | + * | infoText | AdjustDisposablesConfirm | + * + */ +class MAdjustDisposablesConfirmResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted; + Types::U32 mReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustDisposablesConfirm") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustDisposablesConfirmResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDisposablesConfirmResponse::Data AdjustDisposablesConfirmResponseData; Index: sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp (revision 0) +++ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2021-2024 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 MPreTreatmentAdjustStartTreatmentResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "MPreTreatmentAdjustStartTreatmentResponse.h" + +using namespace Model; + +QVariantList MAdjustStartTreatmentResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustStartTreatmentResponse::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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustStartTreatmentResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustStartTreatmentResponseData MAdjustStartTreatmentResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h =================================================================== diff -u --- sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h (revision 0) +++ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,82 @@ +/*! + * + * Copyright (c) 2021-2024 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 MPreTreatmentAdjustStartTreatmentResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustStartTreatmentResponse class + * \details The StartTreatment adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:| + * |0xA200| 0x020 | 6 | Rsp | Y | TD | UI | Start Treatment Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | TD | + * | infoText | AdjustStartTreatment | + * + */ +class MAdjustStartTreatmentResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted; + Types::U32 mReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustStartTreatment") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustStartTreatmentResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustStartTreatmentResponse::Data AdjustStartTreatmentResponseData; Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4035fe64301494f2e1b5c9811e55efa2c6c55aa1 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp =================================================================== diff -u --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp (revision 0) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2021-2024 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 VPreTreatmentAdjustmentDisposablesConfirm.cpp + * \author (last) Behrouz NematiPour + * \date (last) 04-Mar-2022 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "VPreTreatmentAdjustmentDisposablesConfirm.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesConfirm) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentDisposablesConfirm::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustDisposablesConfirmRequestData ); + ACTION_VIEW_CONNECTION(AdjustDisposablesConfirmResponseData); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentDisposablesConfirm::onActionReceive(const AdjustDisposablesConfirmResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // *** 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::VPreTreatmentAdjustmentDisposablesConfirm::doConfirm + * \details the invocable slot to send user's Disposables installation confirm + */ +void View::VPreTreatmentAdjustmentDisposablesConfirm::doConfirm() { + AdjustDisposablesConfirmRequestData data; + emit didAdjustment(data); +} Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h =================================================================== diff -u --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (revision 0) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,57 @@ +/*! + * + * Copyright (c) 2021-2024 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 VPreTreatmentAdjustmentDisposablesConfirm.h + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustDisposablesConfirmResponse.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentDisposablesConfirm class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustDisposablesConfirmResponse + * + */ +class VPreTreatmentAdjustmentDisposablesConfirm : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesConfirm, AdjustDisposablesConfirmResponseData) + +public slots: + void doConfirm(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation confirm + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustDisposablesConfirmRequestData &vData); +}; +} Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp =================================================================== diff -u --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp (revision 0) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2021-2024 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 VPreTreatmentAdjustmentStartTreatment.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "VPreTreatmentAdjustmentStartTreatment.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentStartTreatment) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentStartTreatment::initConnections() { + ACTION_VIEW_CONNECTION(AdjustStartTreatmentResponseData); + ADJUST_VIEW_CONNECTION(AdjustStartTreatmentRequestData ); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentStartTreatment::onActionReceive(const AdjustStartTreatmentResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // *** 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::VPreTreatmentAdjustmentStartTreatment::doPrime + * \details the invocable slot to send user's Disposables installation Prime + */ +void View::VPreTreatmentAdjustmentStartTreatment::doStart() { + AdjustStartTreatmentRequestData data; + emit didAdjustment(data); +} Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h =================================================================== diff -u --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h (revision 0) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1) @@ -0,0 +1,57 @@ +/*! + * + * Copyright (c) 2021-2024 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 VPreTreatmentAdjustmentStartTreatment.h + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustStartTreatmentResponse.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentStartTreatment class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustStartTreatmentResponse + * + */ +class VPreTreatmentAdjustmentStartTreatment : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentStartTreatment, AdjustStartTreatmentResponseData) + +public slots: + void doStart(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation Prime + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustStartTreatmentRequestData &vData); +}; +}