Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -re04d9a7a152b35b7623e0ca54dc77f0593459ad4 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) @@ -36,6 +36,7 @@ radius : Variables.alarmDialogRadius backgroundColor : Colors.offWhite closeOnStateChange : false + z : 996 enum AlarmPage { AlarmMain , Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) @@ -0,0 +1,47 @@ +#include "MAdjustDDCalibrationBicarbConcentratesRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationBicarbConcentratesRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mGainRejectReason .value, + _data.mOffsetRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationBicarbConcentratesRecordResponse::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; + if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mGainRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mOffsetRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationPressureRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationBicarbConcentratesResponseData MAdjustDDCalibrationBicarbConcentratesRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mIndex = _data.mIndex .value; + data.mGainRejectReason = _data.mGainRejectReason .value; + data.mOffsetRejectReason = _data.mOffsetRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationBicarbConcentratesRecordResponse class + * \details The DD adjsut calibration BicarbConcentrates response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x11B0| 0x070 | Rsp | Y | DG | UI | Set DD Calib BicarbConcentrates Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mIndex | + * | #4:(U32) | \ref Data::mGainRejectReason | + * | #5:(U32) | \ref Data::mOffsetRejectReason | + * | #6:(U32) | \ref Data::mCalibrationTimeRejectReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationBicarbConcentratesResponseData | + * + */ +class MAdjustDDCalibrationBicarbConcentratesRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::U32 mGainRejectReason ; + Types::U32 mOffsetRejectReason ; + Types::U32 mCalibrationTimeRejectReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("AdjustDDalibrationBicarbConcentrates") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mIndex = 0; + quint32 mGainRejectReason = 0; + quint32 mOffsetRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; + }; + + MAdjustDDCalibrationBicarbConcentratesRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationBicarbConcentratesRecordResponse::Data AdjustDDCalibrationBicarbConcentratesResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) @@ -0,0 +1,48 @@ + +#include "MDDCalibrationBicarbConcentratesRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationBicarbConcentratesRecordResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + _data.mIndex .value, + _data.mGain .value, + _data.mOffset .value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationBicarbConcentratesRecordResponse::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; + if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mGain )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mOffset )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationBicarbConcentratesRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +BicarbConcentrates MDDCalibrationBicarbConcentratesRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mIndex = _data.mIndex .value; + data.mGain = _data.mGain .value; + data.mOffset = _data.mOffset .value; + data.mCalTime = _data.mCalTime .value; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationBicarbConcentratesRecordResponse class + * \details The DD calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x1190| 0x070 | Rsp | Y | DD | UI | Get DD Calib BicarbConcentrates | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mIndex | + * | #4:(F32) | \ref Data::mGain | + * | #5:(F32) | \ref Data::mOffset | + * | #6:(U32) | \ref Data::mCalTime | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | DDalibrationBicarbConcentrates | + * + */ +class MDDCalibrationBicarbConcentratesRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::F32 mGain ; + Types::F32 mOffset ; + Types::U32 mCalTime ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("DDalibrationBicarbConcentrates") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mIndex = 0; + float mGain = 0; + float mOffset = 0; + quint32 mCalTime = 0; + }; + + MDDCalibrationBicarbConcentratesRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationBicarbConcentratesRecordResponse::Data DDCalibrationBicarbConcentratesResponseData;