Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -rf91362971e3b7af39c96e20fd553cdbd49741f85 -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision f91362971e3b7af39c96e20fd553cdbd49741f85) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) @@ -60,8 +60,9 @@ minimum : _root.minimum maximum : _root.maximum value : _root.value + gradientStart : Colors.progressBarGradientStart + gradientEnd : Colors.progressBarGradientEnd - color : Colors.highlightProgressBar onClicked : progressClicked() } Index: sources/gui/qml/components/ProgressRect.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 --- sources/gui/qml/components/ProgressRect.qml (.../ProgressRect.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/ProgressRect.qml (.../ProgressRect.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) @@ -28,7 +28,15 @@ RangeRect { id: _root property real value : 0 property real margin : Variables.progressbarRectMargin + property color gradientStart : _root.color + property color gradientEnd : _root.color + gradient: Gradient { + orientation : Gradient.Horizontal + GradientStop { position: 0.0; color: gradientStart} + GradientStop { position: 1.0; color: gradientEnd } + } + QtObject { id: _private property int length: if ( value < minimum ) { 0 Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rf91362971e3b7af39c96e20fd553cdbd49741f85 -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision f91362971e3b7af39c96e20fd553cdbd49741f85) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) @@ -54,6 +54,8 @@ readonly property color highlightProgressBar : "#3d8eef" readonly property color highlightMedProgressBar : "#1b2b3e" readonly property color textProgressBar : "#88a3c5" + readonly property color progressBarGradientStart : "#12949D" + readonly property color progressBarGradientEnd : "#73D8DF" readonly property color textRangeMarker : white readonly property color rangeMarker : white @@ -84,6 +86,7 @@ readonly property color pressuresText : white readonly property color pressuresArterialBar : "#c568ed" readonly property color pressuresVenousBar : "#31bcdb" + readonly property color pressuresTmpBar : "#31bcdb" readonly property color pressuresOutOfRangeBg : red readonly property color pressureBorderActive : "#cccccc" // this is the active border around the red Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) @@ -4,47 +4,53 @@ // Project // Qml imports -//import "qrc:/globals" -//import "qrc:/components" +import "qrc:/globals" +import "qrc:/components" -import "../../../globals" -import "../../../components" -import "../" - Row { id: _row - property alias minimum : _rangeBar.minimum - property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum + property alias minimum : _rangeBar.minimum + property alias maximum : _rangeBar.maximum + property alias lowerBound : _rangeBar.lowerBound + property alias upperBound : _rangeBar.upperBound + property alias pressure : _rangeBar.value + property alias title : _title.text + property color barColor : Colors.backgroundRangeRect + property bool valueOutRangeNotify : true + property int barHeight : 25 + property int titleSize : 35 + property int valueSize : 60 - RangeBar { id: _rangeBar + spacing: Variables.defaultMargin * 2 - width : contentItem.width * 0.75 - height : 25 - rangebar.color: Colors.pressuresArterialBar - markerOutRangeNotify: _root.valueOutRangeNotify + Text { id: _title + width : 100 + height : 50 + color : Colors.pressuresText + font { + pixelSize : _row.titleSize + weight : Font.DemiBold + } + verticalAlignment : Text.AlignVCenter + } - minimum : _root.arterialMinimum - lowerBound : _root.arterialLowerBound - upperBound : _root.arterialUpperBound - maximum : _root.arterialMaximum - value : _root.arterialPressure - color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color - - Text { id: _arterialText - anchors { - left: parent.left - top: parent.bottom - topMargin: 35 - } - text: qsTr("Arterial") - font.pixelSize: Fonts.fontPixelPresseuresText - color: Colors.pressuresText + Text { id: _value + width : 100 + height : 50 + text : pressure + color : Colors.pressuresText + font { + pixelSize : _row.valueSize + weight : Font.Bold } + verticalAlignment : Text.AlignVCenter + } -// onClicked: _root.clicked() + RangeBar { id: _rangeBar + height : barHeight + width : _row.width * 0.60 + rangebar.color : barColor + markerOutRangeNotify: _root.valueOutRangeNotify + color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color } } 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 + } + + } }