Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r57fdcc6fcd4d91311544c2085cee41108293b6f6 -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -1425,8 +1425,6 @@ } - - // ---------------------------------------------------------------------------------------------------- /*! Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -115,6 +115,21 @@ text : vDateTime.time font.pixelSize : Fonts.fontHeaderbarTime font.weight : Font.DemiBold + + Text { id: _timeZone // TEST : Current timezone + color : Colors.textMain + anchors { + bottom : _timeText.bottom + left : _timeText.right + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + width : _root.width / 5 + text : vDateTime.timezone + font.pixelSize: Fonts.fontHeaderbarTimezone + } } Text { id: _dateText @@ -129,22 +144,6 @@ } } - Text { id: _timeZone // TEST : Current timezone - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : parent.width / 5 - } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - - height : 15 - width : _root.width / 5 - text : vDateTime.timezone - font.pixelSize: Fonts.fontHeaderbarTimezone - } - MainMenu { id: _headerMenu anchors { left : _dateTimeItem.right Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -36,7 +36,6 @@ color : _colorMode.modeBackgroundDialogColor radius : Variables.alarmDialogRadius - signal muteClicked() signal minimizeClicked() signal listClicked() Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -105,7 +105,7 @@ readonly property color panelBackgroundColor : "#12FFFFFF" readonly property color panelBorderColor : "#4DB5B5B5" readonly property color panelInvalidBorderColor : "#FFA500" - readonly property color panelBackground : "#2A3F53" + readonly property color panelBackground : "#0B243B" //"#2A3F53" readonly property color panelBorder : "#324C65" readonly property color heparinPanelBorderColor         : "#CC42556B" Index: sources/gui/qml/main.qml =================================================================== diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e --- sources/gui/qml/main.qml (.../main.qml) (revision 50d6907ed1bef8273ad246a823073153016997e1) +++ sources/gui/qml/main.qml (.../main.qml) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -345,14 +345,14 @@ QtObject { id: _colorMode readonly property color modeBackgroundColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite - readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite readonly property color modeSelctedColor : vSettings.darkMode ? Colors.darkModeSelect : Colors.lightModeSelect readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.darkModeAutoStep : Colors.lightModeAutoStep readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.lightModeSelect - readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.lightModeSelect readonly property color modeAlarmListColor : vSettings.darkMode ? Colors.offWhite : Colors.alarmDialogText readonly property color modeAlarmStopStateColor : vSettings.darkMode ? Colors.darkModeAlarmStopState : Colors.lightModeAlarmStopState Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -0,0 +1,47 @@ +#include "MAdjustDDCalibrationPressureRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationPressureRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mGainRejectReason .value, + _data.mOffsetRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationPressureRecordResponse::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 + */ +AdjustDDCalibrationPressureResponseData MAdjustDDCalibrationPressureRecordResponse::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/MAdjustDDCalibrationTemperatureRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationTemperatureRecordResponse class + * \details The DD adjsut calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x11F0| 0x070 | Rsp | Y | DG | UI | Set DD Calib Temperature 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 | AdjustDDCalibrationPressureResponseData | + * + */ +class MAdjustDDCalibrationPressureRecordResponse : 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("AdjustDDalibrationPressure") ; } + + 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; + }; + + MAdjustDDCalibrationPressureRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationPressureRecordResponse::Data AdjustDDCalibrationPressureResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -0,0 +1,48 @@ + +#include "MDDCalibrationTemperatureRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationTemperatureRecordResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + _data.mIndex .value, + _data.mGain .value, + _data.mOffset .value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationTemperatureRecordResponse::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 MDDCalibrationTemperatureRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationTemperatureesponseData MDDCalibrationTemperatureRecordResponse::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/MDDCalibrationTemperatureRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.h (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationTemperatureRecordResponse class + * \details The DD calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x11D0| 0x070 | Rsp | Y | DD | UI | Get DD Calib Temperature | + * + * | 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 | DDalibrationPressure | + * + */ +class MDDCalibrationTemperatureRecordResponse : 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("DDalibrationTemperature") ; } + + 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; + }; + + MDDCalibrationTemperatureRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationTemperatureRecordResponse::Data DDCalibrationTemperatureResponseData;