Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -rb07595ece768d4093d78ca1ef068a993ff4f70a3 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) @@ -148,7 +148,7 @@ onDidChange : function(vValue) { if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } vTreatmentCreate.bloodPressureMeasureInterval = vValue - numPad.slideClose () + if ( numPad ) numPad.hide (true) } } } Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -rb07595ece768d4093d78ca1ef068a993ff4f70a3 --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) @@ -77,21 +77,14 @@ } } - function hide() { + function hide( hideOnly = false ) { if ( isOpened ) { x = x - _root.width isOpened = false } - else if ( _root.visible ) { _root.visible = false } + else if ( _root.visible && ! hideOnly ) { _root.visible = false } } - function slideClose () { - if ( isOpened ) { - x = x - _root.width - isOpened = false - } - } - function reset() { _numPadGrid.replaceValueText = true _root.getter = null @@ -130,7 +123,7 @@ Text { id: _title anchors { top : _root.top - topMargin : 10 + topMargin : Variables.defaultMargin horizontalCenter: _root.horizontalCenter } font { @@ -143,7 +136,7 @@ Text { id: _range anchors { top : _title.bottom - topMargin : 10 + topMargin : Variables.defaultMargin horizontalCenter: parent.horizontalCenter } font { @@ -155,8 +148,8 @@ Rectangle { id: _numRect anchors { - top : _root.top - topMargin : Variables.defaultMargin * 4.5 + top : _range.bottom + topMargin : Variables.defaultMargin horizontalCenter: _root.horizontalCenter } width : 300 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -rb07595ece768d4093d78ca1ef068a993ff4f70a3 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) @@ -118,7 +118,7 @@ readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 - readonly property int numPadHeight : 525 + readonly property int numPadHeight : 545 readonly property int numPadWidth : 450 readonly property int gridSelectionButtonHeight : 100 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -rb07595ece768d4093d78ca1ef068a993ff4f70a3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) @@ -70,7 +70,7 @@ BPHREntry { id: _bphrEntry } Row { id: _buttonRow - spacing: Variables.defaultMargin * 2 + spacing: Variables.defaultMargin * 4 anchors { bottom : _root.contentItem.bottom @@ -89,7 +89,7 @@ font.pixelSize : Fonts.fontPixelConfirm } - onClicked: { vTreatmentAdjustmentVitals.doRequest() ; print ("BPHREntry doRequest") } + onClicked: vTreatmentAdjustmentVitals.doRequest() } ConfirmButton { id : _confirmButton @@ -117,6 +117,7 @@ Connections { target: vTreatmentAdjustmentVitals function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { + notificationText = "" // on accepted read vital data and populate _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) @@ -127,16 +128,13 @@ } } else { // on rejected prompt user to enter vitals manually - if ( vTreatmentVitals.enableDialog ) { - _root.open () - } + if ( vTreatmentVitals.enableDialog ) { _root.open () } notificationText = rejectionTextString _bphrEntry.systolic = "" _bphrEntry.diastolic = "" _bphrEntry.heartRate = "" } - } }