Index: sources/gui/qml/pages/TreatmentStart.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/gui/qml/pages/TreatmentStart.qml (.../TreatmentStart.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/pages/TreatmentStart.qml (.../TreatmentStart.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -112,7 +112,7 @@ y: 75 width : 175 height : 15 - rangebar.color: "#31bcdb" + rangebar.color: Colors.pressuresArterialBar value : 0 @@ -122,18 +122,29 @@ lowerBound: -300 upperBound: 100 NumberAnimation on value { - duration: 70000 /*_progressbar.r*/; - from: _arterialRangeBar.minimum; - to: _arterialRangeBar.maximum; - loops: Animation.Infinite; + duration: 70000 + from: _arterialRangeBar.minimum + to: _arterialRangeBar.maximum + loops: Animation.Infinite } + Text { id: _arterialText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Arterial") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText + } } - RangeBar { id: _venoudRangeBar + + RangeBar { id: _venousRangeBar x: 200 y: 75 width : 175 height : 15 - rangebar.color: "#c568ed" + rangebar.color: Colors.pressuresVenousBar value : 0 @@ -142,12 +153,23 @@ maximum: 800 lowerBound: -100 upperBound: 500 + NumberAnimation on value { - duration: 70000; - from: _venoudRangeBar.minimum; - to: _venoudRangeBar.maximum; - loops: Animation.Infinite; + duration: 70000 + from : _venousRangeBar.minimum + to : _venousRangeBar.maximum + loops : Animation.Infinite } + Text { id: _venousText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Venous") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText + } } } @@ -209,9 +231,62 @@ x: rightColumnX y: row3Y width: _flowsTouchArea.width + height: 200 isTouchable: false orientation: TouchArea.Orientation.Vertical title: qsTr("SOLUTION INFUSION") + + ProgressBar { id: _solutionInfusionProgressBar + y : 75 + width : parent.width + height : Variables.progressbarInfusionHeight + minText.visible : false + maxText.visible : false + marker.visible : false + + value : 0 + + // TEST : simulation code + minimum : 0 // TEST : only test values + maximum : 999 // TEST : only test values + NumberAnimation on value { + duration: 100000 + from: _solutionInfusionProgressBar.minimum + to: _solutionInfusionProgressBar.maximum + loops: Animation.Infinite + } + Text { id: _infusionText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + 10 // + 10 to be aligned with Pressure lables. + } + text: qsTr("Amount Delivered") + font.pixelSize: Fonts.fontPixelInfusionText + color: Colors.infusionText + Text { id: _infusionValue + anchors { + left: parent.right + baseline: parent.baseline + } + horizontalAlignment: Text.AlignRight + text: _solutionInfusionProgressBar.value + width: 60 + font.pixelSize: Fonts.fontPixelInfusionValue + color: Colors.pressuresText + } + Text { id: _infusionUnit + anchors { + left: parent.right + leftMargin: _infusionValue.width + 5 + baseline: parent.baseline + } + text: qsTr("mL") + font.pixelSize: Fonts.fontPixelInfusionUnit + color: Colors.infusionUnit + } + } + } } onVisibleChanged: {