Index: denali.pro.user =================================================================== diff -u -r99a56ec30f1ca4f401e744766bde4f6fac291752 -r0cc29248749353dfaca80fa02fdd6108173c3a71 --- denali.pro.user (.../denali.pro.user) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) +++ denali.pro.user (.../denali.pro.user) (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -r0cc29248749353dfaca80fa02fdd6108173c3a71 --- denali.qrc (.../denali.qrc) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) +++ denali.qrc (.../denali.qrc) (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) @@ -122,11 +122,6 @@ sources/gui/qml/globals/qmldir sources/gui/qml/globals/Fonts.qml - - sources/gui/qml/pages/treatment/TreatmentStack.qml - sources/gui/qml/pages/treatment/TreatmentStart.qml - sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml - sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml @@ -144,6 +139,12 @@ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml + + sources/gui/qml/pages/treatment/TreatmentStack.qml + sources/gui/qml/pages/treatment/TreatmentStart.qml + sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml + sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml + sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml @@ -165,7 +166,6 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml - sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -r0cc29248749353dfaca80fa02fdd6108173c3a71 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) @@ -47,7 +47,6 @@ } // Post Treatment - PostTreatmentBloodPrime { id: _postTreatmentBloodPrime } // only one page, no stack for now. PostTreatmentRinsebackStack { id: _postTreatmentRinsebackStack } PostTreatmentRecirculateStack { id: _postTreatmentRecirculateStack } PostTreatmentEndStack { id: _postTreatmentEndStack } @@ -92,7 +91,6 @@ // also with what ever order they have been push with the reverse/correct animation will be poped or pushed. Connections { target: vHDTreatmentStates // Blood Prime - onTxBloodPrimeChanged : { page( _postTreatmentBloodPrime , vtxBloodPrime )} onBpRampChanged : { page( null , vbpRamp )} // in-Treatmet Fisheye: Tag 0cc29248749353dfaca80fa02fdd6108173c3a71 refers to a dead (removed) revision in file `sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml =================================================================== diff -u -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 -r0cc29248749353dfaca80fa02fdd6108173c3a71 --- sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) @@ -5,7 +5,7 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file PostTreatmentBloodPrime.qml + * \file PostTreatmentRinsebackStack.qml * \author (last) Behrouz NematiPour * \date (last) 15-Feb-2021 * \author (original) Behrouz NematiPour Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (revision 0) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) @@ -0,0 +1,63 @@ +/*! + * + * Copyright (c) 2019-2020 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 TreatmentBloodPrime.qml + * \author (last) Behrouz NematiPour + * \date (last) 09-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 29-Jan-2021 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief the in-treatment Blood Prime screen + */ +ScreenItem { id: _root + objectName: "_PostTreatmentBloodPrime" + + Text { id: _title + anchors { + top: parent.top + topMargin: 65 + horizontalCenter: parent.horizontalCenter + } + color: "white" + text: qsTr("Blood Priming") + font.pixelSize: Fonts.fontPixelTitle + } + + ProgressCircle { id: _circle + diameter: 335 + anchors.centerIn: parent + minimum : 0 + maximum : vTreatmentBloodPrime.target + value : vTreatmentBloodPrime.current + + Text { id: _textVolume + anchors.centerIn: parent + color: "white" + text: vTreatmentBloodPrime.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid) + font.pixelSize: 76 + font.weight: Font.ExtraLight + + } + } + + onVisibleChanged: { + if (visible) { + _mainMenu.hidden = true + } + } +} Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r6581def57942b1c1ef56a2f2feb74559946517b9 -r0cc29248749353dfaca80fa02fdd6108173c3a71 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 6581def57942b1c1ef56a2f2feb74559946517b9) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) @@ -58,7 +58,7 @@ hasLogo : true } - + TreatmentBloodPrime { id: _treatmentBloodPrime } TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem } TreatmentStart { id: _treatmentStart onBackClicked : { @@ -153,20 +153,21 @@ Connections { target: vHDOperationMode // The initail screen should be the Blood Prime, since that one is the earlier state in the list. // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack. - onInTreatmentChanged : { page( _postTreatmentBloodPrime , vinTreatment )} + onInTreatmentChanged : { page( _treatmentBloodPrime , vinTreatment )} } - Connections { target: _postTreatmentBloodPrime + Connections { target: _treatmentBloodPrime onVisibleChanged: { - if (_postTreatmentBloodPrime.visible) { + if (_treatmentBloodPrime.visible) { _treatmentMenu.hidden = true } } } Connections { target: vHDTreatmentStates // in-Treatmet - onTxDialysisChanged : { page( _treatmentStart , vtxDialysis )} + onTxBloodPrimeChanged : { page( _treatmentBloodPrime , vtxBloodPrime )} + onTxDialysisChanged : { page( _treatmentStart , vtxDialysis )} } Connections { target: _mainHome