Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -501,7 +501,6 @@ .arg(mMotorCtlCurrent .value) .arg(mPWMDtCycle .value); LOG_DATUM(msg); - qDebug() << msg; if (ok) { vData += mRefUFVol .value; Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -30,8 +30,7 @@ property alias color : _progressRect.color property alias bgColor : _root.color - property alias markerHeight: _marker.height - property alias markerHandle: _marker.hasHandle + property alias marker : _marker height : Variables.progressbarHeight Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -38,6 +38,9 @@ property int markerBoundHeight : Variables.rangeMarkerHeightShort property color markerBoundColor : Colors.rangeMarkerShort + property bool minTextHorizontalCenter: true + property bool maxTextHorizontalCenter: true + RangeRect { id: _rangeRect x : ((parent.width * (lowerBound - parent.minimum)) / (parent.maximum - parent.minimum)) height : parent.height @@ -50,6 +53,9 @@ minText.visible: true maxText.visible: true + minText.anchors.leftMargin : minTextHorizontalCenter ? -minText.width / 2 : 0 + maxText.anchors.rightMargin : maxTextHorizontalCenter ? -maxText.width / 2 : 0 + RangeMarker { id: _rangeMarkerLowerBound text.visible: false height : markerBoundHeight @@ -63,7 +69,6 @@ color : markerBoundColor anchors.left: parent.right } - } RangeMarker { id: _rangeMarkerValue @@ -74,22 +79,4 @@ height : markerHeight color : markerColor } - - //property real margin : Variables.rangeRectMargin - // - //QtObject { id: _private - // property int length: ((parent.width * (value - minimum)) / (maximum - minimum) - (margin * 2)) - //} - // - //width : _private.length - // - //// progress Rects require to show the current values as their maxText values - //maxText.text: value - // - //anchors { - // left : parent.left - // top : parent.top - // bottom : parent.bottom - // margins : margin - //} } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -58,4 +58,13 @@ readonly property color line : "#094266" + readonly property color pressuresText : "white" + readonly property color pressuresArterialBar : "#31bcdb" + readonly property color pressuresVenousBar : "#c568ed" + + readonly property color infusionText : "white" + readonly property color infusionValue : "white" + readonly property color infusionUnit : "#708795" + + } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -22,8 +22,8 @@ * which is going to be used in the project */ QtObject { - readonly property int fontPixelButton : 12 * 2 - readonly property int fontPixelTitle : 12 * 3.5 + readonly property int fontPixelButton : 24 + readonly property int fontPixelTitle : 42 readonly property int fontPixelTouchAreaTitle : 16 @@ -35,4 +35,11 @@ readonly property int fontPixelRangeMarker : 16 readonly property int fontPixelRangeRectText : 14 + + readonly property int fontPixelPresseuresText : 22 + + readonly property int fontPixelInfusionText : 22 + readonly property int fontPixelInfusionValue : 32 + readonly property int fontPixelInfusionUnit : 22 + } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r9391d4058233e096350d9dc3ced79aed8ed93b38 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) @@ -59,4 +59,6 @@ readonly property int progressbarHeight : 30 + readonly property int progressbarInfusionHeight : 5 + } 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: {