Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 -r2e7d498210ba1837f0d77c23c62bf2cf43a26112 --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 2e7d498210ba1837f0d77c23c62bf2cf43a26112) @@ -26,29 +26,37 @@ * \brief Treatment Screen Vitals section */ TouchArea { id: _root - readonly property string bloodSDSeparator: " / " + readonly property string bloodSDSeparator : " / " + readonly property int dryDemoSystolicMMHGDef : 140 + readonly property int dryDemoDiastolicMMHGDef : 90 + readonly property int dryDemoHearRateBPMDef : 80 + readonly property string systolic : Variables.notSetVariable(vTreatmentVitals.systolic, 2) + readonly property string diastolic : Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + readonly property string heartRate : Variables.notSetVariable(vTreatmentVitals.heartRate, 2) + x: 0 y: 0 title: qsTr("VITALS") Column { anchors.top: _root.top anchors.topMargin: 60 - TextRect { id: _bloodPressure + TextRect { id: _bloodPressure labelHeight: 60 labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + label: (_GuiView.dryDemoMode && systolic === Variables.notSetVariable(vTreatmentVitals.systolic, 2) ? _root.dryDemoSystolicMMHGDef : systolic) + bloodSDSeparator + + (_GuiView.dryDemoMode && diastolic === Variables.notSetVariable(vTreatmentVitals.diastolic, 2) ? _root.dryDemoDiastolicMMHGDef : diastolic) extra: Variables.unitTextBloodPressure } TextRect { id: _heartBeat labelHeight: 40 labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.heartRate, 2) + label: (_GuiView.dryDemoMode && heartRate == "__" ? _root.dryDemoHearRateBPMDef : heartRate) extra: Variables.unitTextHeartBeat } }