Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rf2e4eba6e85c5d36537be782926f23cc9dc01037 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) @@ -37,9 +37,9 @@ * \brief The MAdjustInitiateTreatmentReq class * \details The model to request starting a treatment * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x3800| 0x100 | 9 | Req | Y | UI | HD | Initiate Treatment Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------:| + * |0x4500| 0x041 | Req | Y | UI | TD | Initiate Treatment Request| * * | Payload || * | || @@ -72,65 +72,70 @@ * * | Payload || * | || - * | #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 | + * | #01:(U32) | \ref mBloodFlowRate | + * | #02:(U32) | \ref mDialysateFlowRate | + * | #03:(U32) | \ref mTreatmentDuration | + * | #04:(U32) | \ref mSalineBolusVolume | + * | #05:(U32) | \ref mHeparinStopTime | + * | #06:(U32) | \ref mHeparinType | + * | #07:(U32) | \ref mAcidConcentrate | + * | #08:(U32) | \ref mBicarbonateConcentrate | + * | #09:(U32) | \ref mDialyzerType | + * | #10:(U32) | \ref mBloodPressureMeasureInterval | + * | #11:(U32) | \ref mRinsebackFlowRate | + * | #12:(U32) | \ref mRinsebackVolume | + * | #13:(S32) | \ref mArterialPressureLimitWindow | + * | #14:(S32) | \ref mVenousPressureLimitWindow | + * | #15:(S32) | \ref mVenousPressureLimitAsymtrc | + * | #16:(S32) | \ref mTrancembrncPressureLimitWindow | + * | #17:(F32) | \ref mDialysateTemp | + * | #18:(F32) | \ref mHeparinDispensingRate | + * | #19:(F32) | \ref mHeparinBolusVolume | * */ class MAdjustParametersValidationReq : public MModel { public: + quint32 mBloodFlowRate = 0; // mL/min + quint32 mDialysateFlowRate = 0; // mL/min + quint32 mTreatmentDuration = 0; // minutes + quint32 mSalineBolusVolume = 0; // mL + quint32 mHeparinStopTime = 0; // min + quint32 mHeparinType = 0; // + quint32 mAcidConcentrate = 0; // + quint32 mBicarbonateConcentrate = 0; // + quint32 mDialyzerType = 0; // + quint32 mBloodPressureMeasureInterval = 0; // minutes + quint32 mRinsebackFlowRate = 0; // mL/min + quint32 mRinsebackVolume = 0; // mL + qint32 mArterialPressureLimitWindow = 0; // mmHg + qint32 mVenousPressureLimitWindow = 0; // mmHg + qint32 mVenousPressureLimitAsymtrc = 0; // mmHg + qint32 mTrancembrncPressureLimitWindow = 0; // mmHg + float mDialysateTemp = 0; // Celsius + float mHeparinDispensingRate = 0; // mL/hr + float mHeparinBolusVolume = 0; // mL - 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 - QString toString() { return toString({ - 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 , + mBloodFlowRate , + mDialysateFlowRate , + mTreatmentDuration , + mSalineBolusVolume , + mHeparinStopTime , + mHeparinType , + mAcidConcentrate , + mBicarbonateConcentrate , + mDialyzerType , + mBloodPressureMeasureInterval , + mRinsebackFlowRate , + mRinsebackVolume , + mArterialPressureLimitWindow , + mVenousPressureLimitWindow , + mVenousPressureLimitAsymtrc , + mTrancembrncPressureLimitWindow , + mDialysateTemp , + mHeparinDispensingRate , + mHeparinBolusVolume , }); } static QString toString(const QVariantList &vParameters) { @@ -142,9 +147,9 @@ * \brief The MAdjustParametersConfirmReq class * \details The model to tell HD treatment parameters have been confirmed * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------------------------------:| - * |0x3B00| 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Parameter Request | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------------------------------:| + * |0x4400| 0x041 | Req | Y | UI | TD | Confirm Treatment Parameter Request | * * | Payload || * | || @@ -241,10 +246,6 @@ */ class MAdjustConsumablesConfirmReq : public MModel { public: - QString toString() { - return toString({}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("ConsumablesConfirm", vParameters); } @@ -265,10 +266,6 @@ */ class MAdjustDisposablesConfirmReq : public MModel { public: - QString toString() { - return toString({}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesConfirm", vParameters); } @@ -289,10 +286,6 @@ */ class MAdjustDisposablesPrimeReq : public MModel { public: - QString toString() { - return toString({}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesPrime", vParameters); } @@ -313,10 +306,6 @@ */ class MAdjustPatientConnectionBeginReq : public MModel { public: - QString toString() { - return toString({}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionBegin", vParameters); } @@ -338,10 +327,6 @@ class MAdjustUltrafiltrationInitReq : public MModel { public: float volume = 0; - QString toString() { - return toString({volume}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFInit", vParameters); } @@ -362,10 +347,6 @@ */ class MAdjustPatientConnectionConfirmReq : public MModel { public: - QString toString() { - return toString({}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionConfirm", vParameters); } @@ -386,10 +367,6 @@ */ class MAdjustStartTreatmentReq : public MModel { public: - QString toString() { - return toString({}); - } - static QString toString(const QVariantList &vParameters) { return MModel::toString("StartTreatment", vParameters); }