Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r31b1e7a5d69f014398827e16286f28515cd60e35 --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 31b1e7a5d69f014398827e16286f28515cd60e35) @@ -39,7 +39,7 @@ height : 40 width : contentItem.width topTextFont.pixelSize : Fonts.fontPixelVitals - topTextFont.weight : Font.Bold + topTextFont.weight : Font.Medium topText : Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) bottomText : Variables.unitTextBloodPressure bottomTextFont.pixelSize: 20 @@ -51,7 +51,7 @@ height : 45 width : contentItem.width topTextFont.pixelSize : Fonts.fontPixelVitals - topTextFont.weight : Font.Bold + topTextFont.weight : Font.Medium topText : Variables.notSetVariable(vTreatmentVitals.heartRate, 2) bottomText : Variables.unitTextHeartBeat bottomTextFont.pixelSize: 20 @@ -62,22 +62,11 @@ Text { id: _lastRecorded height : 30 width : contentItem.width - text : qsTr("Last Recorded: " ) - font.pixelSize : 18 + font.pixelSize : 16 font.weight : Font.Normal verticalAlignment : Text.AlignBottom color : Colors.textMain + text : qsTr("Last Read: %1").arg(vTreatmentVitals.lastRead) } } - - function updateVitalTime() { - _lastRecorded.text = qsTr("Last Recorded: " ) + vDateTime.time - } - - // TODO -// notification.text: qsTr("Interval:" ) -// + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) -// + " , " -// + qsTr("Last Read:") -// + " " + vTreatmentVitals.lastRead }