Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r7a1dcc43829f3e6435064abf93b55ffb012a8697 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 7a1dcc43829f3e6435064abf93b55ffb012a8697) @@ -64,6 +64,117 @@ leftPadding : _root.contentPadding anchors.fill : parent + Item { id: _vitalsDataItem + width : Variables.adjustmentLabelUnitContainerWidth + height : Variables.adjustmentLabelUnitContainerHeight + + Image { id: _image + anchors { + left : parent.left + top : parent.top + topMargin : Variables.defaultMargin / 2 + } + + source: "qrc:/images/iVitalsRed" + } + + LabelValue { id: _bloodPressure + anchors { + left : _image.right + leftMargin : Variables.defaultMargin + top : parent.top + } + height : parent.height / 3 + width : parent.width / 5 + topTextFont.pixelSize : Fonts.fontPixelTitle + topTextFont.weight : Font.Medium + topText : Variables.notSetVariable(vTreatmentVitals.systolic, 2) + "/" + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + bottomText : Variables.unitTextBloodPressure + bottomTextFont.pixelSize: Fonts.fontPixelContainerUnitSmall + bottomTextFont.weight : Font.Light + } + + LabelValue { id: _heartBeat + anchors { + left : _bloodPressure.right + top : parent.top + } + height : parent.height / 3 + width : parent.width / 5 + topTextFont.pixelSize : Fonts.fontPixelTitle + topTextFont.weight : Font.Medium + topText : Variables.notSetVariable(vTreatmentVitals.heartRate, 2) + bottomText : Variables.unitTextHeartBeat + bottomTextFont.pixelSize: Fonts.fontPixelContainerUnitSmall + bottomTextFont.weight : Font.Light + } + + Item { + anchors { + right : parent.right + verticalCenter : parent.verticalCenter + } + height : parent.height + width : parent.width / 3 + + Row {id: _intervalRow + anchors { + bottom : _lastRecordedRow.top + bottomMargin: Variables.defaultMargin / 2 + left : _lastRecordedRow.left + } + spacing: 5 + + Text { id: _interval + font.pixelSize : Fonts.fontPixelTouchAreaTitle + font.weight : Font.Medium + font.italic : true + verticalAlignment : Text.AlignBottom + color : Colors.offWhite + text : qsTr("Vitals Interval:") + } + + Text { id: _intervalText + font.pixelSize : Fonts.fontPixelTouchAreaTitle + font.weight : Font.Light + font.italic : true + verticalAlignment : Text.AlignBottom + color : Colors.offWhite + text : vTreatmentVitals.interval ? (vTreatmentVitals.interval + Variables.unitTextMins) : qsTr("OFF") + } + } + + Row { id: _lastRecordedRow + anchors + { + bottom : parent.bottom + left : parent.left + } + spacing: 5 + + Text { id: _lastRecorded + + font.pixelSize : Fonts.fontPixelTouchAreaTitle + font.weight : Font.Medium + font.italic : true + verticalAlignment : Text.AlignBottom + color : Colors.offWhite + text : qsTr("Last Read:") + } + + Text { id: _lastRecordedText + font.pixelSize : Fonts.fontPixelTouchAreaTitle + font.weight : Font.Light + font.italic : true + verticalAlignment : Text.AlignBottom + color : Colors.offWhite + text : vTreatmentVitals.lastRead === "" ? Variables.emptyEntry : + vTreatmentVitals.lastRead + } + } + } + } + LabelUnitContainer { id: _bpContainer text : qsTr("Blood Pressure") unitText : Variables.unitTextBloodPressure Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r7a1dcc43829f3e6435064abf93b55ffb012a8697 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 7a1dcc43829f3e6435064abf93b55ffb012a8697) @@ -44,14 +44,7 @@ property alias numPad : _numPad - readonly property string intervalTextString : qsTr("Interval:" ) - + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) - + " , " - + qsTr("Last Read:") - + " " + vTreatmentVitals.lastRead readonly property string rejectionTextString : qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) - readonly property string notificationTextString : vTreatmentAdjustmentVitals.adjustment_ReasonText ? rejectionTextString : - intervalTextString function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" @@ -81,7 +74,7 @@ onOpened: { _bphrEntry.setInitialFocus() - notificationText = notificationTextString + notificationText = rejectionTextString } onCloseClicked: { @@ -90,18 +83,15 @@ } BPHREntry { id: _bphrEntry - anchors { - fill: parent - topMargin: Variables.defaultMargin * 2 - } + anchors.fill: parent } Column { id: _buttonRow - spacing: Variables.defaultMargin * 1.5 + spacing: Variables.defaultMargin anchors { bottom : _root.contentItem.bottom - bottomMargin : Variables.defaultMargin * 5 + bottomMargin : Variables.defaultMargin * 4 horizontalCenter: _root.contentItem.horizontalCenter } @@ -213,7 +203,7 @@ _bphrEntry.diastolic = "" _bphrEntry.heartRate = "" } - notificationText = notificationTextString + notificationText = rejectionTextString } // FW no response timeout