Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r3229695c1c67de600c095d52c6f99dacfafb462d --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3229695c1c67de600c095d52c6f99dacfafb462d) @@ -1,16 +1,16 @@ /*! - * + * * 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 TreatmentStack.qml * \author (last) Behrouz NematiPour * \date (last) 28-Feb-2021 * \author (original) Behrouz NematiPour * \date (original) 27-Jan-2020 - * + * */ // Qt @@ -56,14 +56,63 @@ hasLogo : true } + EntryDialog { id: _vitalEntry + property int labelWidth : 200 + property int entryWidth : 100 + property int titleIndent : 25 + property int topMarginContent : 200 + + titleText: qsTr("VITALS") + Row { id: _container + spacing: 50 + y : Qt.inputMethod.visible && _keyboard.visible ? _vitalEntry.topMarginContent : ( (_vitalEntry.contentRect.height - _container.height) / 2 ) + Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } } + anchors.horizontalCenter: parent.horizontalCenter + + Column { + spacing : 25 + leftPadding : _vitalEntry.titleIndent + Row { + spacing : 10 + TextEntry { id : _bloodPressureSystolic + text : "‑‑" + label.text : qsTr("Blood Pressure") + label.width : _vitalEntry.labelWidth + validator : IntValidator { bottom: 0; top : 7 } // TODO: Settings Manufacturing + nextInput : _bloodPressureDiastolic + } + Label { + text : qsTr("/") + width : 10 + } + TextEntry { id : _bloodPressureDiastolic + text : "" + label.width : 0 + validator : IntValidator { bottom: 0; top : 7 } // TODO: Settings Manufacturing + nextInput : _heartRate + } + Label { + text: qsTr("mmHg") + } + } + TextEntry { id : _heartRate + text : "" + label.text : qsTr("Heart Rate") + label.width : _vitalEntry.labelWidth + validator : IntValidator { bottom: 0; top : 7 } // TODO: Settings Manufacturing + } + } + } + } + TreatmentBloodPrime { id: _treatmentBloodPrime } TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem } TreatmentHome { id: _treatmentHome onSectionFlowClicked : { _treatmentAdjustmentFlow.open() } onSectionVitalsClicked : { - // no page yet + _vitalEntry.open() } onSectionPressuresClicked: { _treatmentAdjustmentPressuresLimits.open() @@ -79,18 +128,16 @@ //// Treatment Adjustment Dialogs TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow - onCloseClicked : close() onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits - onCloseClicked : close() onConfirmClicked : vTreatmentAdjustmentPressuresLimits.doAdjustment( arterialPressureLowerBound , arterialPressureUpperBound , venousPressureLowerBound , venousPressureUpperBound - ) + ) arterialPressureMinimum : Variables.arterialValueMin arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow @@ -110,7 +157,6 @@ } TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration - onCloseClicked : close() onConfirmClicked : vTreatmentAdjustmentDuration.doAdjustment(durationValue) }