Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r2b8eae42f38086129660a91ba6ae458094f94f99 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 2b8eae42f38086129660a91ba6ae458094f94f99) @@ -51,6 +51,12 @@ width : _container.width height : _container.height + function clear() { + _root.systolic = "" + _root.diastolic = "" + _root.heartRate = "" + } + function setFocus(vShowKeyboard) { if(vShowKeyboard) { firstInput.textInput.forceActiveFocus() Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -rc36f8432854c8ab42f71b76da826b50912822cf7 -r2b8eae42f38086129660a91ba6ae458094f94f99 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision c36f8432854c8ab42f71b76da826b50912822cf7) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 2b8eae42f38086129660a91ba6ae458094f94f99) @@ -35,13 +35,23 @@ property int stackStepIndex : 7 + function clear() { + _preTreatmentVitals .clear() + _preTreatmentUltrafiltration.clear() + + } + PreTreatmentBase { id: _preTreatmentVitals // BP/HR Entry function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" _bphrEntry.diastolic = vDiastolic ? vDiastolic : "" _bphrEntry.heartRate = vHeartRate ? vHeartRate : "" } + function clear() { + _bphrEntry.clear() + } + header.stepIndex : 5 header.confirmText.text : qsTr("CONFIRM") header.backVisible : false @@ -187,6 +197,7 @@ _mainMenu.hidden = true } else { + clear() stackView.initialItem = null } } Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -rc36f8432854c8ab42f71b76da826b50912822cf7 -r2b8eae42f38086129660a91ba6ae458094f94f99 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision c36f8432854c8ab42f71b76da826b50912822cf7) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 2b8eae42f38086129660a91ba6ae458094f94f99) @@ -39,6 +39,11 @@ _volumeSlider.reset ( vValue ) } + function clear() { + _volumeSlider.reset ( _volumeSlider.defaultValue ) + _volumeSlider.isActive = false + } + function handleMinimum( vValue ) { if( _volumeSlider.minimum > vValue ){ _volumeSlider.reset ( _volumeSlider.minimum )