Index: sources/applicationcontroller.cpp =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 applicationcontroller.cpp * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #include "applicationcontroller.h" @@ -99,7 +99,7 @@ this , SLOT( onActionReceive(GuiActionType, const QVariantList &))); connect(&_MessageDispatcher, SIGNAL(didFailedTransmit(Sequence)), - this , SLOT(onFailedTransmit(Sequence))); + this , SLOT( onFailedTransmit(Sequence))); connect(&_GuiController , SIGNAL(didUSBDriveUmount()), this , SLOT( onUSBDriveUmount())); Index: sources/applicationcontroller.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 applicationcontroller.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #pragma once @@ -22,6 +22,7 @@ #include "guiglobals.h" #include "applicationpost.h" #include "MModel.h" +#include "messageglobals.h" // define #define _ApplicationController ApplicationController::I() Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 messageinterpreter.cpp * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 13-Dec-2019 - * + * */ #include "messageinterpreter.h" @@ -323,8 +323,7 @@ case Gui::GuiActionType::ID_AlarmStatus : ok = alarmStatus (vMessage, vData); break; case Gui::GuiActionType::ID_AlarmTriggered : ok = alarmTriggered (vMessage, vData); break; case Gui::GuiActionType::ID_AlarmCleared : ok = alarmCleared (vMessage, vData); break; - case Gui::GuiActionType::ID_AlarmSilenceRsp : ok = alarmSilence (vMessage, vData); break; // Don't think we are going to have response and it is only an Ack. - + // Adjustment Response Messages case Gui::GuiActionType::ID_AdjustDurationRsp : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustDurationRsp , Model::MAdjustDurationResponse ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustBloodDialysateRsp , Model::MAdjustBloodDialysateResponse ); break; Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 messageinterpreter.h * \author (last) Behrouz NemaiPour * \date (last) 22-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 13-Dec-2019 - * + * */ #pragma once Index: sources/gui/guicontroller.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/gui/guicontroller.h (.../guicontroller.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 guicontroller.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 - * + * */ #pragma once @@ -21,6 +21,7 @@ #include "main.h" #include "guiglobals.h" #include "MModel.h" +#include "messageglobals.h" // define #define _GuiController GuiController::I() Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 SettingsHome.qml * \author (last) Peter Lucia * \date (last) 01-Jul-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Oct-2019 - * + * */ // Qt @@ -28,6 +28,7 @@ * which is the default screen in the "Settings" stack */ ScreenItem { id: _root + Text { id : _titleText visible: true anchors { @@ -50,6 +51,18 @@ rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 } } + + ExportButton { id: _exportButton + width: 150 + height: 50 + anchors { + top : parent.top + right : _poweroffButton.left + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + } + } + TouchRect { id : _poweroffButton width: 150 height: Variables.logoHeight @@ -64,13 +77,31 @@ button.onPressed: { _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) } + } + + Text { id : _canbusFaultCountText + property int count: 0 + visible: true + anchors { + top : parent.top + left : parent.left + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + leftMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + } + text: qsTr("CAN Faults : %1").arg(count) + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Connections { target: _GuiView onDidActionReceive: { if (vAction === GuiActions.ID_CANBusFaultCount ) { _canbusFaultCountText.count = vData[0] } } } + Column { id: _BloodFlowColumn width : 150 spacing : 20 @@ -84,6 +115,27 @@ color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle font.underline: true + } + Repeater { + model: [ + vTreatmentBloodFlow.bloodFlow_FlowSetPoint , + vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) + ] + Text { + text: modelData + width: _BloodFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + Column { id: _DialysateInletFlowColumn width : 150 spacing : 20 @@ -117,6 +169,7 @@ } } } + Column { id: _DialysateOutletFlowColumn width : 150 spacing : 20 Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -raa0772fe1b0ff6b07e9f64e8c38acad66ad5468d -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision aa0772fe1b0ff6b07e9f64e8c38acad66ad5468d) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -136,6 +136,20 @@ } }; +class MAlarmSilenceReq : public MModel { +public: + bool state = 0; + // 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}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AlarmSilence", vParameters); + } +}; + } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; @@ -144,3 +158,5 @@ typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; + +typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -15,6 +15,7 @@ using namespace Model; +using namespace Gui; MAlarmStatus::MAlarmStatus() { } @@ -61,3 +62,78 @@ data.mFlags = _data.mFlags ; return data; } + +/*! + * \brief MAlarmStatus::toText + * \details Looks up the alarm description using the alarm enum + * \param vAlarmID - Alarm Id + * \return The alarm description + */ +QString MAlarmStatus::toText(GuiAlarmID vAlarmID) { + + QString result; + switch (vAlarmID) { + case GuiAlarmID::ALARM_ID_NO_ALARM: { result = QObject::tr(""); break; } + case GuiAlarmID::ALARM_ID_SOFTWARE_FAULT: { result = QObject::tr("Software Error."); break; } + case GuiAlarmID::ALARM_ID_STUCK_BUTTON_TEST_FAILED: { result = QObject::tr("Indication for when no alarms is a possible situation."); break; } + case GuiAlarmID::ALARM_ID_FPGA_POST_TEST_FAILED: { result = QObject::tr("FPGA POST failure."); break; } + case GuiAlarmID::ALARM_ID_WATCHDOG_POST_TEST_FAILED: { result = QObject::tr("Watchdog POST failure."); break; } + case GuiAlarmID::ALARM_ID_UI_COMM_POST_FAILED: { result = QObject::tr("UI communication POST failure."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK: { result = QObject::tr("Blood pump failed motor controller current check."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_OFF_CHECK: { result = QObject::tr("Blood pump failed motor off check. \nMeasured speed while commanded off."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK: { result = QObject::tr("Blood pump failed motor controller direction check."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK: { result = QObject::tr("Blood pump failed rotor speed check."); break; } + case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK: { result = QObject::tr("Dialysis inlet pump failed motor controller current check."); break; } + case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_OFF_CHECK: { result = QObject::tr("Dialysis inlet pump failed motor off check. \nMeasured speed while commanded off."); break; } + case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK: { result = QObject::tr("Dialysis inlet pump failed motor controller direction check."); break; } + case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK: { result = QObject::tr("Dialysis inlet pump failed rotor speed check."); break; } + case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK: { result = QObject::tr("Dialysis outlet pump failed motor controller current check."); break; } + case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK: { result = QObject::tr("Dialysis outlet pump failed motor off check. \nMeasured speed while commanded off."); break; } + case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK: { result = QObject::tr("Dialysis outlet pump failed motor controller direction check."); break; } + case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK: { result = QObject::tr("Dialysis outlet pump failed rotor speed check."); break; } + case GuiAlarmID::ALARM_ID_WATCHDOG_EXPIRED: { result = QObject::tr("Watchdog expired error."); break; } + case GuiAlarmID::ALARM_ID_RTC_COMM_ERROR: { result = QObject::tr("Real-time clock communication error."); break; } + case GuiAlarmID::ALARM_ID_RTC_CONFIG_ERROR: { result = QObject::tr("Real-time clock configuration error."); break; } + case GuiAlarmID::ALARM_ID_DG_COMM_TIMEOUT: { result = QObject::tr("Dialysate generator communication timeout."); break; } + case GuiAlarmID::ALARM_ID_UI_COMM_TIMEOUT: { result = QObject::tr("User interface communication timeout."); break; } + case GuiAlarmID::ALARM_ID_COMM_TOO_MANY_BAD_CRCS: { result = QObject::tr("Too many bad CRCs detected on received system messages."); break; } + case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_BY_USER: { result = QObject::tr("Treatment stopped by user action - pressed stop button."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_SITTING_WARNING: { result = QObject::tr("Blood sitting too long warning (>4 min)."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME: { result = QObject::tr("Blood sitting too long alarm (>5 min)."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK: { result = QObject::tr("Blood sitting too long alarm (>10 min)."); break; } + case GuiAlarmID::ALARM_ID_CAN_MESSAGE_NOT_ACKED: { result = QObject::tr("System message needing acknowledgment was not acknowledged."); break; } + case GuiAlarmID::ALARM_ID_OCCLUSION_BLOOD_PUMP: { result = QObject::tr("Blood pump occlusion detected."); break; } + case GuiAlarmID::ALARM_ID_OCCLUSION_DIAL_IN_PUMP: { result = QObject::tr("Dialysate inlet pump occlusion detected."); break; } + case GuiAlarmID::ALARM_ID_OCCLUSION_DIAL_OUT_PUMP: { result = QObject::tr("Dialysate outlet pump occlusion detected."); break; } + case GuiAlarmID::ALARM_ID_ARTERIAL_PRESSURE_LOW: { result = QObject::tr("Arterial pressure too low during treatment."); break; } + case GuiAlarmID::ALARM_ID_ARTERIAL_PRESSURE_HIGH: { result = QObject::tr("Arterial pressure too high during treatment."); break; } + case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_LOW: { result = QObject::tr("Venous pressure too low during treatment."); break; } + case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_HIGH: { result = QObject::tr("Venous pressure too high during treatment."); break; } + case GuiAlarmID::ALARM_ID_UF_RATE_TOO_HIGH_ERROR: { result = QObject::tr("Ultrafiltration rate is too high error during treatment."); break; } + case GuiAlarmID::ALARM_ID_UF_VOLUME_ACCURACY_ERROR: { result = QObject::tr("Ultrafiltration volume accuracy error during treatment."); break; } + case GuiAlarmID::ALARM_ID_RTC_BATTERY_LOW: { result = QObject::tr("RTC battery low."); break; } + case GuiAlarmID::ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE: { result = QObject::tr("RTC or MCU timer inaccurate."); break; } + case GuiAlarmID::ALARM_ID_RTC_RAM_OPS_ERROR: { result = QObject::tr("RTC or RAM operations failure (read or write)."); break; } + case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE: { result = QObject::tr("EEPRON operations (read, write, erase) failure."); break; } + case GuiAlarmID::ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR: { result = QObject::tr("Manufacturing record CRC failure."); break; } + case GuiAlarmID::ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR: { result = QObject::tr("Service record CRC failure."); break; } + case GuiAlarmID::ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR: { result = QObject::tr("Calibration record CRC failure."); break; } + case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR: { result = QObject::tr("HW usage data failure."); break; } + case GuiAlarmID::AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR: { result = QObject::tr("Last disinfection date CRC error."); break; } + case GuiAlarmID::ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("Pressure at outlet of RO pump is out of range."); break; } + case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE: { result = QObject::tr("DG temperature sensors ADC read out of range."); break; } + case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT: { result = QObject::tr("DG temperature sensors values are inconsistent."); break; } + case GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT: { result = QObject::tr("HD communication timeout."); break; } + case GuiAlarmID::ALARM_ID_VALVE_CONTROL_FAILURE: { result = QObject::tr("FPGA not accepting commanded valve states."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK: { result = QObject::tr("Blood pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."); break; } + case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK: { result = QObject::tr("Dialysate inlet pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."); break; } + case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK: { result = QObject::tr("Dialysate outlet pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK: { result = QObject::tr("Blood pump failed motor speed check. Measured vs. commanded."); break; } + case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK: { result = QObject::tr("Dialysate inlet pump failed motor speed check. Measured vs. commanded."); break; } + case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK: { result = QObject::tr("Dialysate outlet pump failed motor speed check. Measured vs. commanded."); break; } + case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH: { result = QObject::tr("Blood pump rotor speed too high."); break; } + case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE: { result = QObject::tr("Intel water temperature out of range."); break; } + default: { result = QObject::tr("Alarm Not Recognized."); break; } + } + return result; +} Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -18,6 +18,7 @@ // Project #include "types.h" +#include "guiglobals.h" namespace Model { @@ -58,8 +59,9 @@ MAlarmStatus(); QString toString ( ) const ; - void toVariantList ( QVariantList &vData ) const ; - bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); + void toVariantList ( QVariantList &vData ) const ; + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); + static QString toText ( Gui::GuiAlarmID vAlarmID); Data data() const ; }; Index: sources/view/valarmstatus.cpp =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * 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 valarmstatus.cpp * \author (last) Peter Lucia * \date (last) 29-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 - * + * */ #include "valarmstatus.h" @@ -145,6 +145,6 @@ { // TODO: Update with needed data. Placeholder for now. QVariantList messageData = {1,2,3,4,5}; - GuiActionType messageAction = GuiActions::AlarmSilenceReq; + GuiActionType messageAction = GuiActions::ID_AlarmSilenceReq; emit requestActionTransmit(messageAction, messageData); }