Index: leahi.pro =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- leahi.pro (.../leahi.pro) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ leahi.pro (.../leahi.pro) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -156,9 +156,9 @@ sources/model/td/data/MTDValvesData.h \ sources/model/td/data/MTDVoltageData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ + sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ sources/model/td/data/treatment/MTreatmentSalineData.h \ - sources/model/td/data/treatment/MTreatmentSetPointData.h \ sources/model/td/data/treatment/MTreatmentStatesData.h \ sources/model/td/data/treatment/MTreatmentTimeData.h \ sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h \ @@ -418,9 +418,9 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ + sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ sources/view/td/data/treatment/VTreatmentSalineData.h \ - sources/view/td/data/treatment/VTreatmentSetPointData.h \ sources/view/td/data/treatment/VTreatmentTime.h \ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h @@ -451,9 +451,9 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ + sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ sources/model/td/data/treatment/MTreatmentSalineData.cpp \ - sources/model/td/data/treatment/MTreatmentSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentStatesData.cpp \ sources/model/td/data/treatment/MTreatmentTimeData.cpp \ sources/model/td/data/treatment/MTreatmentUltrafiltrationData.cpp \ @@ -704,9 +704,9 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ + sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ sources/view/td/data/treatment/VTreatmentSalineData.cpp \ - sources/view/td/data/treatment/VTreatmentSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentTime.cpp \ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re88cc4de6dae78dd9412e4935f77af478125f407 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e88cc4de6dae78dd9412e4935f77af478125f407) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -116,7 +116,7 @@ {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) - {Gui::GuiActionType::ID_TreatmentSetPointData , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentParametersSetPointData , 3 * 4 }, // 3 parameters each 4bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 3 + 2 }, // 3 parameters each 4bytes + 1 parameter 2bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -518,7 +518,7 @@ case Gui::GuiActionType::ID_BloodPrime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_BloodPrime ); break; case Gui::GuiActionType::ID_TreatmentStop : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop ); break; case Gui::GuiActionType::ID_Ultrafiltration : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration ); break; - case Gui::GuiActionType::ID_TreatmentSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentSetPointData ); break; + case Gui::GuiActionType::ID_TreatmentParametersSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData ); break; // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -78,7 +78,7 @@ #include "VTreatmentUltrafiltrationData.h" #include "VTreatmentPressureOcclusion.h" #include "VTreatmentTime.h" -#include "VTreatmentSetPointData.h" +#include "VTreatmentParametersSetPointData.h" #include "VTreatmentRanges.h" #include "VTreatmentSalineData.h" #include "VTreatmentHeparinData.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r5da5607e1e0cff6b984ce40c4f328d47b386ba28 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5da5607e1e0cff6b984ce40c4f328d47b386ba28) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -217,7 +217,7 @@ ID_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED ID_TDTemperatureData = 0x5300, // 83 //// ----- TODO: Payload subject to change given FW implementation - ID_TreatmentSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED + ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 923377d29fe730c0e2209386479a61b1e8ee1097) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -132,6 +132,8 @@ readonly property int createTreatmentSwitchYDisplacement : 15 readonly property int treatmentFlowsComponentWidth : 150 + readonly property int treatmentPressureTitleWidth : 125 + readonly property int treatmentPressureValueWidth : 140 readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 Index: sources/gui/qml/main.qml =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/main.qml (.../main.qml) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ sources/gui/qml/main.qml (.../main.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -68,7 +68,7 @@ import VTreatmentPressureOcclusion 0.1 import VTreatmentUltrafiltration 0.1 import VTreatmentTime 0.1 -import VTreatmentSetPoint 0.1 +import VTreatmentParametersSetPoint 0.1 import VTreatmentRinseback 0.1 import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 @@ -202,7 +202,7 @@ VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } - VTreatmentSetPoint { id: vTreatmentSetPoint } + VTreatmentParametersSetPoint { id: vTreatmentParametersSetPoint } VTreatmentBloodPrime { id: vTreatmentBloodPrime } VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -rb76f43fffe933994819e03930c6ad4dd0f0e2fca -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision b76f43fffe933994819e03930c6ad4dd0f0e2fca) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -46,7 +46,7 @@ title : qsTr("Blood Flow") height : _row.cellHeight width : _row.cellWidth - value : Variables.notSetVariable(vTreatmentSetPoint.bloodFlow.toFixed(0)) + value : Variables.notSetVariable(vTreatmentParametersSetPoint.bloodFlow.toFixed(0)) unitText : Variables.unitTextFlowRate buttonsEnabled : editEnabled @@ -59,11 +59,11 @@ title : qsTr("Dialysate Flow") height : _row.cellHeight width : _row.cellWidth - value : vTreatmentSetPoint.dialysateFlow.toFixed(0) // Need to show 0 value + value : vTreatmentParametersSetPoint.dialysateFlow.toFixed(0) // Need to show 0 value unitText : Variables.unitTextFlowRate buttonsEnabled : editEnabled - extraText : vTreatmentSetPoint.dialysateFlow === 0 ? qsTr("OFF") : - ! vDDGenDialysate.isDialGood ? qsTr("Bypass") : + extraText : vTreatmentParametersSetPoint.dialysateFlow === 0 ? qsTr("OFF") : + ! vDDGenDialysate.isDialGood ? qsTr("Bypass") : "" onIncrement : print(" increment dial flow") @@ -75,7 +75,7 @@ title : qsTr("Dialysate Temp.") height : _row.cellHeight width : _row.cellWidth - value : Variables.notSetVariable(vTreatmentSetPoint.dialysateTemp.toFixed(1)) + value : Variables.notSetVariable(vTreatmentParametersSetPoint.dialysateTemp.toFixed(1)) unitText : Variables.unitTextTemperature buttonsEnabled : editEnabled Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -r9693baf4f04836f437c89e8bae423b65b36c7f8e -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 9693baf4f04836f437c89e8bae423b65b36c7f8e) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -25,8 +25,8 @@ spacing : Variables.defaultMargin Text { id: _title - width : 125 - height : 50 + width : Variables.treatmentPressureTitleWidth + height : Variables.contentHeight color : Colors.pressuresText font { pixelSize : _root.titleSize @@ -36,8 +36,8 @@ } Text { id: _value - width : 140 - height : 50 + width : Variables.treatmentPressureValueWidth + height : Variables.contentHeight text : pressure > 0 ? "+" + pressure : pressure color : Colors.pressuresText Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -r9693baf4f04836f437c89e8bae423b65b36c7f8e -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 9693baf4f04836f437c89e8bae423b65b36c7f8e) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -48,6 +48,9 @@ contentArea.anchors.topMargin : Variables.defaultMargin + function checkMinimum (minimum, lowerBound) { return lowerBound < minimum ? lowerBound : minimum } + function checkMaximum (maximum, upperBound) { return upperBound > maximum ? upperBound : maximum } + contentItem: Column { id: _column property int cellHeight : Variables.contentHeight / 3 property int cellWidth : contentItem.width * 0.75 @@ -66,7 +69,7 @@ minimum : checkMinimum(_root.arterialMinimum, lowerBound) lowerBound : _root.arterialLowerBound upperBound : _root.arterialUpperBound - maximum : checkMaxmimum(_root.arterialMaximum, upperBound) + maximum : checkMaximum(_root.arterialMaximum, upperBound) pressure : _root.arterialPressure } @@ -79,7 +82,7 @@ minimum : checkMinimum(_root.venousMinimum, lowerBound) lowerBound : _root.venousLowerBound upperBound : _root.venousUpperBound - maximum : checkMaxmimum(_root.venousMaximum, upperBound) + maximum : checkMaximum(_root.venousMaximum, upperBound) pressure : _root.venousPressure } @@ -92,7 +95,7 @@ minimum : checkMinimum(_root.tmpMinimum, lowerBound) lowerBound : _root.tmpLowerBound upperBound : _root.tmpUpperBound - maximum : checkMaxmimum(_root.tmpMaximum, upperBound) + maximum : checkMaximum(_root.tmpMaximum, upperBound) pressure : _root.tmpPressure } } @@ -111,7 +114,4 @@ onClicked : print ("Expanding Arrows clicked") } - - function checkMinimum (minimum, lowerBound) { return lowerBound < minimum ? lowerBound : minimum } - function checkMaxmimum (maximum, upperBound) { return upperBound > maximum ? upperBound : maximum } } Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -35,6 +35,12 @@ property bool isRunning : vTDTreatmentStates.txDialysis && !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning ) + property bool isComplete : vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0 + + property string notificationText: ! isRunning ? qsTr("Treatment Paused") : + isComplete ? qsTr("Treatment Complete"): + "" + color : "transparent" width : _circle.width height : _circle.height @@ -114,14 +120,15 @@ topMargin : Variables.defaultMargin * 2 } - visible : ! _root.isRunning + visible : ! _root.isRunning || _root.isComplete height : 25 color : "transparent" imageDiameter : 25 imageTopMargin : 4 imageSource : "qrc:/images/iPauseOrange" - text : qsTr("Treatment Paused") - textColor : "#FFB836" + imageVisible : ! _root.isComplete + text : _root.notificationText + textColor : _root.isComplete ? Colors.mainTreatmentGreen : Colors.mainTreatmentOrange textfontSize : 26 textfontWeight : Font.Medium } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rc2052b4fce3124e6d5132ccc78b3848b5f3e0dff -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c2052b4fce3124e6d5132ccc78b3848b5f3e0dff) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -120,7 +120,7 @@ bottomMargin : Variables.defaultMargin right : parent.right } - text : _root.value.toFixed(Variables.ultrafiltrationPrecision) + Variables.unitVolume + text : _root.value.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume color : Colors.white font.pixelSize : 40 font.weight : Font.DemiBold Index: sources/model/MModel.h =================================================================== diff -u -r53491f18249d31cec365d69e37355ceb61131e56 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/model/MModel.h (.../MModel.h) (revision 53491f18249d31cec365d69e37355ceb61131e56) +++ sources/model/MModel.h (.../MModel.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -58,7 +58,7 @@ #include "MTreatmentBloodPrimeData.h" #include "MTreatmentStopData.h" #include "MTreatmentUltrafiltrationData.h" -#include "MTreatmentSetPointData.h" +#include "MTreatmentParametersSetPointData.h" #include "MHDAccelerometerData.h" #include "MHDSyringePumpData.h" #include "MHDBloodLeakData.h" @@ -338,7 +338,7 @@ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( TreatmentStopData ) \ REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ - REGISTER_METATYPE( TreatmentSetPointData ) \ + REGISTER_METATYPE( TreatmentParametersSetPointData ) \ REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ @@ -528,7 +528,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSetPointData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentParametersSetPointData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ @@ -730,7 +730,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSetPointData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersSetPointData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ @@ -1036,7 +1036,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ - ACTION_RECEIVE_SIGNAL( TreatmentSetPointData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentParametersSetPointData ) \ ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ Index: sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp =================================================================== diff -u --- sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp (revision 0) +++ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -0,0 +1,52 @@ +/*! + * + * 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 MTreatmentParametersSetPointData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "MTreatmentParametersSetPointData.h" + +using namespace Model; + +QVariantList MTreatmentParametersSetPoint::parameters() const { + return { + _data.mBloodFlow .value, + _data.mDialysateFlow .value, + _data.mDialysateTemp .value, + }; +} + +bool MTreatmentParametersSetPoint::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mBloodFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTemp )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MTreatmentParametersSetPoint::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MTreatmentParametersSetPoint::Data MTreatmentParametersSetPoint::data() const { + Data data; + data.mBloodFlow = _data.mBloodFlow .value; + data.mDialysateFlow = _data.mDialysateFlow .value; + data.mDialysateTemp = _data.mDialysateTemp .value; + return data; +} Index: sources/model/td/data/treatment/MTreatmentParametersSetPointData.h =================================================================== diff -u --- sources/model/td/data/treatment/MTreatmentParametersSetPointData.h (revision 0) +++ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -0,0 +1,86 @@ +/*! + * + * 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 MTreatmentParametersSetPointData.h + * \author (last) Behrouz NematiPour + * \date (last) 09-Mar-2022 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MTreatmentParametersSetPoint class + * \details The treatment Set Points data model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4F00| 0x100 | 7 | 1 Hz | N | TD | All | Treatment Set Point Data | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mBloodFlow | + * | #2:(U32) | \ref Data::mDialysateFlow | + * | #3:(F32) | \ref Data::mDialysateTemp | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | TD | + * | infoText | Tx Set Points | + * + */ +class MTreatmentParametersSetPoint : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mBloodFlow ; + Types::U32 mDialysateFlow ; + Types::F32 mDialysateTemp ; + } _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("SetPointData") ; } + + struct Data { + quint32 mBloodFlow = 0; ///< Blood Flow set point + quint32 mDialysateFlow = 0; ///< Dilaysate Flow set point + float mDialysateTemp = 0; ///< Dialysate set point + }; + +public: + MTreatmentParametersSetPoint () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MTreatmentParametersSetPoint::Data TreatmentParametersSetPointData; Fisheye: Tag b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 refers to a dead (removed) revision in file `sources/model/td/data/treatment/MTreatmentSetPointData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 refers to a dead (removed) revision in file `sources/model/td/data/treatment/MTreatmentSetPointData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VView.h =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 --- sources/view/VView.h (.../VView.h) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/view/VView.h (.../VView.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -157,7 +157,7 @@ REGISTER_TYPE( VTreatmentUltrafiltration ) \ REGISTER_TYPE( VTreatmentPressureOcclusion ) \ REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VTreatmentSetPoint ) \ + REGISTER_TYPE( VTreatmentParametersSetPoint ) \ REGISTER_TYPE( VTreatmentRanges ) \ REGISTER_TYPE( VTreatmentSaline ) \ REGISTER_TYPE( VTreatmentHeparin ) \ Index: sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp =================================================================== diff -u --- sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp (revision 0) +++ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -0,0 +1,28 @@ +/*! + * + * 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 VTreatmentParametersSetPointData.cpp + * \author (last) Dara Navaei + * \date (last) 18-Jan-2024 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "VTreatmentParametersSetPointData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VTreatmentParametersSetPoint, TreatmentParametersSetPointData) + +void VTreatmentParametersSetPoint::onActionReceive(const TreatmentParametersSetPointData &vData) +{ + bloodFlow ( vData.mBloodFlow ); + dialysateFlow ( vData.mDialysateFlow ); + dialysateTemp ( vData.mDialysateTemp ); + +} Index: sources/view/td/data/treatment/VTreatmentParametersSetPointData.h =================================================================== diff -u --- sources/view/td/data/treatment/VTreatmentParametersSetPointData.h (revision 0) +++ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) @@ -0,0 +1,45 @@ +/*! + * + * 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 VTreatmentParametersSetPointData.h + * \author (last) Dara Navaei + * \date (last) 18-Jan-2024 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VView.h" +#include "MTreatmentParametersSetPointData.h" + +// namespace +namespace View { + +/*! + * \brief The VTreatmentParametersSetPoint Data class + * \details View for Model's data representation. + * + * \sa Model::MTreatmentParametersSetPointData + * + */ +class VTreatmentParametersSetPoint : public QObject +{ + Q_OBJECT + + PROPERTY( quint32 , bloodFlow , 0) + PROPERTY( quint32 , dialysateFlow , 0) + PROPERTY( float , dialysateTemp , 0) + + VIEW_DEC(VTreatmentParametersSetPoint, TreatmentParametersSetPointData) +}; +} Fisheye: Tag b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 refers to a dead (removed) revision in file `sources/view/td/data/treatment/VTreatmentSetPointData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 refers to a dead (removed) revision in file `sources/view/td/data/treatment/VTreatmentSetPointData.h'. Fisheye: No comparison available. Pass `N' to diff?