Index: SDDs/Main_Treatment/FinalDiagram.dot =================================================================== diff -u -re35626298b657eeef3db1373c287765046955063 -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- SDDs/Main_Treatment/FinalDiagram.dot (.../FinalDiagram.dot) (revision e35626298b657eeef3db1373c287765046955063) +++ SDDs/Main_Treatment/FinalDiagram.dot (.../FinalDiagram.dot) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -525,8 +525,8 @@ qvalueText [shape=ellipse, label="Text\nvTreatmentUltrafiltration.volumeRemoved", fontsize="30pt"]; qProgressBarProgressMin [shape=ellipse, label="Text\nid: _textMinimum\n'visible: false'", fontsize="30pt"]; qProgressBarProgressMax [shape=ellipse, label="Text\nid: _textMaximum\n'visible: false'", fontsize="30pt"]; - qProgressBarMin [shape=ellipse, label="Text\n0.00", fontsize="30pt"]; - qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.setVolume", fontsize="30pt"]; + qProgressBarMin [shape=ellipse, label="Text\nvTreatmentUltrafiltration.minimum", fontsize="30pt"]; + qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.maximum", fontsize="30pt"]; // Diagram Layout subgraph cluster_one { Index: SDDs/Main_Treatment/TreatmentUltrafiltration.dot =================================================================== diff -u -r30c850a7399640d7bb69428b016ac8b57af6147e -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- SDDs/Main_Treatment/TreatmentUltrafiltration.dot (.../TreatmentUltrafiltration.dot) (revision 30c850a7399640d7bb69428b016ac8b57af6147e) +++ SDDs/Main_Treatment/TreatmentUltrafiltration.dot (.../TreatmentUltrafiltration.dot) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -55,8 +55,8 @@ qvalueText [shape=ellipse, label="Text\nvTreatmentUltrafiltration.volumeRemoved", fontsize="30pt"]; qProgressBarProgressMin [shape=ellipse, label="Text\nid: _textMinimum\n'visible: false'", fontsize="30pt"]; qProgressBarProgressMax [shape=ellipse, label="Text\nid: _textMaximum\n'visible: false'", fontsize="30pt"]; - qProgressBarMin [shape=ellipse, label="Text\n0.00", fontsize="30pt"]; - qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.setVolume", fontsize="30pt"]; + qProgressBarMin [shape=ellipse, label="Text\nvTreatmentUltrafiltration.minimum", fontsize="30pt"]; + qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.maximum", fontsize="30pt"]; // Diagram Layout subgraph cluster_one { Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -re35626298b657eeef3db1373c287765046955063 -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision e35626298b657eeef3db1373c287765046955063) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -129,7 +129,7 @@ Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit function onAdjustmentTriggered ( vValue ) { // the maximum ultrafiltration volume has to be set/revert regardless - vTreatmentUltrafiltration.setVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume + vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume _preTreatmentUltrafiltration.reset ( vPreTreatmentAdjustmentUltrafiltrationInit.volume ) // but only if it has been accepted it will navigate Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -re35626298b657eeef3db1373c287765046955063 -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e35626298b657eeef3db1373c287765046955063) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -174,7 +174,7 @@ Connections { target: vTreatmentAdjustmentDuration function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { - vTreatmentUltrafiltration.setVolume = vTreatmentAdjustmentDuration.ultrafiltration + vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentDuration.ultrafiltration _treatmentAdjustmentDuration.accept() } else { _treatmentAdjustmentDuration.setDurationValue(vTreatmentAdjustmentDuration.duration); Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -re35626298b657eeef3db1373c287765046955063 -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision e35626298b657eeef3db1373c287765046955063) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -140,7 +140,7 @@ Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { - vTreatmentUltrafiltration.setVolume = vTreatmentAdjustmentUltrafiltrationConfirm.volume + vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationConfirm.volume _treatmentAdjustmentUltrafiltrationConfirm.close() } else { _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.text() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r4c97ffb2e5adabe830edf99cb185879e2543da3f -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -34,8 +34,8 @@ property real valAdjust : _volumeSlider.value property real maxAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property real min : 0 - property real val : vTreatmentUltrafiltration.volumeRemoved + property real min : vTreatmentUltrafiltration.minimum + property real val : vTreatmentUltrafiltration.maximum property real max : vTreatmentUltrafiltration.setVolume } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r4c97ffb2e5adabe830edf99cb185879e2543da3f -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -29,8 +29,8 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationPaused" //SquishQt testability QtObject { id: _private - property real minimum: 0 - property real maximum: vTreatmentUltrafiltration.setVolume + property real minimum: vTreatmentUltrafiltration.minimum + property real maximum: vTreatmentUltrafiltration.maximum property real value : vTreatmentUltrafiltration.volumeRemoved } signal editClicked() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml.autosave =================================================================== diff -u --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml.autosave (revision 0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml.autosave (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -0,0 +1,116 @@ +/*! + * + * Copyright (c) 2020-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 TreatmentAdjustmentUltrafiltrationPaused.qml + * \author (last) Vy + * \date (last) 16-Mar-2023 + * \author (original) Behrouz NematiPour + * \date (original) 14-May-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief TreatmentAdjustmentUltrafiltrationStart.qml is the screen + * To adjust the treatment ultrafiltration + */ +TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentUltrafiltrationPaused" //SquishQt testability + QtObject { id: _private + property real minimum: vTreatmentUltrafiltration.minimum + property real maximum: vTreatmentUltrafiltration.maximum + property real value : vTreatmentUltrafiltration.volumeRemoved + } + signal editClicked() + signal resumeClicked() + + confirmVisible : false + + information { + visible : true && information.text && ! notification.visible + imageSource : ufInfoImageSource + text : ufInfoText + } + + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + Variables.unitTextUltrafiltrationVolume + + ProgressBarEx { id: _progressbarex + width : Variables.ultrafiltrationProgressbarWidth + height : Variables.ultraFiltrationProgressBarHeight + anchors { + top: parent.top + topMargin: 250 + horizontalCenter: parent.horizontalCenter + } + decimal : Variables.ultrafiltrationPrecision + minimum : _private.minimum + maximum : _private.maximum + value : _private.value + valueEx : 0 + } + + TouchRect { id: _editButton + width: 530 + height: 95 + anchors { + top: parent.top + topMargin: 350 + horizontalCenter: parent.horizontalCenter + } + isDefault: true + text { + text: qsTr("EDIT ULTRAFILTRATION VOLUME") + font.weight: Font.DemiBold + font.pixelSize: 26 //Fonts.fontPixelBack + } + onClicked: editClicked() + } + + TouchRect { id: _resumeButton + visible: isUFPaused + width: 530 + height: 95 + anchors { + top: _editButton.bottom + topMargin: 20 + horizontalCenter: parent.horizontalCenter + } + + Image { id: _image + anchors { + verticalCenter: _resumeButton.verticalCenter + left : _resumeButton.left + leftMargin : 50 + } + + width : Variables.pauseIconDiameter + height: Variables.pauseIconDiameter + source: "qrc:/images/iResume" + } + + text { + text: qsTr("RESUME ULTRAFILTRATION") + font.weight: Font.DemiBold + font.pixelSize: 26 //Fonts.fontPixelBack + anchors { + centerIn: null // disable the parent anchor + verticalCenter: _resumeButton.verticalCenter + left: _image.right + leftMargin: 25 + } + } + onClicked: resumeClicked() + } +} Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r4c97ffb2e5adabe830edf99cb185879e2543da3f -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -30,8 +30,8 @@ contentItem.objectName: "TreatmentAdjustmentUltrafiltrationStart" //SquishQt testability QtObject { id: _private - property real minimum: 0 - property real maximum: vTreatmentUltrafiltration.setVolume + property real minimum: vTreatmentUltrafiltration.minimum + property real maximum: vTreatmentUltrafiltration.maximum property real value : vTreatmentUltrafiltration.volumeRemoved } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r4c97ffb2e5adabe830edf99cb185879e2543da3f -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -28,8 +28,8 @@ */ TreatmentSection { id: _root - readonly property real minimum : 0 - readonly property real maximum : vTreatmentUltrafiltration.setVolume + readonly property real minimum : vTreatmentUltrafiltration.minimum + readonly property real maximum : vTreatmentUltrafiltration.maximum readonly property real value : vTreatmentUltrafiltration.volumeRemoved readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 Index: sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h =================================================================== diff -u -r4c97ffb2e5adabe830edf99cb185879e2543da3f -re9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c --- sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h (.../VTreatmentUltrafiltrationData.h) (revision 4c97ffb2e5adabe830edf99cb185879e2543da3f) +++ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h (.../VTreatmentUltrafiltrationData.h) (revision e9bc210a8ebe1f8f2cf9f00a00d03211dec9b07c) @@ -36,6 +36,9 @@ { Q_OBJECT + PROPERTY( float, minimum                        , 0.000 ) // no message to update this value and is 0 for now. + PROPERTY( float, maximum                        , 0.800 ) + PROPERTY( float , setVolume , 0) PROPERTY( float , targetRate , 0) PROPERTY( float , volumeRemoved , 0)