Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r80250cfdbe58a3df17950d342212f155d52d3971 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 80250cfdbe58a3df17950d342212f155d52d3971) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * 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 MTreatmentAdjustRequests.h + * \file MPreTreatmentAdjustRequests.h * \author (last) Behrouz NematiPour - * \date (last) 18-Mar-2021 + * \date (last) 31-May-2023 * \author (original) Behrouz NematiPour - * \date (original) 18-Mar-2021 + * \date (original) 11-Apr-2021 * */ @@ -54,12 +54,12 @@ eInitiate = 1, }; Options requestedState = eUnknown; - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("InitTreatment", vParameters); } @@ -75,73 +75,70 @@ * * | Payload || * | || - * | #01:(U32) | \ref bloodFlowRate | - * | #02:(U32) | \ref dialysateFlowRate | - * | #03:(U32) | \ref duration | - * | #04:(U32) | \ref heparinStopTime | - * | #05:(U32) | \ref salineBolus | - * | #06:(U32) | \ref acidConcentrate | - * | #07:(U32) | \ref bicarbonateConcentrate | - * | #08:(U32) | \ref dialyzerType | - * | #09:(U32) | \ref heparinType | - * | #10:(U32) | \ref bloodPressureMeasureInterval | - * | #11:(U32) | \ref rinsebackFlowRate | - * | #12:(S32) | \ref arterialPressureLimitLow | - * | #13:(S32) | \ref arterialPressureLimitHigh | - * | #14:(S32) | \ref venousPressureLimitLow | - * | #15:(S32) | \ref venousPressureLimitHigh | - * | #16:(F32) | \ref heparinDispensingRate | - * | #17:(F32) | \ref heparinBolusVolume | - * | #18:(F32) | \ref dialysateTemp | + * | #01:(U32) | \ref mBloodFlowRate | + * | #02:(U32) | \ref mDialysateFlowRate | + * | #03:(U32) | \ref mTreatmentDuration | + * | #04:(U32) | \ref mHeparinStopTime | + * | #05:(U32) | \ref mSalineBolus | + * | #06:(U32) | \ref mAcidConcentrate | + * | #07:(U32) | \ref mBicarbonateConcentrate | + * | #08:(U32) | \ref mDialyzerType | + * | #09:(U32) | \ref mHeparinType | + * | #10:(U32) | \ref mBloodPressureMeasureInterval | + * | #11:(U32) | \ref mRinsebackFlowRate | + * | #12:(S32) | \ref mArterialPressureLimitWindow | + * | #13:(S32) | \ref mVenousPressureLimitWindow | + * | #14:(S32) | \ref mVenousPressureLimitAsymtrc | + * | #15:(F32) | \ref mHeparinDispensingRate | + * | #16:(F32) | \ref mHeparinBolusVolume | + * | #17:(F32) | \ref mDialysateTemp | * */ class MAdjustParametersValidationReq : public MModel { public: - quint32 bloodFlowRate = 0; // mL/min - quint32 dialysateFlowRate = 0; // mL/min - quint32 duration = 0; // minutes - quint32 heparinStopTime = 0; // min - quint32 salineBolus = 0; // mL - quint32 acidConcentrate = 0; // - quint32 bicarbonateConcentrate = 0; // - quint32 dialyzerType = 0; // - quint32 heparinType = 0; // - quint32 bloodPressureMeasureInterval = 0; // minutes - quint32 rinsebackFlowRate = 0; // mL/min - qint32 arterialPressureLimitLow = 0; // mmHg - qint32 arterialPressureLimitHigh = 0; // mmHg - qint32 venousPressureLimitLow = 0; // mmHg - qint32 venousPressureLimitHigh = 0; // mmHg - float heparinDispensingRate = 0; // mL/hr - float heparinBolusVolume = 0; // mL - float dialysateTemp = 0; // Celsius + quint32 mBloodFlowRate = 0; // mL/min + quint32 mDialysateFlowRate = 0; // mL/min + quint32 mTreatmentDuration = 0; // minutes + quint32 mHeparinStopTime = 0; // min + quint32 mSalineBolus = 0; // mL + quint32 mAcidConcentrate = 0; // + quint32 mBicarbonateConcentrate = 0; // + quint32 mDialyzerType = 0; // + quint32 mHeparinType = 0; // + quint32 mBloodPressureMeasureInterval = 0; // minutes + quint32 mRinsebackFlowRate = 0; // mL/min + qint32 mArterialPressureLimitWindow = 0; // mmHg + qint32 mVenousPressureLimitWindow = 0; // mmHg + qint32 mVenousPressureLimitAsymtrc = 0; // mmHg + float mHeparinDispensingRate = 0; // mL/hr + float mHeparinBolusVolume = 0; // mL + float mDialysateTemp = 0; // Celsius - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({ - bloodFlowRate , - dialysateFlowRate , - duration , - heparinStopTime , - salineBolus , - acidConcentrate , - bicarbonateConcentrate , - dialyzerType , - heparinType , - bloodPressureMeasureInterval , - rinsebackFlowRate , - arterialPressureLimitLow , - arterialPressureLimitHigh , - venousPressureLimitLow , - venousPressureLimitHigh , - heparinDispensingRate , - heparinBolusVolume , - dialysateTemp , + mBloodFlowRate , + mDialysateFlowRate , + mTreatmentDuration , + mHeparinStopTime , + mSalineBolus , + mAcidConcentrate , + mBicarbonateConcentrate , + mDialyzerType , + mHeparinType , //FIXME: DEN-15377: to set the heparintype to not selected (-1) is used which is incorrect, since the type is unsigned. (No issue for now but is not correct.) + mBloodPressureMeasureInterval , + mRinsebackFlowRate , + mArterialPressureLimitWindow , + mVenousPressureLimitWindow , + mVenousPressureLimitAsymtrc , + mHeparinDispensingRate , + mHeparinBolusVolume , + mDialysateTemp , }); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ValidateParameters", vParameters); } @@ -167,12 +164,12 @@ eConfirm = 1 }; Options requestedState = eConfirm; - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ConfirmParameters", vParameters); } @@ -198,12 +195,12 @@ eStart = 1, }; Options requestedState = eStop; - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("WaterSample", vParameters); } @@ -230,12 +227,12 @@ ePassed = 1, }; Options requestedState = eUnknown; - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("WaterSampleResult", vParameters); } @@ -256,12 +253,12 @@ */ class MAdjustConsumablesConfirmReq : public MModel { public: - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ConsumablesConfirm", vParameters); } @@ -282,12 +279,12 @@ */ class MAdjustDisposablesConfirmReq : public MModel { public: - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesConfirm", vParameters); } @@ -308,12 +305,12 @@ */ class MAdjustDisposablesPrimeReq : public MModel { public: - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesPrime", vParameters); } @@ -334,12 +331,12 @@ */ class MAdjustPatientConnectionBeginReq : public MModel { public: - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionBegin", vParameters); } @@ -361,12 +358,12 @@ class MAdjustUltrafiltrationInitReq : public MModel { public: float volume = 0; - // coco begin validated : Has been validated manually. + // disabled 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 + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFInit", vParameters); } @@ -387,12 +384,12 @@ */ class MAdjustPatientConnectionConfirmReq : public MModel { public: - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionConfirm", vParameters); } @@ -413,12 +410,12 @@ */ class MAdjustStartTreatmentReq : public MModel { public: - // coco begin validated : Has been validated manually. + // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // coco end + // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("StartTreatment", vParameters); }