Index: denali.pro =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r376859852f4d1a07263c44524aec347db29e0133 --- denali.pro (.../denali.pro) (revision a89b5249df072be403141463d7d88728b66a848e) +++ denali.pro (.../denali.pro) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -230,6 +230,7 @@ sources/view/settings/VNetworkModel.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ + sources/view/hd/alarm/VAlarmActiveList.h \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.h \ \ # ---------- Views - HD - Adjustment - Pre-Treatment @@ -437,6 +438,7 @@ sources/view/VPowerOff.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ + sources/view/hd/alarm/VAlarmActiveList.cpp \ \ # ---------- Views - Settings sources/view/settings/VSettings.cpp \ sources/view/settings/VDateTime.cpp \ Index: denali.pro.user =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r376859852f4d1a07263c44524aec347db29e0133 --- denali.pro.user (.../denali.pro.user) (revision a89b5249df072be403141463d7d88728b66a848e) +++ denali.pro.user (.../denali.pro.user) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r376859852f4d1a07263c44524aec347db29e0133 --- en_US.udic (.../en_US.udic) (revision a89b5249df072be403141463d7d88728b66a848e) +++ en_US.udic (.../en_US.udic) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -121,3 +121,4 @@ Sys FIXME HDAlarm +VAlarm Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rf734248435a849bf26d13f6e78d0ad4c1002d019 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f734248435a849bf26d13f6e78d0ad4c1002d019) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -438,13 +438,13 @@ case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>() // ----- Alarms - case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; - case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; - case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; + case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; + case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; + case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; // 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. - case Gui::GuiActionType::ID_AlarmClearedConditionRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp ); break; - case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; + case Gui::GuiActionType::ID_AlarmClearedConditionRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp ); break; + case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; // coco end // unhandled messages: these will only be logged as received message Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -27,6 +27,7 @@ // Settings #include "VSettings.h" #include "VAlarmStatus.h" +#include "VAlarmActiveList.h" #include "VPowerOff.h" #include "VAdjustmentVersions.h" #include "VDateTime.h" Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r8f83b92860a33498ea7856e63afef0a10ee11923 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -18,7 +18,8 @@ // Project // C++ imports -import VAlarmStatus 0.1 +import VAlarmStatus 0.1 +import VAlarmActiveList 0.1 // Qml imports import "qrc:/globals" @@ -32,7 +33,8 @@ Item { id : _root anchors.fill: parent - VAlarmStatus { id: vAlarmStatus } + VAlarmStatus { id: vAlarmStatus } + VAlarmActiveList { id: vAlarmActiveList } readonly property alias backgroundColor: _alarmDialog.backgroundColor readonly property alias textColor : _alarmDialog.textColor @@ -56,6 +58,7 @@ _alarmBar .visible = false } function alarmList() { + vAlarmActiveList.doRequest() _alarmDialog .visible = false _alarmListDialog.visible = true _alarmBar .visible = false Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r8f83b92860a33498ea7856e63afef0a10ee11923 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" /*! * \brief Contains the Alarm Dialog Implementation @@ -28,7 +29,6 @@ contentItem.objectName: "_NotificationDialog" // SquishQt property alias titleText : _title.text; - property alias description : _desc.text; property alias titleBarForeground : _title.color property alias titleBarBackground : _titleBar.color property alias isSilenced : _muteButton.isSilenced @@ -39,6 +39,7 @@ signal muteClicked() signal minimizeClicked() + signal itemClicked(int vIndex) property bool titleFading : false Fader { @@ -96,7 +97,28 @@ } } + TouchGrid { id: _alarmsGrid + visible : vAlarmActiveList.adjustment_Accepted + anchors.top : _titleBar.bottom + anchors.horizontalCenter: parent.horizontalCenter + itemsValueLeftMargin : 70 + height : Variables.dialogHeight - _titleBar.height //+ Variables.minVGap2 + width : parent.width + colCount : 1 + rowCount : 10 + itemWidth : Variables.dialogWidth - Variables.minVGap2*2 + itemHeight : 58 + rowSpacing : 0 + lineColor : Colors.backgroundMain + itemsText : vAlarmActiveList.alarmIDs // [ 100, 200, 300, 400, 500, 600, 700, 800, 9999 ] + itemsValue : vAlarmActiveList.alarmTexts // [ "Alarm\nAtal Matal Tootoole 1", "Alarm\nGave hasan checjoore 2", "Alarm\nNa Shir Dare Na Pestoon 3", "Alarm\nGavesho bordan hendestoon 4", "Alarm 5", "Alarm 6", "Alarm 7", "Alarm 8", "Alarm 9" ]// vAlarmActiveList + itemsTouchable : [ 1,1,1,1,1,1,1,1,1,1 ] + onItemClicked : _root.itemClicked(vIndex) + } + Text { id: _desc + visible : ! vAlarmActiveList.adjustment_Accepted + text : vAlarmActiveList.status objectName: "_NotificationDialog_Description" color: Colors.textMain font.pixelSize: Fonts.fontPixelButton Index: sources/gui/qml/main.qml =================================================================== diff -u -re28183bddebf7383c1bd113e7b8ef4ea11f494fb -r376859852f4d1a07263c44524aec347db29e0133 --- sources/gui/qml/main.qml (.../main.qml) (revision e28183bddebf7383c1bd113e7b8ef4ea11f494fb) +++ sources/gui/qml/main.qml (.../main.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -24,6 +24,7 @@ // View classes import VHDAccelerometer 0.1 + // Settings import VSettings 0.1 import VAdjustmentVersions 0.1 Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rf93fd4a2a09a2c6d4db43196b9005f324ae7fa82 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision f93fd4a2a09a2c6d4db43196b9005f324ae7fa82) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -38,8 +38,8 @@ function doSettingsDisinfect() { _mainMenu.currentIndex = 0 - _disinfectStack.doSettingsDisinfect() page( _disinfectStack ) + _disinfectStack.doSettingsDisinfect() } // Standby / Disinfection Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rd929655171352cc0851cff015f1ae2a6bec61f34 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision d929655171352cc0851cff015f1ae2a6bec61f34) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 24-May-2021 + * \date (last) 26-May-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -241,13 +241,13 @@ case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG chemical disinfect could not reach to target temperature." ); break; } case GuiAlarmID::ALARM_ID_DG_FPGA_POST_TEST_FAILED : { result = QObject::tr("DG FPGA POST failure." ); break; } case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE : { result = QObject::tr("HD arterial air bubble detector self-test failure." ); break; } - case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT : { result = QObject::tr("HD arterial air bubble detector fault." ); break; } + case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK : { result = QObject::tr("HD arterial air bubble detected rinseback alarm." ); break; } case GuiAlarmID::ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE : { result = QObject::tr("DG heaters failed POST." ); break; } case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE : { result = QObject::tr("HD venous air bubble detector self-test failure." ); break; } - case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT : { result = QObject::tr("HD venous air bubble detector treatment fault." ); break; } - case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT : { result = QObject::tr("HD venous air bubble detector rinseback fault." ); break; } - case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED : { result = QObject::tr("HD arterial bubble detected alarm." ); break; } - case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTED : { result = QObject::tr("HD venous bubble detected alarm." ); break; } + case GuiAlarmID::ALARM_ID_AVAILABLE_6 : { result = QObject::tr("HD venous air bubble detector treatment fault." ); break; } + case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK : { result = QObject::tr("HD venous air bubble detected rinseback alarm." ); break; } + case GuiAlarmID::ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED : { result = QObject::tr("HD arterial air bubble detected alarm." ); break; } + case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_DETECTED : { result = QObject::tr("HD venous air bubble detected alarm." ); break; } case GuiAlarmID::ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR : { result = QObject::tr("HD blood flow sensor not being read - slow packet." ); break; } case GuiAlarmID::ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR : { result = QObject::tr("HD dialysate flow sensor not being read - slow packet." ); break; } case GuiAlarmID::ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR : { result = QObject::tr("HD pump direction status error." ); break; } @@ -259,6 +259,9 @@ case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT : { result = QObject::tr("HD no cartridge self-test timeout." ); break; } case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT : { result = QObject::tr("HD dry self-test timeout." ); break; } case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT : { result = QObject::tr("DG temperature sensor error flag fault." ); break; } + case GuiAlarmID::ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH : { result = QObject::tr("HD active reservoir is full during treatment and DG not ready to switch reservoirs." ); break; } + case GuiAlarmID::ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION : { result = QObject::tr("HD blood flow invalid calibration." ); break; } + case GuiAlarmID::ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION : { result = QObject::tr("HD dialysate flow invalid calibration." ); break; } case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } default: Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h =================================================================== diff -u -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -61,8 +61,8 @@ struct { Types::U32 mAlarmID ; ///< Alarm ID - Types::U32 mParam1 ; ///< Alarm Parameter 1 // may need more than 1 parameter but defined one so it would be easier to add more later. - Types::U32 mParam2 ; ///< Alarm Parameter 2 // may need more than 1 parameter but defined one so it would be easier to add more later. + Types::F32 mParam1 ; ///< Alarm Parameter 1 // may need more than 1 parameter but defined one so it would be easier to add more later. + Types::F32 mParam2 ; ///< Alarm Parameter 2 // may need more than 1 parameter but defined one so it would be easier to add more later. } _data; public: @@ -74,8 +74,8 @@ struct Data { quint64 mTimeStamp ; ///< Timestamp of the received message in secs since epoch quint32 mAlarmID ; ///< Alarm ID - quint32 mParam1 ; ///< Alarm Parameter 1 - quint32 mParam2 ; ///< Alarm Parameter 2 + float mParam1 ; ///< Alarm Parameter 1 + float mParam2 ; ///< Alarm Parameter 2 }; MTreatmentLogAlarmData() { } Index: sources/storage/Logger.cpp =================================================================== diff -u -r903697f659a275a5be31d05c460dae628f532aab -r376859852f4d1a07263c44524aec347db29e0133 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 903697f659a275a5be31d05c460dae628f532aab) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -246,10 +246,12 @@ void Logger::log(const QString &vContent, LogType vLogType, bool vTimestamp) { static QString date; + QString mContent; QString currentDate = QDate::currentDate().toString(_dateFormat); if (date != currentDate) { if (!date.isEmpty()) { - ADD_EVENT_HEADER; + mContent = _headerE; + mContent += "\r\n" ; } date = currentDate; } @@ -268,7 +270,6 @@ LOG_DEBUG(QString("Incorrect type of logging %1").arg(vLogType)); } - QString mContent; if ( vTimestamp ) mContent = QTime::currentTime().toString(_timeFormat) + _separator; Index: sources/view/VView.h =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/view/VView.h (.../VView.h) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/view/VView.h (.../VView.h) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -106,8 +106,10 @@ REGISTER_TYPE( VAdjustmentVersions ) \ REGISTER_TYPE( VDateTime ) \ REGISTER_TYPE( VNetworkModel ) \ - \ + /* Alarm */ \ REGISTER_TYPE( VAlarmStatus ) \ + REGISTER_TYPE( VAlarmActiveList ) \ + /* Power off */ \ REGISTER_TYPE( VPowerOff ) \ /* Data - States */ \ REGISTER_TYPE( VHDOperationMode ) \ Index: sources/view/hd/alarm/VAlarmActiveList.cpp =================================================================== diff -u --- sources/view/hd/alarm/VAlarmActiveList.cpp (revision 0) +++ sources/view/hd/alarm/VAlarmActiveList.cpp (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -0,0 +1,136 @@ +/*! + * + * Copyright (c) 2019-2020 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 VAlarmActiveList.cpp + * \author (last) Behrouz NematiPour + * \date (last) 5/26/2021 + * \author (original) Behrouz NematiPour + * \date (original) 5/26/2021 + * + */ +#include "VAlarmActiveList.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VAlarmActiveList) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VAlarmActiveList::initConnections() { + ADJUST_VIEW_CONNECTION(AlarmActiveListRequestData ); + ACTION_VIEW_CONNECTION(AlarmActiveListResponseData); +} + +/*! + * \brief VAlarmActiveList::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VAlarmActiveList::onActionReceive(const AlarmActiveListResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + if (vData.mAccepted) { + status (""); + a0ID ( vData.mAlarmID0 ); + a1ID ( vData.mAlarmID1 ); + a2ID ( vData.mAlarmID2 ); + a3ID ( vData.mAlarmID3 ); + a4ID ( vData.mAlarmID4 ); + a5ID ( vData.mAlarmID5 ); + a6ID ( vData.mAlarmID6 ); + a7ID ( vData.mAlarmID7 ); + a8ID ( vData.mAlarmID8 ); + a9ID ( vData.mAlarmID9 ); + + a0Text ( alarmIDText( vData.mAlarmID0 )); + a1Text ( alarmIDText( vData.mAlarmID1 )); + a2Text ( alarmIDText( vData.mAlarmID2 )); + a3Text ( alarmIDText( vData.mAlarmID3 )); + a4Text ( alarmIDText( vData.mAlarmID4 )); + a5Text ( alarmIDText( vData.mAlarmID5 )); + a6Text ( alarmIDText( vData.mAlarmID6 )); + a7Text ( alarmIDText( vData.mAlarmID7 )); + a8Text ( alarmIDText( vData.mAlarmID8 )); + a9Text ( alarmIDText( vData.mAlarmID9 )); + + alarmIDs ( { QString::number( _a0ID ), + QString::number( _a1ID ), + QString::number( _a2ID ), + QString::number( _a3ID ), + QString::number( _a4ID ), + QString::number( _a5ID ), + QString::number( _a6ID ), + QString::number( _a7ID ), + QString::number( _a8ID ), + QString::number( _a9ID ), + } ); + + alarmTexts ( { _a0Text, + _a1Text, + _a2Text, + _a3Text, + _a4Text, + _a5Text, + _a6Text, + _a7Text, + _a8Text, + _a9Text, + } ); + } + else { + status (tr("No Active Alarm List\n%1").arg(text())); + a0ID ( 0 ); + a1ID ( 0 ); + a2ID ( 0 ); + a3ID ( 0 ); + a4ID ( 0 ); + a5ID ( 0 ); + a6ID ( 0 ); + a7ID ( 0 ); + a8ID ( 0 ); + a9ID ( 0 ); + + a0Text ( "" ); + a1Text ( "" ); + a2Text ( "" ); + a3Text ( "" ); + a4Text ( "" ); + a5Text ( "" ); + a6Text ( "" ); + a7Text ( "" ); + a8Text ( "" ); + a9Text ( "" ); + + alarmIDs ( {} ); + + alarmTexts ( {} ); + } + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the Previous values before being set. *** + adjustment ( true ); +} + +/*! + * \brief VAlarmActiveList::alarmIDText + * \details Looks up the alarm text from the alarm ID + * \param vID - The Alarm ID + * \return The alarm text (QString) + */ +QString View::VAlarmActiveList::alarmIDText(quint32 vID) +{ + return Model::MAlarmStatus::toText(static_cast(vID)); +} + +void View::VAlarmActiveList::doRequest() +{ + AlarmActiveListRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/alarm/VAlarmActiveList.h =================================================================== diff -u --- sources/view/hd/alarm/VAlarmActiveList.h (revision 0) +++ sources/view/hd/alarm/VAlarmActiveList.h (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -0,0 +1,91 @@ +/*! + * + * Copyright (c) 2019-2020 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 VAlarmActiveList.h + * \author (last) denali + * \date (last) 5/26/2021 + * \author (original) denali + * \date (original) 5/26/2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VAdjustmentResponseBase.h" +#include "MAlarmActiveList.h" + +namespace View { + +/*! + * \brief The VAlarmActiveList class + * \details The class to receive the list of active alarms + * + * \sa Models::MAlarmActiveListResponse + * + */ +class VAlarmActiveList : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustment , 0) + // coco end + + PROPERTY( quint32, a0ID , 0 ) + PROPERTY( quint32, a1ID , 0 ) + PROPERTY( quint32, a2ID , 0 ) + PROPERTY( quint32, a3ID , 0 ) + PROPERTY( quint32, a4ID , 0 ) + PROPERTY( quint32, a5ID , 0 ) + PROPERTY( quint32, a6ID , 0 ) + PROPERTY( quint32, a7ID , 0 ) + PROPERTY( quint32, a8ID , 0 ) + PROPERTY( quint32, a9ID , 0 ) + + PROPERTY( QString, a0Text , "") + PROPERTY( QString, a1Text , "") + PROPERTY( QString, a2Text , "") + PROPERTY( QString, a3Text , "") + PROPERTY( QString, a4Text , "") + PROPERTY( QString, a5Text , "") + PROPERTY( QString, a6Text , "") + PROPERTY( QString, a7Text , "") + PROPERTY( QString, a8Text , "") + PROPERTY( QString, a9Text , "") + + PROPERTY(QStringList, alarmIDs , {}) + PROPERTY(QStringList, alarmTexts, {}) + + PROPERTY(QString , status , "") + + VIEW_DEC_CLASS_ADJUSTMENT(VAlarmActiveList, AlarmActiveListResponseData) + + QString alarmIDText(quint32 vID); + +public slots: + void doRequest(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disinfect Request + * \param vData - data model includes request information + */ + void didAdjustment(const AlarmActiveListRequestData &vData); +}; + +} Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r376859852f4d1a07263c44524aec347db29e0133 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -69,7 +69,7 @@ selfTestNoCartridge_occlusionSensors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE ); selfTestNoCartridge_bloodFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE ); selfTestNoCartridge_dialysateFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE ); - selfTestNoCartridge_leakDetectors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE ); + // FIXME: It has been removed : selfTestNoCartridge_leakDetectors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE ); selfTestNoCartridge_boardTemperature ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE ); selfTestNoCartridge_homeValves ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE ); selfTestNoCartridge_homeSyringePump ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE );