Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) @@ -50,12 +50,9 @@ class MAdjustPowerOffReq : public MModel { public: quint8 state; - // 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({state}); } - // disabled coco end explicit MAdjustPowerOffReq(quint8 vState) : state(vState) { } static QString toString(const QVariantList &vParameters) { @@ -82,12 +79,9 @@ quint32 mId = 0; /*!< Request ID */ quint32 mConfirm = 0; /*!< user confirm */ - // 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({mId, mConfirm}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("Confirm", vParameters); @@ -113,12 +107,9 @@ public: quint32 bloodFlow = 0; quint32 dialysateFlow = 0; - // 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({bloodFlow , dialysateFlow}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustBloodDialysate", vParameters); } @@ -140,12 +131,9 @@ class MAdjustDurationReq : public MModel { public: quint32 duration = 0; - // 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({duration}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustDuration", vParameters); } @@ -168,12 +156,9 @@ public: GuiUFCommands requestedState = GuiUFCommands::UF_CMD_PAUSE; // the requested state. Initially it's running => paused. - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFState", vParameters); } @@ -195,12 +180,9 @@ class MAdjustUltrafiltrationEditReq : public MModel { public: float volume = 0; - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFEdit", vParameters); } @@ -231,12 +213,9 @@ float volume = 0; Options option = eDuration; - // 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 , option}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFConfirm", vParameters); } @@ -262,12 +241,9 @@ class MAdjustSalineReq : public MModel { public: GuiSalineCommands requestedState = GuiSalineCommands::SALINE_CMD_STOP; // the requested state. Initially it's Stop => start. - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustSaline", vParameters); } @@ -293,12 +269,9 @@ class MAdjustHeparinReq : public MModel { public: GuiHeparinCommands requestedState = GuiHeparinCommands::HEPARIN_CMD_PAUSE ; // the requested state. Initially it's running with Initial Bolus. - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustHeparin", vParameters); } @@ -328,16 +301,13 @@ qint32 mVenousPressureLimitWindow = 0; ///< (S32) Venous Pressure Limit Window (mmHg) qint32 mVenousPressureLimitAsymtrc = 0; ///< (S32) Venous Pressure Limit Asymmetric(mmHg) - // 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 ({ mArterialPressureLimitWindow , mVenousPressureLimitWindow , mVenousPressureLimitAsymtrc }); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustPressuresLimits", vParameters); } @@ -363,12 +333,9 @@ class MAdjustRinsebackReq : public MModel { public: GuiRinsebackCommands requestedState = GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_START; // the requested state. - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustRinseback", vParameters); } @@ -394,12 +361,9 @@ class MAdjustRecirculateReq : public MModel { public: GuiRecirculateCommands requestedState = GuiRecirculateCommands::REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT; // the requested state. - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustRecirculate", vParameters); } @@ -425,12 +389,9 @@ class MAdjustTreatmentEndReq : public MModel { public: GuiTreatmentEndCommands requestedState = GuiTreatmentEndCommands::REQUESTED_USER_ACTION_TX_END_RINSEBACK_START; // the requested state. - // 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}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustTxEnd", vParameters); } @@ -454,48 +415,15 @@ class MAlarmSilenceReq : public MModel { public: quint32 silence = 1; - // 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({silence}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmSilence", vParameters); } }; /*! - * \brief The MAlarmClearedConditionReq class - * \details The model to tell HD an alarm has been acknowledged - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:| - * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Condition Cleared | - * - * | Payload || - * | || - * | #1:(U32) | \ref alarmID | - * - */ -// disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. -class MAlarmClearedConditionReq : public MModel { -public: - GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; - // 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({alarmID}); - } - // disabled coco end - // coco begin validate : - static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmCondition", vParameters); - } -}; -// disabled coco end - -/*! * \brief The MAlarmUserActionReq class * \details The model to tell HD an alarm action has been made by user * @@ -511,12 +439,9 @@ class MAlarmUserActionReq : public MModel { public: GuiAlarmUserActions action; - // 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({action}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmUserAction", vParameters); } @@ -539,5 +464,4 @@ typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;