Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.h =================================================================== diff -u -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.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 MTreatmentRinsebackData.h * \author (last) Behrouz NematiPour - * \date (last) 07-Feb-2021 + * \date (last) 09-Mar-2022 * \author (original) Behrouz NematiPour - * \date (original) 07-Feb-2021 + * \date (original) 11-Apr-2021 * */ #pragma once @@ -41,7 +41,7 @@ * | #3:(U32) | \ref Data::mRate | * | #4:(U32) | \ref Data::mTimeoutTotal | * | #5:(U32) | \ref Data::mTimeoutCountDown| - * | #6:(F32) | \ref Data::mSafetyVolume | + * | #6:(F32) | \ref Data::mIsCompleted | * * \sa Data * \sa MAdjustRinsebackReq : Rinseback Request @@ -50,9 +50,9 @@ *

Logging info

* | || * | || - * | typeText | Datum | - * | unitText | HD | - * | infoText | RinsebackData | + * | typeText | Datum | + * | unitText | HD | + * | infoText | Rinseback | * */ class MTreatmentRinseback : public MAbstract { @@ -68,22 +68,22 @@ Types::U32 mRate ; Types::U32 mTimeoutTotal ; Types::U32 mTimeoutCountDown; - Types::F32 mSafetyVolume ; + Types::U32 mIsCompleted ; } _data; public: - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } - QString infoText() const override { return QString("RinsebackData") ; } + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + QString infoText() const override { return QString("Rinseback") ; } struct Data { - float mTarget = 0; ///< Target volume of rinseback delivery - float mCurrent = 0; ///< Current volume of rinseback delivery - quint32 mRate = 0; ///< Current flow rate of rinseback delivery - quint32 mTimeoutTotal = 0; ///< Total Timeout of rinseback delivery - quint32 mTimeoutCountDown = 0; ///< Current Timeout count down of rinseback delivery - float mSafetyVolume = 0; ///< Safety Volume of rinseback delivery + float mTarget = 0; ///< Target volume + float mCurrent = 0; ///< Current volume + quint32 mRate = 0; ///< Current flow rate + quint32 mTimeoutTotal = 0; ///< Total Timeout + quint32 mTimeoutCountDown = 0; ///< Current Timeout count down + bool mIsCompleted = 0; ///< Rinseback is complete }; public: