Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -79,6 +79,9 @@ #include "VTreatmentStopData.h" #include "VHDAccelerometerData.h" #include "VHDSyringePumpData.h" +#include "VHDBloodLeakData.h" +#include "VHDAirBubbleData.h" +#include "VHDAirTrapData.h" // DG data #include "VDGDrainPumpData.h" #include "VDGHeatersData.h" @@ -90,6 +93,7 @@ #include "VDGTemperaturesData.h" #include "VDGValvesStatesData.h" #include "VDGAccelerometerData.h" +#include "VDGConductivityData.h" // ----- #include "VTreatmentCreate.h" // ----- In-Treatment Adjustments Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -202,15 +202,47 @@ textObjectName: "_DGTemperaturesData" } - // Next row - DebugDataColumn { id: _DGValvesStatesColumn - x: col(3.8) - y: row(5.2) - title: qsTr(" Valves ") - model: [ vDGValvesStates.text ] - textObjectName: "_DGValvesStatesData" + DebugDataColumn { id: _DGConductivityColumn + x: col(3.6) + y: row(3.4) + title: qsTr(" Conduct ") + model: [ + vDGConductivity.RORejectionRatio .toFixed(3), + vDGConductivity.CPi .toFixed(3), + vDGConductivity.CPo .toFixed(3), + vDGConductivity.CD1 .toFixed(3), + vDGConductivity.CD2 .toFixed(3), + ] + label: [ + "ROrr" , + "CPi" , + "CPo" , + "CD1" , + "CD2" , + ] + + textObjectName: "_DGConductivityData" } + DebugDataColumn { id: _HDAirColumn + x: col(6) + y: row(4.2) + title: qsTr(" Air Status ") + model: [ + vHDAirBubble .venousAirBubbleStatus , + vHDAirTrap .airTrapLowerLevel , + vHDAirTrap .airTrapUpperLevel , + + ] + label: [ + "ABs", + "ATll", + "ATul", + + ] + textObjectName: "_HDAirData" + } + DebugDataColumn { id: _DGOperationModeColumn x: col(2.5) y: row(2) @@ -299,7 +331,7 @@ DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(2.8) + y: row(2) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , @@ -368,62 +400,63 @@ font.pixelSize: 38 } - DebugDataColumn { id: _HDAccelerometerColumn + DebugDataColumn { id: _DGValvesStatesColumn x: col(7) - y: row(3.2) - title: qsTr(" HD Acc ") + y: row(0) + title: qsTr(" DG Valves ") model: [ - vHDAccelerometer.x .toFixed(3) , - vHDAccelerometer.y .toFixed(3) , - vHDAccelerometer.z .toFixed(3) , - vHDAccelerometer.xMax .toFixed(3) , - vHDAccelerometer.yMax .toFixed(3) , - vHDAccelerometer.zMax .toFixed(3) , - vHDAccelerometer.xTilt .toFixed(3) , - vHDAccelerometer.yTilt .toFixed(3) , - vHDAccelerometer.zTilt .toFixed(3) + vDGValvesStates.valveStates_01, + vDGValvesStates.valveStates_02, + vDGValvesStates.valveStates_03, + vDGValvesStates.valveStates_04, + vDGValvesStates.valveStates_05, + vDGValvesStates.valveStates_06, + vDGValvesStates.valveStates_07, + vDGValvesStates.valveStates_08, + vDGValvesStates.valveStates_09, + vDGValvesStates.valveStates_10, + vDGValvesStates.valveStates_11, + vDGValvesStates.valveStates_12, + vDGValvesStates.valveStates_13, ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "VRF", + "VRI", + "VRD", + "VRO", + "VPO", + "VBF", + "VRC", + "VDR", + "VPI", + "VSP", + "VR1", + "VR2", + "VRD", ] - textObjectName: "_HDAccelerometerData" + + textObjectName: "_DGValveData" } - DebugDataColumn { id: _DGAccelerometerColumn + DebugDataColumn { id: _HDBloodLeakColumn x: col(7) - y: row(0) - title: qsTr(" DG Acc ") + y: row(4.4) + title: qsTr(" BLD ") model: [ - vDGAccelerometer.x .toFixed(3) , - vDGAccelerometer.y .toFixed(3) , - vDGAccelerometer.z .toFixed(3) , - vDGAccelerometer.xMax .toFixed(3) , - vDGAccelerometer.yMax .toFixed(3) , - vDGAccelerometer.zMax .toFixed(3) , - vDGAccelerometer.xTilt .toFixed(3) , - vDGAccelerometer.yTilt .toFixed(3) , - vDGAccelerometer.zTilt .toFixed(3) + vHDBloodLeak.bloodLeakDetectSetPoint , + vHDBloodLeak.bloodLeakZeroedStatus , + vHDBloodLeak.bloodLeakState , + vHDBloodLeak.bloodLeakCounter , ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "SetPt" , + "0Stat" , + "State" , + "Cntr" , + ] - textObjectName: "_DGAccelerometerData" + + textObjectName: "_DGConductivityData" } TouchRect { @@ -502,6 +535,20 @@ textObjectName: "_PreTreatmentStates" } + DebugDataColumn { id: _HDAlarmTop + x: col(3) + y: row(6.5) + title: qsTr(" Alarm ") + model: [ + vAlarmStatus.alarm_AlarmID, + ] + label: [ + "Top" , + ] + + textObjectName: "_HDAlarmTopData" + } + Connections { target: _GuiView onDidActionReceive: { if (vAction === GuiActions.ID_CANBusFaultCount ) { Index: sources/gui/qml/main.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/gui/qml/main.qml (.../main.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/main.qml (.../main.qml) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -24,7 +24,10 @@ // View classes import VHDAccelerometer 0.1 import VHDSyringePump 0.1 - +import VHDBloodLeak 0.1 +import VHDAirTrap 0.1 +import VHDAirBubble 0.1 +import VAlarmStatus 0.1 // POST import VHDPOSTData 0.1 import VDGPOSTData 0.1 @@ -87,6 +90,7 @@ import VDGValvesStates 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 +import VDGConductivity 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -147,6 +151,7 @@ interval : vTreatmentCreate.bloodPressureMeasureInterval } + VAlarmStatus { id: vAlarmStatus } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } @@ -157,6 +162,9 @@ VTreatmentStop { id: vTreatmentStop } VHDAccelerometer { id: vHDAccelerometer } VHDSyringePump { id: vHDSyringePump } + VHDAirBubble { id: vHDAirBubble } + VHDBloodLeak { id: vHDBloodLeak } + VHDAirTrap { id: vHDAirTrap } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -168,7 +176,7 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } - + VDGConductivity { id: vDGConductivity } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -69,6 +69,7 @@ eFlag_ValveStates_10 , eFlag_ValveStates_11 , eFlag_ValveStates_12 , + eFlag_ValveStates_13 , eFlag_Bits_Length = 16, }; Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r472ac210943410d8cb2f9f664f3c97c2482e43a9 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 472ac210943410d8cb2f9f664f3c97c2482e43a9) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 17-Feb-2022 + * \date (last) 24-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -183,14 +183,14 @@ /*0147*/case GuiAlarmID::ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT : { result = QObject::tr("DG dialysate generation conductivity fault alarm." ); break; } /* 147*/ /*0148*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_TEMPERATURE : { result = QObject::tr("Inlet water temperature too high." ); break; } /* 148*/ /*0149*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_TEMPERATURE : { result = QObject::tr("Inlet water temperature too low." ); break; } /* 149*/ -/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY : { result = QObject::tr("Inlet water conductivity too high." ); break; } /* 150*/ +/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE : { result = QObject::tr("Inlet water conductivity is in warning range." ); break; } /* 150*/ /*0151*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY : { result = QObject::tr("Inlet water conductivity too low." ); break; } /* 151*/ /*0152*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_PRESSURE : { result = QObject::tr("Inlet water pressure too low." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH : { result = QObject::tr("HD prime completed high priority alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE : { result = QObject::tr("EEPROM operations (read, write, erase) failure." ); break; } /* 154*/ /*0155*/case GuiAlarmID::ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC : { result = QObject::tr("DG software configuration record invalid CRC." ); break; } /* 155*/ /*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure." ); break; } /* 156*/ -/*0157*/case GuiAlarmID::ALARM_ID____AVAILABLE_23 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 157*/ +/*0157*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("Inlet water temperature is not within specified range." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID____AVAILABLE_24 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 158*/ /*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH : { result = QObject::tr("Blood pump rotor speed too high." ); break; } /* 160*/ Index: sources/view/VView.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/VView.h (.../VView.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/VView.h (.../VView.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -144,6 +144,9 @@ /* Device - Data */ \ REGISTER_TYPE( VHDAccelerometer ) \ REGISTER_TYPE( VHDSyringePump ) \ + REGISTER_TYPE( VHDBloodLeak ) \ + REGISTER_TYPE( VHDAirBubble ) \ + REGISTER_TYPE( VHDAirTrap ) \ /* DG - Data */ \ REGISTER_TYPE( VDGDrainPump ) \ REGISTER_TYPE( VDGHeaters ) \ @@ -155,6 +158,7 @@ REGISTER_TYPE( VDGTemperatures ) \ REGISTER_TYPE( VDGValvesStates ) \ REGISTER_TYPE( VDGAccelerometer ) \ + REGISTER_TYPE( VDGConductivity ) \ /* Pre-Treatment */ \ REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \ Index: sources/view/dg/data/VDGConductivityData.cpp =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/dg/data/VDGConductivityData.cpp (.../VDGConductivityData.cpp) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/dg/data/VDGConductivityData.cpp (.../VDGConductivityData.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -5,7 +5,7 @@ * 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 VDGAccelerometerData.cpp + * \file VDGConductivityData.cpp * \author (last) Michael Garthwaite * \date (last) 23-Feb-2022 * \author (original) Michael Garthwaite Index: sources/view/dg/data/VDGValvesStatesData.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/dg/data/VDGValvesStatesData.cpp (.../VDGValvesStatesData.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -33,6 +33,7 @@ valveStates_10 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_10 )); valveStates_11 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_11 )); valveStates_12 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_12 )); + valveStates_13 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_13 )); // Trigger should be the last refresh(true); Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -40,18 +40,19 @@ TRIGGER ( bool , refresh , false) // coco end - PROPERTY( bool , valveStates_01 , false) - PROPERTY( bool , valveStates_02 , false) - PROPERTY( bool , valveStates_03 , false) - PROPERTY( bool , valveStates_04 , false) - PROPERTY( bool , valveStates_05 , false) - PROPERTY( bool , valveStates_06 , false) - PROPERTY( bool , valveStates_07 , false) - PROPERTY( bool , valveStates_08 , false) - PROPERTY( bool , valveStates_09 , false) - PROPERTY( bool , valveStates_10 , false) - PROPERTY( bool , valveStates_11 , false) - PROPERTY( bool , valveStates_12 , false) + PROPERTY( quint32 , valveStates_01 , 0) + PROPERTY( quint32 , valveStates_02 , 0) + PROPERTY( quint32 , valveStates_03 , 0) + PROPERTY( quint32 , valveStates_04 , 0) + PROPERTY( quint32 , valveStates_05 , 0) + PROPERTY( quint32 , valveStates_06 , 0) + PROPERTY( quint32 , valveStates_07 , 0) + PROPERTY( quint32 , valveStates_08 , 0) + PROPERTY( quint32 , valveStates_09 , 0) + PROPERTY( quint32 , valveStates_10 , 0) + PROPERTY( quint32 , valveStates_11 , 0) + PROPERTY( quint32 , valveStates_12 , 0) + PROPERTY( quint32 , valveStates_13 , 0) Q_PROPERTY(QString text READ text NOTIFY refreshTriggered) Index: sources/view/hd/data/VHDAirBubbleData.cpp =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/hd/data/VHDAirBubbleData.cpp (.../VHDAirBubbleData.cpp) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/hd/data/VHDAirBubbleData.cpp (.../VHDAirBubbleData.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -1 +1,26 @@ +/*! + * + * Copyright (c) 2021-2022 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 VHDAirBubbleData.cpp + * \author (last) Michael Garthwaite + * \date (last) 23-Feb-2022 + * \author (original) Michael Garthwaite + * \date (original) 23-Feb-2022 + * + */ +#include "VHDAirBubbleData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VHDAirBubble, HDAirBubbleData) + +void VHDAirBubble::onActionReceive(const HDAirBubbleData &vData) { + venousAirBubbleStatus (vData.mVenousAirBubbleStatus ); + venousAirBubbleState (vData.mVenousAirBubbleState ); + +} Index: sources/view/hd/data/VHDAirBubbleData.h =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/hd/data/VHDAirBubbleData.h (.../VHDAirBubbleData.h) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/hd/data/VHDAirBubbleData.h (.../VHDAirBubbleData.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -1,4 +1,44 @@ -#ifndef VHDAIRBUBBLEDATA_H -#define VHDAIRBUBBLEDATA_H +/*! + * + * Copyright (c) 2021-2022 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 VHDAirBubbleData.h + * \author (last) Michael Garthwaite + * \date (last) 23-Feb-2022 + * \author (original) Michael Garthwaite + * \date (original) 23-Feb-2022 + * + */ +#pragma once -#endif // VHDAIRBUBBLEDATA_H +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VView.h" +#include "MHDAirBubbleData.h" + +// namespace +namespace View { + +/*! + * \brief The VHDAirBubble class + * \details View for Model's Data representation. + * + * \sa Model::MHDAirBubbleData + * + */ +class VHDAirBubble : public QObject { + Q_OBJECT + + PROPERTY( quint32 , venousAirBubbleStatus , 0) + PROPERTY( quint32 , venousAirBubbleState , 0) + + + VIEW_DEC(VHDAirBubble, HDAirBubbleData) +}; +} Index: sources/view/hd/data/VHDAirTrapData.cpp =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/hd/data/VHDAirTrapData.cpp (.../VHDAirTrapData.cpp) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/hd/data/VHDAirTrapData.cpp (.../VHDAirTrapData.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -1 +1,26 @@ +/*! + * + * Copyright (c) 2021-2022 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 VHDAirTrapData.cpp + * \author (last) Michael Garthwaite + * \date (last) 23-Feb-2022 + * \author (original) Michael Garthwaite + * \date (original) 23-Feb-2022 + * + */ +#include "VHDAirTrapData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VHDAirTrap, HDAirTrapData) + +void VHDAirTrap::onActionReceive(const HDAirTrapData &vData) { + airTrapLowerLevel (vData.mAirTrapLowerLevel ); + airTrapUpperLevel (vData.mAirTrapUpperLevel ); + +} Index: sources/view/hd/data/VHDAirTrapData.h =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/hd/data/VHDAirTrapData.h (.../VHDAirTrapData.h) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/hd/data/VHDAirTrapData.h (.../VHDAirTrapData.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -1,4 +1,44 @@ -#ifndef VHDAIRTRAPDATA_H -#define VHDAIRTRAPDATA_H +/*! + * + * Copyright (c) 2021-2022 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 VHDAirTrapData.h + * \author (last) Michael Garthwaite + * \date (last) 23-Feb-2022 + * \author (original) Michael Garthwaite + * \date (original) 23-Feb-2022 + * + */ +#pragma once -#endif // VHDAIRTRAPDATA_H +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VView.h" +#include "MHDAirTrapData.h" + +// namespace +namespace View { + +/*! + * \brief The VHDAirTrap class + * \details View for Model's Data representation. + * + * \sa Model::MHDAirTrapData + * + */ +class VHDAirTrap : public QObject { + Q_OBJECT + + PROPERTY( quint32 , airTrapLowerLevel , 0) + PROPERTY( quint32 , airTrapUpperLevel , 0) + + + VIEW_DEC(VHDAirTrap, HDAirTrapData) +}; +} Index: sources/view/hd/data/VHDBloodLeakData.cpp =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -17,9 +17,9 @@ // Project #include "GuiController.h" -VIEW_DEF(VHDBloodLeakData, HDBloodLeakData) +VIEW_DEF(VHDBloodLeak, HDBloodLeakData) -void VHDBloodLeakData::onActionReceive(const HDBloodLeakData &vData) { +void VHDBloodLeak::onActionReceive(const HDBloodLeakData &vData) { bloodLeakStatus (vData.mBloodLeakStatus ); bloodLeakState (vData.mBloodLeakState ); bloodLeakZeroStatusCounter (vData.mBloodLeakZeroStatusCounter ); Index: sources/view/hd/data/VHDBloodLeakData.h =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -26,13 +26,13 @@ namespace View { /*! - * \brief The VHDBloodLeakData class + * \brief The VHDBloodLeak class * \details View for Model's Data representation. * * \sa Model::MHDBloodLeakData * */ -class VHDBloodLeakData : public QObject { +class VHDBloodLeak : public QObject { Q_OBJECT PROPERTY( quint32 , bloodLeakStatus , 0) @@ -47,6 +47,6 @@ PROPERTY( quint32 , bloodLeakRegisterCounter , 0) - VIEW_DEC(VHDBloodLeakData, HDBloodLeakData) + VIEW_DEC(VHDBloodLeak, HDBloodLeakData) }; }