Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r9c86f0af32fb7a2530ab738b03d9a37359b9db8c --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 9c86f0af32fb7a2530ab738b03d9a37359b9db8c) @@ -50,9 +50,11 @@ width : _container.width height : _container.height - function setFocus() { - firstInput.textInput.forceActiveFocus() - _keyboard.setVisible(true) + function setFocus(vShowKeyboard) { + if(vShowKeyboard) { + firstInput.textInput.forceActiveFocus() + _keyboard.setVisible(true) + } } anchors.horizontalCenter: parent.horizontalCenter Index: sources/gui/qml/main.qml =================================================================== diff -u -r7c86f3854db9ad02d95681203198d75a0d65c9fa -r9c86f0af32fb7a2530ab738b03d9a37359b9db8c --- sources/gui/qml/main.qml (.../main.qml) (revision 7c86f3854db9ad02d95681203198d75a0d65c9fa) +++ sources/gui/qml/main.qml (.../main.qml) (revision 9c86f0af32fb7a2530ab738b03d9a37359b9db8c) @@ -156,7 +156,7 @@ VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentVitals { id: vTreatmentVitals interval : vTreatmentCreate.bloodPressureMeasureInterval - enableDialog: vHDOperationMode.inTreatment && vHDTreatmentStates.txDialysis + enableDialog: vHDOperationMode.inTreatment && (vHDTreatmentStates.txDialysis || vHDTreatmentStates.txStop) // txStop considered for "pause" case // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. onEnableDialogChanged : { if ( vTreatmentVitals.enableDialog ) { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r28845c70151c3fb6f1a8e92c82da0232b6ca854a -r9c86f0af32fb7a2530ab738b03d9a37359b9db8c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 28845c70151c3fb6f1a8e92c82da0232b6ca854a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 9c86f0af32fb7a2530ab738b03d9a37359b9db8c) @@ -730,7 +730,7 @@ minimum : vTreatmentRanges.bloodPressureMeasureIntervalMin maximum : vTreatmentRanges.bloodPressureMeasureIntervalMax step : vTreatmentRanges.bloodPressureMeasureIntervalRes - value : vTreatmentRanges.bloodPressureMeasureIntervalDef + value : 1.0//vTreatmentRanges.bloodPressureMeasureIntervalDef valid : !vTreatmentCreate.bloodPressureMeasureIntervalRejectReason adjustable : _bloodPressureIntervalSwitch.checked inActiveZero: true @@ -740,7 +740,7 @@ if(!valid) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } - vTreatmentCreate.bloodPressureMeasureInterval = _bloodPressureIntervalSwitch.checked ? value : 0 + vTreatmentCreate.bloodPressureMeasureInterval = 1//_bloodPressureIntervalSwitch.checked ? value : 0 } // ToDo: create a component for this, Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rc875558052c57819f270f3af970e12016d325fce -r9c86f0af32fb7a2530ab738b03d9a37359b9db8c --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c875558052c57819f270f3af970e12016d325fce) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 9c86f0af32fb7a2530ab738b03d9a37359b9db8c) @@ -74,6 +74,10 @@ readonly property bool isSBInProgress : ( vHDTreatmentStates.sbRunning || vHDTreatmentStates.sbWaitPump ) + readonly property bool isDialogOpened : _treatmentAdjustmentFlow.visible + || _treatmentAdjustmentPressuresLimits.visible + || _treatmentAdjustmentDuration.visible + || _treatmentUltrafiltrationItem.visible // Components MainMenu { id: _treatmentMenu y : Variables.mainMenuHeight * -1 @@ -96,7 +100,11 @@ } TreatmentBloodPrime { id: _treatmentBloodPrime } - TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem } + TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem + // - set visible to false as init state to correctly indicate visible screens + // - TreatmentUltrafiltrationItem is not a ScreenItem, thus visible is true automatically + visible:false + } TreatmentHome { id: _treatmentHome } Connections { target: _treatmentHome @@ -105,7 +113,6 @@ } function onSectionVitalsClicked ( vValue ) { _vitalEntry.open() - _bphrEntry.setFocus() } function onSectionPressuresClicked ( vValue ) { _treatmentAdjustmentPressuresLimits.open() @@ -187,7 +194,7 @@ onOpened : { vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user - _keyboard.setVisible(true) + _bphrEntry.setFocus(!_root.isDialogOpened) } onClosed : { @@ -202,10 +209,8 @@ Connections { target: vTreatmentVitals function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { if ( vTreatmentVitals.enableDialog ) { - if(_root.visible) { - _vitalEntry.update ( vSystolic, vDiastolic, vHeartRate ) - _vitalEntry.open () - } + _vitalEntry.update ( vSystolic, vDiastolic, vHeartRate ) + _vitalEntry.open () } } }