Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) @@ -30,77 +30,77 @@ property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax + property int tmpMinimum : -180 // vTreatmentRanges.tmpPressureMonitorMin + property int tmpMaximum : 50 // vTreatmentRanges.tmpPressureMonitorMax property int arterialLowerBound : vTreatmentPressureOcclusion.arterialPressureLimitLowerBound property int arterialUpperBound : vTreatmentPressureOcclusion.arterialPressureLimitUpperBound property int venousLowerBound : vTreatmentPressureOcclusion.venousPressureLimitLowerBound property int venousUpperBound : vTreatmentPressureOcclusion.venousPressureLimitUpperBound + property int tmpLowerBound : -80 // vTreatmentPressureOcclusion.tmpPressureLimitLowerBound + property int tmpUpperBound : 20 // vTreatmentPressureOcclusion.tmpPressureLimitUpperBound + property int arterialPressure : vTreatmentPressureOcclusion.arterialPressure property int venousPressure : vTreatmentPressureOcclusion.venousPressure + property int tmpPressure : -30 // vTreatmentPressureOcclusion.tmpPressure - property bool valueOutRangeNotify : true + property bool valueOutRangeNotify : true header.title: qsTr("Pressures") + " (" + qsTr("mmHg") + ")" contentItem: Column { id: _column - spacing: Variables.defaultMargin * 5 + spacing: Variables.defaultMargin * 4 + topPadding : Variables.defaultMargin leftPadding : Variables.defaultMargin rightPadding: Variables.defaultMargin - RangeBar { id: _arterialRangeBar + TreatmentPressureComponent { id: _arterialRangeBar + title : qsTr("Arterial:") + height : Variables.contentHeight / 3 + width : contentItem.width * 0.75 + barColor : Colors.pressuresArterialBar - width : contentItem.width * 0.75 - height : 25 - rangebar.color: Colors.pressuresArterialBar - markerOutRangeNotify: _root.valueOutRangeNotify - minimum : _root.arterialMinimum + minimum : _root.arterialMinimum lowerBound : _root.arterialLowerBound upperBound : _root.arterialUpperBound maximum : _root.arterialMaximum - value : _root.arterialPressure - color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color + pressure : _root.arterialPressure - Text { id: _arterialText - anchors { - left: parent.left - top: parent.bottom - topMargin: 35 - } - text: qsTr("Arterial") - font.pixelSize: Fonts.fontPixelPresseuresText - color: Colors.pressuresText - } - -// onClicked: _root.clicked() + valueOutRangeNotify : _root.valueOutRangeNotify } - RangeBar { id: _venousRangeBar + TreatmentPressureComponent { id: _venousRangeBar + title : qsTr("Venous:") + height : Variables.contentHeight / 3 + width : contentItem.width * 0.75 + barColor : Colors.pressuresVenousBar - width : contentItem.width * 0.75 - height : 25 - rangebar.color: Colors.pressuresVenousBar - markerOutRangeNotify: _root.valueOutRangeNotify - minimum : _root.venousMinimum lowerBound : _root.venousLowerBound upperBound : _root.venousUpperBound maximum : _root.venousMaximum - value : _root.venousPressure - color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color + pressure : _root.venousPressure - Text { id: _venousText - anchors { - left: parent.left - top: parent.bottom - topMargin: 35 - } - text: qsTr("Venous") - font.pixelSize: Fonts.fontPixelPresseuresText - color: Colors.pressuresText - } -// onClicked: _root.clicked() + valueOutRangeNotify : _root.valueOutRangeNotify } + + TreatmentPressureComponent { id: _tmpRangeBar + title : qsTr("TMP:") + height : Variables.contentHeight / 3 + width : contentItem.width * 0.75 + barColor : Colors.pressuresTmpBar + + minimum : _root.tmpMinimum + lowerBound : _root.tmpLowerBound + upperBound : _root.tmpUpperBound + maximum : _root.tmpMaximum + pressure : _root.tmpPressure + + valueOutRangeNotify : _root.valueOutRangeNotify + } + + } }