Index: denali.pro.user =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- denali.pro.user (.../denali.pro.user) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ denali.pro.user (.../denali.pro.user) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- denali.qrc (.../denali.qrc) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ denali.qrc (.../denali.qrc) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -133,15 +133,16 @@ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml - - sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrimeStack.qml - sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml + + sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml + sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml Index: sources/gui/qml/compounds/InstructionView.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -30,9 +30,10 @@ property var stepNames : [] property var stepImages : [] + readonly property bool isEmpty : stepNames.length == 0 && stepImages.length == 0 readonly property int currentStepIndex: _swipeview.currentIndex - readonly property bool firstStep : _swipeview.currentIndex == 0 - readonly property bool lastStep : _swipeview.currentIndex == _swipeview.count - 1 + readonly property bool firstStep : isEmpty || _swipeview.currentIndex == 0 + readonly property bool lastStep : isEmpty || _swipeview.currentIndex == _swipeview.count - 1 readonly property int frameGap : 47 readonly property int chevronWidth : 25 @@ -50,7 +51,7 @@ Text { id: _message color : Colors.textMain - text : _root.stepNames[_swipeview.currentIndex] + text : _root.stepNames.length ? _root.stepNames[_swipeview.currentIndex] : "" anchors.top : _root.top anchors.bottom : _innerFrame.top anchors.horizontalCenter: _root.horizontalCenter Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -137,9 +137,12 @@ readonly property int bloodFlowResolution : 25 readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 - // Precision - readonly property int ultrafiltrationPrecision : 3 + // Ultrafiltration + readonly property real ultrafiltrationMinDef : 0.000 + readonly property real ultrafiltrationMaxDef : 8.000 + readonly property int ultrafiltrationPrecision : 3 + // Inline Blood Pressures // - Artrial // - Artrial - Entire pressure value range Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -33,7 +33,6 @@ property int stackStepIndex : 2 PreTreatmentBase { id: _preTreatmentConsumablesInstall - header.stepIndex : stackStepIndex header.confirmVisible : true title.text : qsTr("Consumables Installation") instructionBased : true @@ -42,7 +41,6 @@ } PreTreatmentBase { id: _preTreatmentConsumablesSelfTest - header.stepIndex : stackStepIndex header.confirmVisible : true header.confirmEnabeled : vPreTreatmentStates.selfTestConsumables_complete isComplete : vPreTreatmentStates.selfTestConsumables_complete Index: sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml (.../PreTreatmentMainStack.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml (.../PreTreatmentMainStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -20,7 +20,8 @@ // Qml imports import "qrc:/globals" import "qrc:/components" -import "qrc:/pages/pretreatment/prime" +import "qrc:/pages/pretreatment" +import "qrc:/pages/pretreatment/connection" /*! * \brief the pre treatment prime stack screen */ @@ -45,23 +46,8 @@ PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack } PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack } PreTreatmentPrimeStack { id: _pretreatmentPrimeStack } - PreTreatmentUltrafiltration { id: _pretreatmentUltrafiltration } + PreTreatmentConnectionStack { id: _pretreatmentConnectionStack } - Connections { target: vTreatmentAdjustmentUltrafiltrationInit - onAdjustmentTriggered : { - // the maximum ultrafiltration volume has to be set/revert regardless - vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume - _pretreatmentUltrafiltration.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume - // but only if it has been accepted it will navigate - if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) { - vTreatmentCreate.doStartTreatment() - } - else { - _pretreatmentUltrafiltration.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() - } - } - } - Connections { target: vPreTreatmentStates onStartChanged : {} onWaterSampleChanged : { if ( vwaterSample ) { page( _preTreatmentWaterSampleStack )}} @@ -71,14 +57,9 @@ onSelfTestDryChanged : { if ( vselfTestDry ) { page( _pretreatmentPrimeStack )}} onPrimeChanged : { if ( vprime ) { console.debug("vprime ")}} onRecirculateChanged : { if ( vrecirculate ) { console.debug("vrecirculate ")}} - onPatientConnectionChanged : { if ( vpatientConnection ) { console.debug("vpatientConnection ")}} + onPatientConnectionChanged : { if ( vpatientConnection ) { page( _pretreatmentConnectionStack )}} } - Connections { target: _pretreatmentUltrafiltration - onBackClicked : {vTreatmentCreate.doRequestPop() } - onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume) } - } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true Fisheye: Tag c0c63c4b149dafea2b02e4cd31f223e392ff7818 refers to a dead (removed) revision in file `sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (revision 0) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -0,0 +1,103 @@ +/*! + * + * 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 PreTreatmentPatientConnectionStack.qml + * \author (last) Behrouz NematiPour + * \date (last) 18-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 18-Mar-2021 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" +import "qrc:/pages/pretreatment" +import "qrc:/pages/pretreatment/connection" + +/*! + * \brief the pre-treatment consumbles stack screen + */ +StackItem { id: _root + objectName: "_PreTreatmentConsumblesStack" + + stackView.initialItem : null + + property int stackStepIndex : 7 + + PreTreatmentUltrafiltration { id: _preTreatmentUltrafiltration + header.stepIndex : 5 + header.confirmVisible : true + title.text : qsTr("Ultrafiltration Setup") + } + + PreTreatmentBase { id: _preTreatmentPatientConnection + header.stepIndex : 7 + header.confirmVisible : true + title.text : qsTr("Patient Connection") + header.confirmText.text : qsTr("CONTINUE") + + instructionBased : true + instructionStepNames : testStepNames + instructionStepImages : testStepImages + } + + PreTreatmentBase { id: _preTreatmentStartTreatment + header.stepIndex : 8 + header.confirmVisible : true + title.text : qsTr("Start Treatment") + header.confirmText.text : qsTr("START") + instructionBased : true + // instructionStepNames : testStepNames + // instructionStepImages : testStepImages + } + + Connections { target: vPreTreatmentStates + onPatientConnectionChanged : { if ( vpatientConnection ) { page( _preTreatmentUltrafiltration )}} + } + + Connections { target: vTreatmentAdjustmentUltrafiltrationInit + onAdjustmentTriggered : { + // the maximum ultrafiltration volume has to be set/revert regardless + vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume + _preTreatmentUltrafiltration.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume + // but only if it has been accepted it will navigate + if ( vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) { + page( _preTreatmentPatientConnection ) + } + else { + _preTreatmentUltrafiltration.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() + } + } + } + + Connections { target: _preTreatmentUltrafiltration + onConfirmClicked : { vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume) + // TEST: page( _preTreatmentPatientConnection ) + } + } + + Connections { target: _preTreatmentPatientConnection + onBackClicked : { page( _preTreatmentUltrafiltration )} + onConfirmClicked : { page( _preTreatmentStartTreatment )} + } + + Connections { target: _preTreatmentPatientConnection + onBackClicked : { page( _preTreatmentPatientConnection )} + onConfirmClicked : { vTreatmentCreate.doStartTreatment() } + } + + onVisibleChanged: { + if (visible) { + _mainMenu.hidden = true + } + } +} Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (revision 0) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -0,0 +1,85 @@ +/*! + * + * 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 PreTreatmentUltrsafiltration.qml + * \author (last) Behrouz NematiPour + * \date (last) 01-Mar-2021 + * \author (original) Peter Lucia + * \date (original) 03-Aug-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" +import "qrc:/pages/pretreatment" + +/*! + * \brief Pre-Treatment ultrafiltration screen + * \details which contains a slider to let user set the ultratiltration volume. + */ +PreTreatmentBase { id: _root + objectName: "_PreTreatmentUltrafiltration" + + property alias ufVolume : _volumeSlider.value + + header.confirmEnabeled: _volumeSlider.isActive + + Text { id: _textLabel + visible : true + color : "white" + text : qsTr("Ultrafiltration Volume") + " " + Variables.unitTextUltrafiltrationVolume + font { + pixelSize : Fonts.fontPixelCreateTreatment + } + anchors { + left : _volumeSlider.left + bottom : _volumeSlider.top + bottomMargin : 45 + } + } + + Text { id: _textValue + visible : true + color : "white" + text : _root.ufVolume.toFixed(Variables.ultrafiltrationPrecision) + font { + pixelSize : Fonts.fontPixelCreateTreatment + } + anchors { + right : _volumeSlider.right + bottom : _volumeSlider.top + bottomMargin : 45 + } + } + + Slider { id: _volumeSlider + objectName: "_volumeSlider" + anchors { + horizontalCenter: parent.horizontalCenter + top: parent.top + topMargin: 425 + } + isActive: false + width : parent.width / 2 + height : 5 + step : 0.100 + stepSnap: true + ticks : false + diameter: Variables.sliderCircleDiameter + decimal : Variables.ultrafiltrationPrecision + minimum : Variables.ultrafiltrationMinDef + maximum : Variables.ultrafiltrationMaxDef + minText.font.pixelSize: Fonts.fontPixelFluidText + maxText.font.pixelSize: Fonts.fontPixelFluidText + onPressed: isActive = true + } +} Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -29,7 +29,7 @@ stackView.initialItem : null - property int stackStepINdex: 0 + property int stackStepINdex : 0 PreTreatmentCreate { id: _pretreatmentCreate header.stepIndex : stackStepINdex Fisheye: Tag 4f87126626b76aa04ddcf2ae92e04e118cdcbe01 refers to a dead (removed) revision in file `sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrimeStack.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4f87126626b76aa04ddcf2ae92e04e118cdcbe01 refers to a dead (removed) revision in file `sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml'. Fisheye: No comparison available. Pass `N' to diff?