Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r31b1e7a5d69f014398827e16286f28515cd60e35 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 31b1e7a5d69f014398827e16286f28515cd60e35) @@ -28,10 +28,18 @@ titleText : qsTr("VITALS") confirmEnabled : _bphrEntry.isValid - height : 400 + height : 500 width : 750 - y : 125 +// y : Variables.mainMenuHeight + x: numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 : + Math.round((Variables.applicationWidth - width) / 2) + notificationText: qsTr("Interval:" ) + + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) + + " , " + + qsTr("Last Read:") + + " " + vTreatmentVitals.lastRead + function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" _bphrEntry.diastolic = vDiastolic ? vDiastolic : "" @@ -50,6 +58,7 @@ _bphrEntry.diastolic , _bphrEntry.heartRate ) + _headerBar.vitalsRecorded() } onCloseClicked: { @@ -63,10 +72,15 @@ Connections { target: vTreatmentVitals function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { + print("**** vTreatmentVitals.enableDialo " + vTreatmentVitals.enableDialog) + print(("%1 / %2 -- %3").arg(vSystolic).arg(vDiastolic).arg(vHeartRate)) + _headerBar.vitalsRecorded() if ( vTreatmentVitals.enableDialog ) { _root.update ( vSystolic, vDiastolic, vHeartRate ) - _root.open () +// _root.open () } } } + + Behavior on x { NumberAnimation { duration: Variables.keybardAnimationDuration } } }