Index: sources/gui/qml/pages/TreatmentStart.qml =================================================================== diff -u -r00e025a5d672cae66e592608792c17d98be54d19 -r732bc047743c99a157cf147f5313194867c1f5e3 --- sources/gui/qml/pages/TreatmentStart.qml (.../TreatmentStart.qml) (revision 00e025a5d672cae66e592608792c17d98be54d19) +++ sources/gui/qml/pages/TreatmentStart.qml (.../TreatmentStart.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) @@ -28,8 +28,8 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root - property int bloodFlow_MeasuredFlow_Precision: 0 - property int dialysateFlow_MeasuredFlow_Precision: 0 + property int bloodFlow_MeasuredFlow_Precision: 0 + property int dialysateInletFlow_MeasuredFlow_Precision: 0 property int leftColumnX : 40 @@ -59,7 +59,7 @@ extra: qsTr("mL") // unit labelFont.weight: Font.ExtraLight } , - TextRect { id: _dialysateFlow + TextRect { id: _dialysateInletFlow title: qsTr("Dialysate") label: "500" // value extra: qsTr("mL") // unit @@ -99,12 +99,56 @@ Line { x: 0; y: row2LineY; length: lineLength } TouchArea { id: _pressureTouchArea + clip: false x: leftColumnX y: row3Y width: _flowsTouchArea.width + height : 200 isTouchable: true - orientation: TouchArea.Orientation.Vertical + orientation: TouchArea.Orientation.Horizontal title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") + RangeBar { id: _arterialRangeBar + x: 0 + y: 75 + width : 175 + height : 15 + rangebar.color: "#31bcdb" + + value : 0 + + // TEST : simulation code + minimum : -400 + maximum : 400 + lowerBound: -300 + upperBound: 100 + NumberAnimation on value { + duration: 70000 /*_progressbar.r*/; + from: _arterialRangeBar.minimum; + to: _arterialRangeBar.maximum; + loops: Animation.Infinite; + } + } + RangeBar { id: _venoudRangeBar + x: 200 + y: 75 + width : 175 + height : 15 + rangebar.color: "#c568ed" + + value : 0 + + // TEST : simulation code + minimum: -100 + maximum: 800 + lowerBound: -100 + upperBound: 500 + NumberAnimation on value { + duration: 70000; + from: _venoudRangeBar.minimum; + to: _venoudRangeBar.maximum; + loops: Animation.Infinite; + } + } } // ---------- COLUMN RIGHT @@ -184,8 +228,8 @@ case GuiActions.BloodFlow: _bloodFlow.label = vData[GuiActions.BloodFlow_MeasuredFlow].toFixed(bloodFlow_MeasuredFlow_Precision); break - case GuiActions.DialysateFlow: - _dialysateFlow.label = vData[GuiActions.DialysateFlow_MeasuredFlow].toFixed(dialysateFlow_MeasuredFlow_Precision); + case GuiActions.DialysateInletFlow: + _dialysateInletFlow.label = vData[GuiActions.DialysateInletFlow_MeasuredFlow].toFixed(dialysateInletFlow_MeasuredFlow_Precision); break } }