Index: leahi.pro =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- leahi.pro (.../leahi.pro) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ leahi.pro (.../leahi.pro) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -219,6 +219,7 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ sources/model/td/data/MTDPowerOffWarning.h \ + sources/model/td/data/MTDSyringePumpData.h \ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ @@ -279,6 +280,7 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ + sources/view/td/data/VTDSyringePumpData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ @@ -395,7 +397,6 @@ sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ @@ -489,7 +490,6 @@ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ - sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -569,6 +569,7 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ + sources/model/td/data/MTDSyringePumpData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp \ @@ -700,7 +701,6 @@ sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ - sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ @@ -761,6 +761,7 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ + sources/view/td/data/VTDSyringePumpData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ @@ -848,7 +849,6 @@ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ - sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -124,7 +124,7 @@ {Gui::GuiActionType::ID_FPRORejectionPercentageData , 5 * 4 }, // 5 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_TDSyringePumpData , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -492,7 +492,7 @@ // ----- Datum case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; - case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; + case Gui::GuiActionType::ID_TDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDSyringePumpData ); break; case Gui::GuiActionType::ID_TDVoltageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData ); break; case Gui::GuiActionType::ID_TDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirBubbleData ); break; case Gui::GuiActionType::ID_TDAirPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirPumpData ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -92,7 +92,7 @@ #include "VTreatmentBloodPrimeData.h" #include "VTreatmentStopData.h" #include "VHDAccelerometerData.h" -#include "VHDSyringePumpData.h" +#include "VTDSyringePumpData.h" #include "VHDBloodLeakData.h" #include "VTDAirBubbleData.h" #include "VTDAirPumpData.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -91,7 +91,7 @@ // ----- Settings // Service Mode ID_AdjustServiceModeReq = 0xB000, // 176 - ID_AdjustServiceModeRsp = 0xB100, // 177 + ID_AdjustServiceModeRsp = 0xB10F, // 177 //// ----- @CRAPIZED: had to change to avoid duplication // Version ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED @@ -224,7 +224,7 @@ // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 - ID_HDSyringePumpData = 0x6900, // 105 + ID_TDSyringePumpData = 0xB100, // 177 ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -r62155209c75b694c2d389887bfddd954f8f2754b -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 62155209c75b694c2d389887bfddd954f8f2754b) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -47,7 +47,7 @@ signal okClicked() function updateImage () { - _root.figureImageSource = _listView.model.get(_listView.currentIndex).image + _root.figureImageSource = _listView.model.get(_listView.currentIndex).image ?? "" } Rectangle { id: _titleBar Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -132,7 +132,6 @@ topMargin : spacing left : _TDPressureOcclusionColumn.left } - model: [ vTDAirBubble.venousAirBubbleStatus , vTDAirBubble.venousAirBubbleState , @@ -144,6 +143,40 @@ ] } + DebugDataColumn { id: _TDSyringePumpColumn + textObjectName :"_TDSyringePumpColumn" + title : "[0xB1]" + qsTr(" Syringe Pump") + anchors { + top : _TDAirBubblesColumn.bottom + topMargin : spacing + left : _TDAirBubblesColumn.left + } + model: [ + vTDSyringePump.syringePumpState , + vTDSyringePump.heparinState , + vTDSyringePump.setRate .toFixed(2) , + vTDSyringePump.measuredRate .toFixed(2) , + vTDSyringePump.syringePumpPosition , + vTDSyringePump.volumeDelivered .toFixed(2) , + vTDSyringePump.measuredHome .toFixed(2) , + vTDSyringePump.measuredForce .toFixed(2) , + vTDSyringePump.safetyVol .toFixed(2) , + vTDSyringePump.status , + ] + label: [ + "pump state ", + "heparin State ", + "set Rate ", + "measured Rate ", + "syringePump Position ", + "volume Delivered ", + "measured Home ", + "measured Force ", + "safety Vol ", + "status ", + ] + } + DebugDataColumn { id: _TDValvesColumn textObjectName :"_TDValvesData" title : "[0X2B]" + qsTr(" Valves ") Index: sources/gui/qml/main.qml =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/gui/qml/main.qml (.../main.qml) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/gui/qml/main.qml (.../main.qml) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -24,7 +24,7 @@ // View classes import VGeneralEvent 0.1 import VHDAccelerometer 0.1 -import VHDSyringePump 0.1 +import VTDSyringePump 0.1 import VHDBloodLeak 0.1 import VTDAirBubble 0.1 import VTDAirPump 0.1 @@ -233,7 +233,7 @@ VGeneralEvent { id: vGeneralEvent } VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } + VTDSyringePump { id: vTDSyringePump } VTDAirBubble { id: vTDAirBubble } VTDAirPump { id: vTDAirPump } VHDBloodLeak { id: vHDBloodLeak } Index: sources/model/MModel.h =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/model/MModel.h (.../MModel.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/model/MModel.h (.../MModel.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -62,7 +62,7 @@ #include "MTreatmentIsolatedUFData.h" #include "MTreatmentParametersSetPointData.h" #include "MHDAccelerometerData.h" -#include "MHDSyringePumpData.h" +#include "MTDSyringePumpData.h" #include "MHDBloodLeakData.h" #include "MHDRTCEpochData.h" #include "MHDUsageInfoResponse.h" @@ -380,7 +380,7 @@ REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ REGISTER_METATYPE( TreatmentIsolatedUFData ) \ REGISTER_METATYPE( TreatmentParametersSetPointData ) \ - REGISTER_METATYPE( HDSyringePumpData ) \ + REGISTER_METATYPE( TDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ REGISTER_METATYPE( TDAirTrapData ) \ @@ -621,7 +621,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirBubbleData ) \ @@ -873,7 +873,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirBubbleData ) \ @@ -1259,7 +1259,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ ACTION_RECEIVE_SIGNAL( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentParametersSetPointData ) \ - ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ + ACTION_RECEIVE_SIGNAL( TDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ ACTION_RECEIVE_SIGNAL( TDAirTrapData ) \ Fisheye: Tag 9eb583ef8480f80fe55be7b88b3ed1a27109492a refers to a dead (removed) revision in file `sources/model/hd/data/MHDSyringePumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9eb583ef8480f80fe55be7b88b3ed1a27109492a refers to a dead (removed) revision in file `sources/model/hd/data/MHDSyringePumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/td/data/MTDSyringePumpData.cpp =================================================================== diff -u --- sources/model/td/data/MTDSyringePumpData.cpp (revision 0) +++ sources/model/td/data/MTDSyringePumpData.cpp (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -0,0 +1,68 @@ +/*! + * + * Copyright (c) 2021-2024 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 MTDSyringePumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 30-Jul-2021 + * \author (original) Behrouz NematiPour + * \date (original) 30-Jul-2021 + * + */ +#include "MTDSyringePumpData.h" + +using namespace Model; + +QVariantList MTDSyringePump::parameters() const { + return { + _data.mSyringePumpState .value, + _data.mHeparinState .value, + _data.mSetRate .value, + _data.mMeasuredRate .value, + _data.mSyringePumpPosition .value, + _data.mVolumeDelivered .value, + _data.mMeasuredHome .value, + _data.mMeasuredForce .value, + _data.mSafetyVol .value, + _data.mStatus .value, + }; +} + +bool MTDSyringePump::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mSyringePumpState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSetRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMeasuredRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSyringePumpPosition )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVolumeDelivered )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMeasuredHome )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMeasuredForce )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSafetyVol )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mStatus )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +MTDSyringePump::Data MTDSyringePump::data() const { + Data data; + data.mSyringePumpState = _data.mSyringePumpState .value; + data.mHeparinState = _data.mHeparinState .value; + data.mSetRate = _data.mSetRate .value; + data.mMeasuredRate = _data.mMeasuredRate .value; + data.mSyringePumpPosition = _data.mSyringePumpPosition.value; + data.mVolumeDelivered = _data.mVolumeDelivered .value; + data.mMeasuredHome = _data.mMeasuredHome .value; + data.mMeasuredForce = _data.mMeasuredForce .value; + data.mSafetyVol = _data.mSafetyVol .value; + data.mStatus = _data.mStatus .value; + return data; +} Index: sources/model/td/data/MTDSyringePumpData.h =================================================================== diff -u --- sources/model/td/data/MTDSyringePumpData.h (revision 0) +++ sources/model/td/data/MTDSyringePumpData.h (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -0,0 +1,110 @@ +/*! + * + * Copyright (c) 2021-2024 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 MTDSyringePumpData.h + * \author (last) Behrouz NematiPour + * \date (last) 10-Mar-2022 + * \author (original) Behrouz NematiPour + * \date (original) 30-Jul-2021 + * + */ +#pragma once + + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MTDSyringePump class + * \details The TD SyringePump data model + * + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0xB100 | 0x040 | 1 Hz | N | HD | All | HD SyringePump Data | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mSyringePumpState | + * | #2:(U32) | \ref Data::mHeparinState | + * | #3:(F32) | \ref Data::mSetRate | + * | #4:(F32) | \ref Data::mMeasuredRate | + * | #5:(S32) | \ref Data::mSyringePumpPosition | + * | #6:(F32) | \ref Data::mVolumeDelivered | + * | #7:(F32) | \ref Data::mHome | + * | #8:(F32) | \ref Data::mForce | + * | #9:(F32) | \ref Data::mSafetyVol | + * |#10:(U32) | \ref Data::mStatus | + * + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | Syringe | + * + */ +class MTDSyringePump : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mSyringePumpState ; + Types::U32 mHeparinState ; + Types::F32 mSetRate ; // (mL/hr) + Types::F32 mMeasuredRate ; // (mL/hr) + Types::S32 mSyringePumpPosition ; + Types::F32 mVolumeDelivered ; // (mL) + Types::F32 mMeasuredHome ; // (V) + Types::F32 mMeasuredForce ; // (V) + Types::F32 mSafetyVol ; // (mL) + Types::U32 mStatus ; + } _data; + +public: + + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("Syringe"); } + + struct Data { + quint32 mSyringePumpState = 0; + quint32 mHeparinState = 0; + float mSetRate = 0; + float mMeasuredRate = 0; + qint32 mSyringePumpPosition = 0; + float mVolumeDelivered = 0; + float mMeasuredHome = 0; + float mMeasuredForce = 0; + float mSafetyVol = 0; + quint32 mStatus = 0; + }; + +public: + MTDSyringePump () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MTDSyringePump::Data TDSyringePumpData; Index: sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r786c598a074df1620995ce09a1166a4f7173add6 -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 786c598a074df1620995ce09a1166a4f7173add6) +++ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -90,7 +90,7 @@ Type_Enum typeText () const override { return Type_Enum::eDatum ; } Unit_Enum unitText () const override { return Unit_Enum::eTD ; } - QString infoText () const override { return QString("Occlusion") ; } + QString infoText () const override { return QString("Pressure") ; } struct Data { float mArterialPressure = 0; Index: sources/view/VView.h =================================================================== diff -u -r4926ab6d9b90ebf8c94246f8f99a174f433541ee -r9eb583ef8480f80fe55be7b88b3ed1a27109492a --- sources/view/VView.h (.../VView.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) +++ sources/view/VView.h (.../VView.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -175,7 +175,7 @@ REGISTER_TYPE( VTreatmentStop ) \ /* Device - Data */ \ REGISTER_TYPE( VHDAccelerometer ) \ - REGISTER_TYPE( VHDSyringePump ) \ + REGISTER_TYPE( VTDSyringePump ) \ REGISTER_TYPE( VHDBloodLeak ) \ REGISTER_TYPE( VTDAirBubble ) \ REGISTER_TYPE( VTDAirPump ) \ Fisheye: Tag 9eb583ef8480f80fe55be7b88b3ed1a27109492a refers to a dead (removed) revision in file `sources/view/hd/data/VHDSyringePumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9eb583ef8480f80fe55be7b88b3ed1a27109492a refers to a dead (removed) revision in file `sources/view/hd/data/VHDSyringePumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/td/data/VTDSyringePumpData.cpp =================================================================== diff -u --- sources/view/td/data/VTDSyringePumpData.cpp (revision 0) +++ sources/view/td/data/VTDSyringePumpData.cpp (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -0,0 +1,33 @@ +/*! + * + * Copyright (c) 2021-2024 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 VTDSyringePumpData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 30-Jul-2021 + * \author (original) Behrouz NematiPour + * \date (original) 30-Jul-2021 + * + */ +#include "VTDSyringePumpData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VTDSyringePump, TDSyringePumpData) + +void VTDSyringePump::onActionReceive(const TDSyringePumpData &vData) { + syringePumpState (vData.mSyringePumpState ); + heparinState (vData.mHeparinState ); + setRate (vData.mSetRate ); + measuredRate (vData.mMeasuredRate ); + syringePumpPosition (vData.mSyringePumpPosition ); + volumeDelivered (vData.mVolumeDelivered ); + measuredHome (vData.mMeasuredHome ); + measuredForce (vData.mMeasuredForce ); + safetyVol (vData.mSafetyVol ); + status (vData.mStatus ); +} Index: sources/view/td/data/VTDSyringePumpData.h =================================================================== diff -u --- sources/view/td/data/VTDSyringePumpData.h (revision 0) +++ sources/view/td/data/VTDSyringePumpData.h (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) @@ -0,0 +1,51 @@ +/*! + * + * Copyright (c) 2021-2024 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 VTDSyringePumpData.h + * \author (last) Behrouz NematiPour + * \date (last) 10-Aug-2021 + * \author (original) Behrouz NematiPour + * \date (original) 30-Jul-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VView.h" +#include "MTDSyringePumpData.h" + +// namespace +namespace View { + +/*! + * \brief The VTDSyringePump class + * \details View for Model's Data representation. + * + * \sa Model::MTDSyringePump + * + */ +class VTDSyringePump : public QObject { + Q_OBJECT + + PROPERTY( quint32 , syringePumpState , 0) + PROPERTY( quint32 , heparinState , 0) + PROPERTY( float , setRate , 0) + PROPERTY( float , measuredRate , 0) + PROPERTY( qint32 , syringePumpPosition , 0) + PROPERTY( float , volumeDelivered , 0) + PROPERTY( float , measuredHome , 0) + PROPERTY( float , measuredForce , 0) + PROPERTY( float , safetyVol , 0) + PROPERTY( quint32 , status , 0) + + VIEW_DEC(VTDSyringePump, TDSyringePumpData) +}; +}