Index: leahi.pro
===================================================================
diff -u -rd99a49946535643e51b43100a4bd0284ce5d32af -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- leahi.pro (.../leahi.pro) (revision d99a49946535643e51b43100a4bd0284ce5d32af)
+++ leahi.pro (.../leahi.pro) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -214,7 +214,7 @@
sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h \
- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \
sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
@@ -272,7 +272,7 @@
sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeGoalEdit.h \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
@@ -589,7 +589,7 @@
sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp \
- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.cpp \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \
@@ -745,7 +745,7 @@
sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeGoalEdit.cpp \
+ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
Index: leahi.qrc
===================================================================
diff -u -r6e41d2d9f431580bb350db71cc52dd40e60e1a28 -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- leahi.qrc (.../leahi.qrc) (revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
+++ leahi.qrc (.../leahi.qrc) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -290,7 +290,7 @@
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml
- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r9152815554b452bdb31925ee1650d8da3ed5407b -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9152815554b452bdb31925ee1650d8da3ed5407b)
+++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -377,12 +377,12 @@
* \param vData - Data model contains treatment ultrafiltration adjustment volume
* \return void
*/
-void MessageDispatcher::onAdjustment(const AdjustIsolatedUFVolumeGoalEditRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustIsolatedUFVolumeEditRequestData &vData)
{
QVariantList mData;
mData += vData.duration;
- mData += vData.volumeGoal;
- onActionTransmit(GuiActionType::ID_AdjustIsolatedUFVolumeGoalEditReq, mData);
+ mData += vData.volume;
+ onActionTransmit(GuiActionType::ID_AdjustIsolatedUFVolumeEditReq, mData);
}
/*!
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -196,8 +196,8 @@
{Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp , 3 * 4 }, // 3 parameters each 4bytes
// ----
- {Gui::GuiActionType::ID_AdjustIsolatedUFVolumeGoalEditReq , 2 * 4 }, // 2 parameter each 4bytes
- {Gui::GuiActionType::ID_AdjustIsolatedUFVolumeGoalEditRsp , 5 * 4 }, // 5 parameters each 4bytes
+ {Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq , 2 * 4 }, // 2 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp , 5 * 4 }, // 5 parameters each 4bytes
// ----
{Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq , 0 * 4 }, // 0 parameters each 4bytes
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -266,7 +266,7 @@
case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData ); break;
case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData ); break;
- case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeGoalEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeGoalEditRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData ); break;
// End-Treatment
case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break;
@@ -559,7 +559,7 @@
case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break;
case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp ); break;
- case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeGoalEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeGoalEditRsp ); break;
+ case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp ); break;
case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp ); break;
// ----- Post-Treatment Adjust
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -150,7 +150,7 @@
#include "VTreatmentAdjustmentDurationEdit.h"
#include "VTreatmentAdjustmentIsolatedUFConfirm.h"
#include "VTreatmentAdjustmentIsolatedUFDurationEdit.h"
-#include "VTreatmentAdjustmentIsolatedUFVolumeGoalEdit.h"
+#include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h"
#include "VTreatmentAdjustmentSetPoints.h"
// ----- Post-Treatment Adjustments
#include "VPostTreatmentAdjustPatientDisconnectionConfirm.h"
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r6e41d2d9f431580bb350db71cc52dd40e60e1a28 -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -286,8 +286,8 @@
ID_AdjustIsolatedUFDurationEditReq = 0x9B00, // 155 //// ----- @LEAHIZED
ID_AdjustIsolatedUFDurationEditRsp = 0x9C00, // 156 //// ----- @LEAHIZED
- ID_AdjustIsolatedUFVolumeGoalEditReq = 0x9D00, // 157 //// ----- @LEAHIZED
- ID_AdjustIsolatedUFVolumeGoalEditRsp = 0x9E00, // 158 //// ----- @LEAHIZED
+ ID_AdjustIsolatedUFVolumeEditReq = 0x9D00, // 157 //// ----- @LEAHIZED
+ ID_AdjustIsolatedUFVolumeEditRsp = 0x9E00, // 158 //// ----- @LEAHIZED
ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED
ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/gui/qml/main.qml (.../main.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -132,7 +132,7 @@
import VTreatmentAdjustmentDialysateTemperature 0.1
import VTreatmentAdjustmentFlows 0.1
import VTreatmentAdjustmentIsolatedUFDurationEdit 0.1
-import VTreatmentAdjustmentIsolatedUFVolumeGoalEdit 0.1
+import VTreatmentAdjustmentIsolatedUFVolumeEdit 0.1
import VTreatmentAdjustmentIsolatedUFConfirm 0.1
import VTreatmentAdjustmentUltrafiltrationState 0.1
import VTreatmentAdjustmentUltrafiltrationEdit 0.1
@@ -300,7 +300,7 @@
VTreatmentRanges { id: vTreatmentRanges }
VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume }
VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit }
- VTreatmentAdjustmentIsolatedUFVolumeGoalEdit { id: vTreatmentAdjustmentIsolatedUFVolumeGoalEdit }
+ VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit }
VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm }
VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline }
VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals }
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml (.../TreatmentAdjustmentIsolatedUFConfirm.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml (.../TreatmentAdjustmentIsolatedUFConfirm.qml) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -30,16 +30,16 @@
Item { id: _root
objectName: "_treatmentAdjustmentIsolatedUFConfirm" // SquishQt testability
- property real volumeGoal : 0.0
- property int duration : 0
- property real rate : 0.0
+ property real volume : 0.0
+ property int duration : 0
+ property real rate : 0.0
signal confirmVolumeClicked()
QtObject { id: _private
objectName: "_private"
- readonly property real volumeGoal : calculatePrecisionValue(_root.volumeGoal)
- readonly property real rate : calculatePrecisionValue(_root.rate)
+ readonly property real volume : calculatePrecisionValue(_root.volume)
+ readonly property real rate : calculatePrecisionValue(_root.rate)
readonly property int multiplier : Math.pow(10, Variables.ultrafiltrationPrecision)
function calculatePrecisionValue(value) {
@@ -72,7 +72,7 @@
label: qsTr("Isolated UF Volume Goal")
unit: Variables.unitVolume
valueColor: Colors.ufVolumeGoalText
- value: _private.volumeGoal.toFixed(Variables.ultrafiltrationPrecision)
+ value: _private.volume.toFixed(Variables.ultrafiltrationPrecision)
}
LabelUnitText { id: _duration
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml
===================================================================
diff -u -rb4504926f6926620dde0a9047ceb2bf66dde652d -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml (.../TreatmentAdjustmentIsolatedUFDurationEdit.qml) (revision b4504926f6926620dde0a9047ceb2bf66dde652d)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml (.../TreatmentAdjustmentIsolatedUFDurationEdit.qml) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -42,8 +42,8 @@
objectName: "_private"
readonly property int precision : Variables.ultrafiltrationPrecision
readonly property real volumeRemoved : calculatePrecisionValue(vTreatmentIsolatedUF.volumeDelivered)
- readonly property real volumeGoal : calculatePrecisionValue(vTreatmentIsolatedUF.volumeGoal)
- readonly property real volumeMax : Math.floor(_root.volumeGoalMax / volumeRes) * volumeRes
+ readonly property real volume : calculatePrecisionValue(vTreatmentIsolatedUF.setVolume)
+ readonly property real volumeMax : Math.floor(_root.volumeMax / volumeRes) * volumeRes
readonly property real volumeRes : calculatePrecisionValue(vTreatmentRanges.ultrafiltrationVolumeRes)
readonly property int multiplier : Math.pow(10, precision)
@@ -64,7 +64,7 @@
leftValue : _private.volumeRemoved.toFixed(_private.precision)
rightLabel : qsTr("Isolated UF Volume Goal")
rightUnit : Variables.unitVolume
- rightValue : _private.volumeGoal.toFixed(_private.precision)
+ rightValue : _private.volume.toFixed(_private.precision)
}
Item { id: _contentArea
@@ -93,7 +93,7 @@
}
decimal : Variables.ultrafiltrationPrecision
minimum : 0
- maximum : _private.volumeGoal
+ maximum : _private.volume
value : _private.volumeRemoved
valueEx : _private.volumeRemoved
}
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml (revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -0,0 +1,183 @@
+/*!
+ *
+ * Copyright (c) 2020-2025 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 TreatmentAdjustmentIsolatedUFEdit.qml
+ * \author (last) Stephen Quong
+ * \date (last) 08-Oct-2025
+ * \author (original) Behrouz NematiPour
+ * \date (original) 15-May-2020
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+
+/*!
+ * \brief TreatmentAdjustmentIsolatedUFVolumeEdit.qml is the screen
+ * To adjust the treatment isolate UF volume goal
+ */
+Item { id: _root
+ objectName: "_treatmentAdjustmentIsolatedUFVolumeEdit" // SquishQt testability
+
+ property alias duration : _durationAdjuster.value
+ property real volumeMax : 0
+
+ signal continueClicked(int vDuration, real vVolume)
+
+ function reset() {
+ _volumeAdjuster.value = _volumeAdjuster.minimum
+ _volumeAdjuster.isActive = false
+ }
+
+ QtObject { id: _private
+ objectName: "_private"
+ readonly property int precision : Variables.ultrafiltrationPrecision
+ readonly property real volumeRemoved : calculatePrecisionValue(vTreatmentIsolatedUF.volumeDelivered)
+ readonly property real volumeMax : Math.floor(_root.volumeMax / volumeRes) * volumeRes
+ readonly property real volumeRes : calculatePrecisionValue(vTreatmentRanges.ultrafiltrationVolumeRes)
+
+ readonly property int multiplier : Math.pow(10, precision)
+ function calculatePrecisionValue(value) {
+ return Math.round(value * multiplier) / multiplier
+ }
+ }
+
+ TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics
+ objectName : "_ufMetrics"
+ anchors {
+ top : parent.top
+ topMargin : Variables.defaultMargin
+ horizontalCenter: parent.horizontalCenter
+ }
+ leftLabel : qsTr("Isolated UF Volume Removed")
+ leftUnit : Variables.unitVolume
+ leftValue : _private.volumeRemoved.toFixed(_private.precision)
+ rightLabel : qsTr("Isolated UF Volume Goal")
+ rightUnit : Variables.unitVolume
+ rightValue : _volumeAdjuster.isActive ? _volumeAdjuster.value.toFixed(_private.precision) : Variables.emptyEntry
+ }
+
+ Item { id: _contentArea
+ objectName: "_contentArea"
+ anchors {
+ top : _ufMetrics.bottom
+ bottom : _continueButton.top
+ left : parent.left
+ right : parent.right
+ }
+
+ Column { id: _contentColumn
+ objectName : "_contentColumn"
+ anchors {
+ centerIn : parent
+ verticalCenterOffset : -(Variables.defaultMargin)
+ }
+ width : Variables.ultrafiltrationProgressBarWidth
+ spacing : 80
+
+ ProgressBarEx { id: _volumeProgress
+ objectName : "_volumeProgress"
+ anchors {
+ left : parent.left
+ right : parent.right
+ }
+ decimal : _private.precision
+ minimum : 0
+ maximum : _private.volumeMax
+ value : _private.volumeRemoved
+ valueEx : _volumeAdjuster.value
+ }
+
+ LabelUnitValueAdjuster { id: _durationAdjuster
+ objectName : "_durationAdjuster"
+ anchors {
+ horizontalCenter: parent.horizontalCenter
+ }
+ text : qsTr("Isolated UF Duration")
+ isActive : true
+ editable : false
+ unitText : Variables.unitTextDuration
+ minimum : vTreatmentRanges.isolatedUFDurationMin
+ maximum : vTreatmentRanges.isolatedUFDurationMax
+ step : vTreatmentRanges.isolatedUFDurationRes
+
+ onDidChange : function(vValue) {
+ value = vValue
+ }
+ onMinimumChanged : {
+ if (value < minimum) {
+ value = minimum
+ }
+ }
+ onMaximumChanged : {
+ if (value > maximum) {
+ value = maximum
+ }
+ }
+ }
+ }
+
+ LabelUnitValueAdjuster { id: _volumeAdjuster
+ objectName : "_volumeAdjuster"
+ anchors {
+ top : _contentColumn.bottom
+ topMargin : Variables.defaultMargin
+ horizontalCenter: parent.horizontalCenter
+ }
+ text : qsTr("Isolated UF Volume Goal")
+ isActive : false
+ unitText : Variables.unitVolume
+ decimal : _private.precision
+ step : _private.volumeRes
+ minimum : Math.ceil(_private.volumeRemoved / step) * step
+ maximum : Math.floor(_private.volumeMax / step) * step
+
+ onDidChange : function(vValue) {
+ isActive = true
+ value = vValue
+ }
+ onMinimumChanged : {
+ if (value < minimum) {
+ value = minimum
+ }
+ }
+ onMaximumChanged : {
+ if (value > maximum) {
+ value = maximum
+ }
+ }
+ }
+ }
+
+ TouchRect { id: _continueButton
+ objectName : "_continueButton"
+ anchors {
+ bottom : parent.bottom
+ bottomMargin : Variables.defaultMargin
+ horizontalCenter: parent.horizontalCenter
+ }
+ width : Variables.ultrafiltrationButtonWidth
+ height : Variables.ultrafiltrationButtonHeight
+ text {
+ text : qsTr("Continue")
+ font.weight : Font.Medium
+ }
+ isDefault : true
+ enabled : _volumeAdjuster.isActive
+
+ onClicked : {
+ continueClicked(_durationAdjuster.value, _volumeAdjuster.value)
+ }
+ }
+}
Fisheye: Tag 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -139,18 +139,18 @@
}
}
- TreatmentAdjustmentIsolatedUFVolumeGoalEdit { id: _treatmentAdjustmentIsolatedUFVolumeGoalEdit
- objectName : "_treatmentAdjustmentIsolatedUFVolumeGoalEdit"
+ TreatmentAdjustmentIsolatedUFVolumeEdit { id: _treatmentAdjustmentIsolatedUFVolumeEdit
+ objectName : "_treatmentAdjustmentIsolatedUFVolumeEdit"
visible : false
StackView.onActivating : {
_root.titleText = qsTr("Isolated Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
_root.notificationText = ""
}
- onContinueClicked : function(vDuration, vVolumeGoal) {
+ onContinueClicked : function(vDuration, vVolume) {
// send Volume to TD and wait.
// if accepted moves to confirm screen, otherwise show error in notification
- vTreatmentAdjustmentIsolatedUFVolumeGoalEdit.doAdjustment(vDuration, vVolumeGoal)
+ vTreatmentAdjustmentIsolatedUFVolumeEdit.doAdjustment(vDuration, vVolume)
}
}
@@ -211,31 +211,31 @@
if (vTreatmentAdjustmentIsolatedUFDurationEdit.adjustment_Accepted) {
notification.text = ""
- _treatmentAdjustmentIsolatedUFVolumeGoalEdit.duration = _treatmentAdjustmentIsolatedUFDurationEdit.duration
- _treatmentAdjustmentIsolatedUFVolumeGoalEdit.volumeGoalMax = vTreatmentAdjustmentIsolatedUFDurationEdit.volumeGoalMax
+ _treatmentAdjustmentIsolatedUFVolumeEdit.duration = _treatmentAdjustmentIsolatedUFDurationEdit.duration
+ _treatmentAdjustmentIsolatedUFVolumeEdit.volumeMax = vTreatmentAdjustmentIsolatedUFDurationEdit.volumeMax
- _treatmentAdjustmentIsolatedUFVolumeGoalEdit.reset()
- _ufStack.page(_treatmentAdjustmentIsolatedUFVolumeGoalEdit)
+ _treatmentAdjustmentIsolatedUFVolumeEdit.reset()
+ _ufStack.page(_treatmentAdjustmentIsolatedUFVolumeEdit)
}
else {
notification.text = vTreatmentAdjustmentIsolatedUFDurationEdit.text()
}
}
}
- Connections { target: vTreatmentAdjustmentIsolatedUFVolumeGoalEdit
+ Connections { target: vTreatmentAdjustmentIsolatedUFVolumeEdit
function onAdjustmentTriggered ( vValue ) {
- if (vTreatmentAdjustmentIsolatedUFVolumeGoalEdit.adjustment_Accepted) {
+ if (vTreatmentAdjustmentIsolatedUFVolumeEdit.adjustment_Accepted) {
notification.text = ""
- _treatmentAdjustmentIsolatedUFConfirm.volumeGoal = vTreatmentAdjustmentIsolatedUFVolumeGoalEdit.volumeGoal
- _treatmentAdjustmentIsolatedUFConfirm.duration = vTreatmentAdjustmentIsolatedUFVolumeGoalEdit.duration
- _treatmentAdjustmentIsolatedUFConfirm.rate = vTreatmentAdjustmentIsolatedUFVolumeGoalEdit.rate
+ _treatmentAdjustmentIsolatedUFConfirm.volume = vTreatmentAdjustmentIsolatedUFVolumeEdit.volume
+ _treatmentAdjustmentIsolatedUFConfirm.duration = vTreatmentAdjustmentIsolatedUFVolumeEdit.duration
+ _treatmentAdjustmentIsolatedUFConfirm.rate = vTreatmentAdjustmentIsolatedUFVolumeEdit.rate
_ufStack.page(_treatmentAdjustmentIsolatedUFConfirm)
}
else {
- notification.text = vTreatmentAdjustmentIsolatedUFVolumeGoalEdit.text()
+ notification.text = vTreatmentAdjustmentIsolatedUFVolumeEdit.text()
}
}
}
Index: sources/model/MModel.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/MModel.h (.../MModel.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/MModel.h (.../MModel.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -160,7 +160,7 @@
#include "MTreatmentAdjustUltrafiltrationEditResponse.h"
#include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
#include "MTreatmentAdjustIsolatedUFDurationEditResponse.h"
-#include "MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h"
+#include "MTreatmentAdjustIsolatedUFVolumeEditResponse.h"
#include "MTreatmentAdjustIsolatedUFConfirmResponse.h"
#include "MTreatmentAdjustSalineResponse.h"
#include "MTreatmentAdjustVitalsResponse.h"
@@ -471,7 +471,7 @@
REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \
REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \
REGISTER_METATYPE( AdjustIsolatedUFDurationEditRequestData ) \
- REGISTER_METATYPE( AdjustIsolatedUFVolumeGoalEditRequestData ) \
+ REGISTER_METATYPE( AdjustIsolatedUFVolumeEditRequestData ) \
REGISTER_METATYPE( AdjustIsolatedUFConfirmRequestData ) \
REGISTER_METATYPE( AdjustSalineRequestData ) \
REGISTER_METATYPE( AdjustVitalsRequestData ) \
@@ -520,7 +520,7 @@
REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \
REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \
REGISTER_METATYPE( AdjustIsolatedUFDurationEditResponseData ) \
- REGISTER_METATYPE( AdjustIsolatedUFVolumeGoalEditResponseData ) \
+ REGISTER_METATYPE( AdjustIsolatedUFVolumeEditResponseData ) \
REGISTER_METATYPE( AdjustIsolatedUFConfirmResponseData ) \
REGISTER_METATYPE( AdjustSalineResponseData ) \
REGISTER_METATYPE( AdjustVitalsResponseData ) \
@@ -692,7 +692,7 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditResponseData ) \
- ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeGoalEditResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeEditResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \
@@ -742,7 +742,7 @@
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditRequestData ) \
- ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeGoalEditRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \
@@ -935,7 +935,7 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditResponseData ) \
- ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFVolumeGoalEditResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFVolumeEditResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \
@@ -1009,7 +1009,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditRequestData ) \
- ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFVolumeGoalEditRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFVolumeEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVitalsRequestData ) \
@@ -1082,7 +1082,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFDurationEditRequestData ) \
- ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFVolumeGoalEditRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFVolumeEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVitalsRequestData ) \
@@ -1155,7 +1155,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFDurationEditRequestData ) \
- ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeGoalEditRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \
@@ -1309,7 +1309,7 @@
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFDurationEditResponseData ) \
- ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFVolumeGoalEditResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFVolumeEditResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFConfirmResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -355,7 +355,7 @@
*
* | MSG | CAN ID | Type | Ack | Src | Dst | Description |
* |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
- * |0x8400| 0x100 | Req | Y | UI | HD | Isolated UF Duration Change Request |
+ * |0x8400| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request |
*
* | Payload ||
* | ||
@@ -374,28 +374,28 @@
};
/*!
- * \brief The MAdjustIsolatedUFVolumeGoalEditReq class
+ * \brief The MAdjustIsolatedUFVolumeEditReq class
* \details The ultrafiltration volume change request model
*
- * | MSG | CAN ID | Type | Ack | Src | Dst | Description |
- * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
- * |0x8600| 0x100 | Req | Y | UI | HD | Isolated UF VolumeGoal Change Request |
+ * | MSG | CAN ID | Type | Ack | Src | Dst | Description |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0x8600| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request |
*
* | Payload ||
* | ||
* | #1:(U32) | \ref duration |
- * | #1:(U32) | \ref volumeGoal |
+ * | #1:(U32) | \ref volume |
*
*/
-class MAdjustIsolatedUFVolumeGoalEditReq : public MModel {
+class MAdjustIsolatedUFVolumeEditReq : public MModel {
public:
quint32 duration = 0;
- quint32 volumeGoal = 0;
+ quint32 volume = 0;
QString toString() {
- return toString({duration, volumeGoal});
+ return toString({duration, volume});
}
static QString toString(const QVariantList &vParameters) {
- return MModel::toString("AdjustIsolatedUFVolumeGoalEdit", vParameters);
+ return MModel::toString("AdjustIsolatedUFVolumeEdit", vParameters);
}
};
@@ -405,7 +405,7 @@
*
* | MSG | CAN ID | Type | Ack | Src | Dst | Description |
* |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
- * |0x8800| 0x041 | Req | Y | UI | HD | Isolated UF Change User Confirm |
+ * |0x8800| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm |
*
* | Payload ||
* | ||
@@ -697,29 +697,29 @@
}
-typedef Model:: MDuetConfirmUIr DuetConfirmUIrData;
-typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData;
-typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData;
-typedef Model:: MAdjustDurationEditReq AdjustDurationEditRequestData;
-typedef Model:: MAdjustDurationConfirmReq AdjustDurationConfirmRequestData;
-typedef Model:: MAdjustSetPointsReq AdjustSetPointsRequestData;
-typedef Model:: MAdjustBloodFlowRateReq AdjustBloodFlowRateRequestData;
-typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData;
-typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData;
-typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData;
-typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData;
-typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData;
-typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData;
-typedef Model::MAdjustIsolatedUFVolumeGoalEditReq AdjustIsolatedUFVolumeGoalEditRequestData;
-typedef Model:: MAdjustIsolatedUFConfirmReq AdjustIsolatedUFConfirmRequestData;
-typedef Model:: MAdjustSalineReq AdjustSalineRequestData;
-typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData;
-typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData;
-typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData;
-typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData;
-typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData;
-typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData;
-typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData;
+typedef Model:: MDuetConfirmUIr DuetConfirmUIrData;
+typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData;
+typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData;
+typedef Model:: MAdjustDurationEditReq AdjustDurationEditRequestData;
+typedef Model:: MAdjustDurationConfirmReq AdjustDurationConfirmRequestData;
+typedef Model:: MAdjustSetPointsReq AdjustSetPointsRequestData;
+typedef Model:: MAdjustBloodFlowRateReq AdjustBloodFlowRateRequestData;
+typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData;
+typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData;
+typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData;
+typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData;
+typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData;
+typedef Model::MAdjustIsolatedUFDurationEditReq AdjustIsolatedUFDurationEditRequestData;
+typedef Model:: MAdjustIsolatedUFVolumeEditReq AdjustIsolatedUFVolumeEditRequestData;
+typedef Model:: MAdjustIsolatedUFConfirmReq AdjustIsolatedUFConfirmRequestData;
+typedef Model:: MAdjustSalineReq AdjustSalineRequestData;
+typedef Model:: MAdjustVitalsReq AdjustVitalsRequestData;
+typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData;
+typedef Model:: MAdjustRinsebackReq AdjustRinsebackRequestData;
+typedef Model:: MAdjustRecirculateReq AdjustRecirculateRequestData;
+typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData;
+typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData;
+typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData;
// Alarms
-typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData;
-typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;
+typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData;
+typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData;
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp (.../MTreatmentAdjustIsolatedUFDurationEditResponse.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp (.../MTreatmentAdjustIsolatedUFDurationEditResponse.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -18,23 +18,23 @@
QString MAdjustIsolatedUFDurationEditResponse::toString() const {
return QString(stringPrefix + ",%1,%2,%3,%4")
- .arg(_data.mAccepted .value)
- .arg(_data.mReason .value)
- .arg(_data.mVolumeGoalMax .value)
+ .arg(_data.mAccepted .value)
+ .arg(_data.mReason .value)
+ .arg(_data.mVolumeMax .value)
;
}
void MAdjustIsolatedUFDurationEditResponse::toVariantList(QVariantList &vData) const {
- vData += _data.mAccepted .value;
- vData += _data.mReason .value;
- vData += _data.mVolumeGoalMax .value;
+ vData += _data.mAccepted .value;
+ vData += _data.mReason .value;
+ vData += _data.mVolumeMax .value;
}
bool MAdjustIsolatedUFDurationEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
int index = 0; // message data start position
- if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mVolumeGoalMax )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mVolumeMax )) goto lError;
return true ;
@@ -51,8 +51,8 @@
*/
AdjustIsolatedUFDurationEditResponseData MAdjustIsolatedUFDurationEditResponse::data() const {
Data data;
- data.mAccepted = _data.mAccepted .value;
- data.mReason = _data.mReason .value;
- data.mVolumeGoalMax = _data.mVolumeGoalMax .value;
+ data.mAccepted = _data.mAccepted .value;
+ data.mReason = _data.mReason .value;
+ data.mVolumeMax = _data.mVolumeMax .value;
return data;
}
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h
===================================================================
diff -u -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046 -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h (.../MTreatmentAdjustIsolatedUFDurationEditResponse.h) (revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h (.../MTreatmentAdjustIsolatedUFDurationEditResponse.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -35,9 +35,9 @@
*
* | Payload ||
* | ||
- * | #1:(U32) | \ref Data::mAccepted |
- * | #2:(U32) | \ref Data::mReason |
- * | #3:(U32) | \ref Data::mVolumeGoalMax |
+ * | #1:(U32) | \ref Data::mAccepted |
+ * | #2:(U32) | \ref Data::mReason |
+ * | #3:(U32) | \ref Data::mVolumeMax |
*
* \sa Data
*
@@ -61,16 +61,16 @@
// The struct here is just the values not in correct order
// since has been inherited from the confirm to borrow some struct variables.
struct Data {
- bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */
- quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */
- quint32 mVolumeGoalMax = 0; /*!< volume goal max value of type quint32 extracted out */
+ bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */
+ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */
+ quint32 mVolumeMax = 0; /*!< volume goal max value of type quint32 extracted out */
};
private:
struct _Data {
- Types::U32 mAccepted ;
- Types::U32 mReason ;
- Types::U32 mVolumeGoalMax ;
+ Types::U32 mAccepted ;
+ Types::U32 mReason ;
+ Types::U32 mVolumeMax ;
} _data;
public:
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp
===================================================================
diff -u
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp (revision 0)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -0,0 +1,66 @@
+/*!
+ *
+ * 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 MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp
+ * \author (last) Behrouz NematiPour
+ * \date (last) 11-Apr-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#include "MTreatmentAdjustIsolatedUFVolumeEditResponse.h"
+
+using namespace Model;
+
+QString MAdjustIsolatedUFVolumeEditResponse::toString() const {
+ return QString(stringPrefix + ",%1,%2,%3,%4,%5")
+ .arg(_data.mAccepted .value)
+ .arg(_data.mReason .value)
+ .arg(_data.mVolume .value)
+ .arg(_data.mDuration .value)
+ .arg(_data.mRate .value)
+ ;
+}
+
+void MAdjustIsolatedUFVolumeEditResponse::toVariantList(QVariantList &vData) const {
+ vData += _data.mAccepted .value;
+ vData += _data.mReason .value;
+ vData += _data.mVolume .value;
+ vData += _data.mDuration .value;
+ vData += _data.mRate .value;
+}
+
+bool MAdjustIsolatedUFVolumeEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+ int index = 0; // message data start position
+ if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mVolume )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mRate )) goto lError;
+
+ return true ;
+
+lError:
+ if(vIndex) { *vIndex = index; }
+
+ return false ;
+}
+
+/*!
+ * \brief MAdjustIsolatedUFVolumeEditResponse::data
+ * \details Provides model's Data from the received messages data values
+ * \return Data
+ */
+AdjustIsolatedUFVolumeEditResponseData MAdjustIsolatedUFVolumeEditResponse::data() const {
+ Data data;
+ data.mAccepted = _data.mAccepted .value;
+ data.mReason = _data.mReason .value;
+ data.mVolume = _data.mVolume .value;
+ data.mDuration = _data.mDuration .value;
+ data.mRate = _data.mRate .value;
+ return data;
+}
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h
===================================================================
diff -u
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h (revision 0)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -0,0 +1,93 @@
+/*!
+ *
+ * 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 MTreatmentAdjustIsolatedUFVolumeEditResponse.h
+ * \author (last) Behrouz NematiPour
+ * \date (last) 22-Mar-2023
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include
+
+// Project
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief The MAdjustIsolatedUFVolumeEditResponse class
+ * \details The UF vol. change response model
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dst | Description |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0x9E00| 0x040 | Rsp | Y | TD | UI | Isolated UF Volume Edit Response |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(U32) | \ref Data::mAccepted |
+ * | #2:(U32) | \ref Data::mReason |
+ * | #3:(U32) | \ref Data::mVolume |
+ * | #4:(U32) | \ref Data::mDuration |
+ * | #5:(U32) | \ref Data::mRate |
+ *
+ * \sa Data
+ *
+ *
+ * | ||
+ * | ||
+ * | typeText | Event |
+ * | unitText | TD |
+ * | infoText | AdjustIsolatedUFVolumeEdit |
+ *
+ */
+class MAdjustIsolatedUFVolumeEditResponse
+{
+
+ // friends
+ friend class ::tst_models;
+
+public:
+ QString stringPrefix = "AdjustUFVolumeEdit";
+ //NOTE: The correct order is followed in cpp to fill in the values regarding the payload byte orders.
+ // The struct here is just the values not in correct order
+ // since has been inherited from the confirm to borrow some struct variables.
+ struct Data {
+ bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */
+ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */
+ quint32 mVolume = 0; /*!< volume value of type quint32 extracted out */
+ quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */
+ quint32 mRate = 0; /*!< rate value of type quint32 extracted out */
+ };
+
+private:
+ struct _Data {
+ Types::U32 mAccepted ;
+ Types::U32 mReason ;
+ Types::U32 mVolume ;
+ Types::U32 mDuration ;
+ Types::U32 mRate ;
+ } _data;
+
+public:
+ MAdjustIsolatedUFVolumeEditResponse () { }
+
+ QString toString ( ) const ;
+ void toVariantList ( QVariantList &vData ) const ;
+ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr);
+
+ Data data() const;
+};
+}
+
+typedef Model::MAdjustIsolatedUFVolumeEditResponse::Data AdjustIsolatedUFVolumeEditResponseData;
Fisheye: Tag 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca refers to a dead (removed) revision in file `sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca refers to a dead (removed) revision in file `sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp (.../MTreatmentIsolatedUFData.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp (.../MTreatmentIsolatedUFData.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -19,7 +19,7 @@
QVariantList MTreatmentIsolatedUF::parameters() const {
return {
_data.mDuration .value,
- _data.mVolumeGoal .value,
+ _data.mSetVolume .value,
_data.mVolumeDelivered .value,
_data.mRate .value,
};
@@ -28,7 +28,7 @@
bool MTreatmentIsolatedUF::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
int index = 0; // message data start position
if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mVolumeGoal )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mSetVolume )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mVolumeDelivered )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mRate )) goto lError;
@@ -48,7 +48,7 @@
MTreatmentIsolatedUF::Data MTreatmentIsolatedUF::data() const {
return {
_data.mDuration .value,
- _data.mVolumeGoal .value,
+ _data.mSetVolume .value,
_data.mVolumeDelivered .value,
_data.mRate .value
};
Index: sources/model/td/data/treatment/MTreatmentIsolatedUFData.h
===================================================================
diff -u -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046 -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/model/td/data/treatment/MTreatmentIsolatedUFData.h (.../MTreatmentIsolatedUFData.h) (revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
+++ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h (.../MTreatmentIsolatedUFData.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -37,7 +37,7 @@
* | Payload ||
* | ||
* | #1:(U32) | \ref Data::mDuration |
- * | #2:(U32) | \ref Data::mVolumeGoal |
+ * | #2:(U32) | \ref Data::mSetVolume |
* | #3:(U32) | \ref Data::mVolumeDelivered |
* | #4:(U32) | \ref Data::mRate |
*
@@ -60,7 +60,7 @@
struct {
Types::U32 mDuration ;
- Types::U32 mVolumeGoal ;
+ Types::U32 mSetVolume ;
Types::U32 mVolumeDelivered ;
Types::U32 mRate ;
} _data;
@@ -73,7 +73,7 @@
struct Data {
quint32 mDuration = 0; ///< Current duration
- quint32 mVolumeGoal = 0; ///< Current volume goal
+ quint32 mSetVolume = 0; ///< Current volume goal
quint32 mVolumeDelivered = 0; ///< Current volume removed during Isolateds UF
quint32 mRate = 0; ///< IsolatedUF rate
};
Index: sources/storage/Logger.cpp
===================================================================
diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/storage/Logger.cpp (.../Logger.cpp) (revision d862dfcd402206e33b314c458e41c13b684a4565)
+++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -557,7 +557,6 @@
_logFileNameTime = QDateTime::currentDateTime().time().toString(_fileTimeFormat);
}
break;
- case GuiTDOpModes::MODE_TPAR:
case GuiTDOpModes::MODE_PRET:
case GuiTDOpModes::MODE_TREA:
case GuiTDOpModes::MODE_POST:
Index: sources/view/VView.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/view/VView.h (.../VView.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/view/VView.h (.../VView.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -241,7 +241,7 @@
REGISTER_TYPE( VTreatmentAdjustmentDurationEdit ) \
REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFConfirm ) \
REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFDurationEdit ) \
- REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeGoalEdit ) \
+ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit ) \
REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \
REGISTER_TYPE( VTreatmentCreate ) \
REGISTER_TYPE( VTreatmentIsolatedUF ) \
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp (.../VTreatmentAdjustmentIsolatedUFDurationEdit.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp (.../VTreatmentAdjustmentIsolatedUFDurationEdit.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -34,14 +34,14 @@
*/
void VTreatmentAdjustmentIsolatedUFDurationEdit::onActionReceive(const AdjustIsolatedUFDurationEditResponseData &vData)
{
- adjustment_Accepted ( vData.mAccepted );
- adjustment_Reason ( vData.mReason );
+ adjustment_Accepted ( vData.mAccepted );
+ adjustment_Reason ( vData.mReason );
- volumeGoalMax ( vData.mVolumeGoalMax / 1000.f ); // mL => L
+ volumeMax ( vData.mVolumeMax / 1000.f ); // mL => L
// *** has to be the last to let the information to be set and then emit the signal ***
// *** otherwise will use the previous values before being set. ***
- adjustment ( true );
+ adjustment ( true );
}
/*!
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h (.../VTreatmentAdjustmentIsolatedUFDurationEdit.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h (.../VTreatmentAdjustmentIsolatedUFDurationEdit.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -44,7 +44,7 @@
TRIGGER( bool , adjustment , 0)
// Treatment IsolatedUF data
- PROPERTY( float , volumeGoalMax , 0)
+ PROPERTY( float , volumeMax , 0)
VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentIsolatedUFDurationEdit, AdjustIsolatedUFDurationEditResponseData)
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp
===================================================================
diff -u
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp (revision 0)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -0,0 +1,58 @@
+/*!
+ *
+ * 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 VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp
+ * \author (last) Behrouz NematiPour
+ * \date (last) 11-Apr-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentIsolatedUFVolumeEdit)
+
+/*! \brief Connection Initializer
+ \details All the class signal/slot connections are defined here.
+*/
+void VTreatmentAdjustmentIsolatedUFVolumeEdit::initConnections() {
+ ACTION_VIEW_CONNECTION(AdjustIsolatedUFVolumeEditResponseData);
+ ADJUST_VIEW_CONNECTION( AdjustIsolatedUFVolumeEditRequestData);
+}
+
+/*!
+ * \brief VTreatmentAdjustmentIsolatedUFVolumeEdit::onActionReceive
+ * \details received response model data handler
+ * \param vData - model data
+ */
+void VTreatmentAdjustmentIsolatedUFVolumeEdit::onActionReceive(const AdjustIsolatedUFVolumeEditResponseData &vData)
+{
+ adjustment_Accepted ( vData.mAccepted );
+ adjustment_Reason ( vData.mReason );
+
+ volume ( vData.mVolume / 1000.f ); // mL => L
+ duration ( vData.mDuration );
+ rate ( vData.mRate / 1000.f ); // mL/Hr => L/Hr
+
+ // *** has to be the last to let the information to be set and then emit the signal ***
+ // *** otherwise will use the previous values before being set. ***
+ adjustment ( true );
+}
+
+/*!
+ * \brief View::VTreatmentAdjustmentIsolatedUFVolumeEdit::doAdjustment
+ * \details the invocable slot to adjust the treatment isolated uf volume goal
+ * \param vVolumeGoal - requested isolated UF volume
+ */
+void View::VTreatmentAdjustmentIsolatedUFVolumeEdit::doAdjustment(quint32 vDuration, float vVolume) {
+ _data.duration = vDuration;
+ _data.volume = quint32(vVolume * 1000);
+ emit didAdjustment(_data);
+}
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h
===================================================================
diff -u
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h (revision 0)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -0,0 +1,65 @@
+/*!
+ *
+ * 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 VTreatmentAdjustmentIsolatedUFVolumeEdit.h
+ * \author (last) Behrouz NematiPour
+ * \date (last) 18-Apr-2022
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#pragma once
+
+#include
+
+// Project
+#include "main.h" // Doxygen : do not remove
+#include "VAdjustmentResponseBase.h"
+#include "MTreatmentAdjustIsolatedUFVolumeEditResponse.h"
+
+namespace View {
+
+/*!
+ * \brief The VTreatmentAdjustmentIsolatedUFVolumeEdit class
+ * \details View for Model's Data representation.
+ *
+ * \sa Model::MAdjustIsolatedUFVolumeEditResponse
+ *
+ */
+class VTreatmentAdjustmentIsolatedUFVolumeEdit : public VAdjustmentResponseBase
+{
+ Q_OBJECT
+
+ // friends
+ friend class ::tst_views;
+
+ AdjustIsolatedUFVolumeEditRequestData _data;
+
+ // The property adjustment_Triggered has to be always true
+ // and to always trigger the chasnge event to work as a notifier for GUI
+ TRIGGER( bool , adjustment , 0)
+
+ // Treatment IsolatedUF data
+ PROPERTY( float , volume , 0)
+ PROPERTY( quint32 , duration , 0)
+ PROPERTY( float , rate , 0)
+
+ VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentIsolatedUFVolumeEdit, AdjustIsolatedUFVolumeEditResponseData)
+
+ // ----------- Adjust IsolatedUF Duration
+public slots:
+ void doAdjustment(quint32 vDuration, float vVolume);
+
+signals:
+ /*!
+ * \brief didAdjustment
+ * \details the notification signal to adjust the treatment ultrafiltration volume
+ * \param vData - data model for edit the treatment ultrafiltration volume adjustment request
+ */
+ void didAdjustment(const AdjustIsolatedUFVolumeEditRequestData &vData);
+};
+}
Fisheye: Tag 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca refers to a dead (removed) revision in file `sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeGoalEdit.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca refers to a dead (removed) revision in file `sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeGoalEdit.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/view/td/data/VTDOpModeData.cpp
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/view/td/data/VTDOpModeData.cpp (.../VTDOpModeData.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/view/td/data/VTDOpModeData.cpp (.../VTDOpModeData.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -28,7 +28,6 @@
service ( vData.mOpMode == GuiTDOpModes ::MODE_SERV );
init ( vData.mOpMode == GuiTDOpModes ::MODE_INIT );
standby ( vData.mOpMode == GuiTDOpModes ::MODE_STAN );
- validateParameters ( vData.mOpMode == GuiTDOpModes ::MODE_TPAR );
preTreatment ( vData.mOpMode == GuiTDOpModes ::MODE_PRET );
inTreatment ( vData.mOpMode == GuiTDOpModes ::MODE_TREA );
postTreatment ( vData.mOpMode == GuiTDOpModes ::MODE_POST );
Index: sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp (.../VTreatmentIsolatedUFData.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp (.../VTreatmentIsolatedUFData.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -23,7 +23,7 @@
void VTreatmentIsolatedUF::onActionReceive(const TreatmentIsolatedUFData &vData)
{
duration ( vData.mDuration );
- volumeGoal ( vData.mVolumeGoal / 1000.f ); // mL => L
+ setVolume ( vData.mSetVolume / 1000.f ); // mL => L
volumeDelivered ( vData.mVolumeDelivered / 1000.f ); // mL => L
rate ( vData.mRate / 1000.f ); // mL/Hr => L/Hr
}
Index: sources/view/td/data/treatment/VTreatmentIsolatedUFData.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca
--- sources/view/td/data/treatment/VTreatmentIsolatedUFData.h (.../VTreatmentIsolatedUFData.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h (.../VTreatmentIsolatedUFData.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca)
@@ -37,7 +37,7 @@
Q_OBJECT
PROPERTY( quint32 , duration , 0)
- PROPERTY( float , volumeGoal , 0)
+ PROPERTY( float , setVolume , 0)
PROPERTY( float , volumeDelivered , 0)
PROPERTY( float , rate , 0)