Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 -r1b24a85761c65a685fac98f396e244af97b94443 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 1b24a85761c65a685fac98f396e244af97b94443) @@ -15,6 +15,7 @@ // Qt import QtQuick 2.12 +import QtCharts 2.3 // Qml imports import "qrc:/globals" @@ -42,8 +43,6 @@ readonly property bool isSBInProgress : ( vHDTreatmentStates.sbRunning || vHDTreatmentStates.sbWaitPump ) - signal backClicked - // Components MainMenu { id: _treatmentMenu y : Variables.mainMenuHeight * -1 @@ -55,6 +54,11 @@ partitionWidth : 100 // Todo Important : max width should be the width for all bottons hasRightText : true hasLogo : true + onCurrentIndexChanged: { + console.debug(currentIndex) + if (currentIndex == 1) push(_treatmentTrending) + if (currentIndex == 0) pop() + } } TreatmentBloodPrime { id: _treatmentBloodPrime } @@ -78,6 +82,83 @@ } } + ScreenItem { id: _treatmentTrending + Timer { id: _timer + property real x1: 0 + property real x2: 0 + interval: 500 + running: _treatmentTrending.visible + repeat: true + onTriggered: { + x1 = x1 + 1 + x2 = x2 + 0.1 + + var r = Math.random() + _lineSerries1.append(x1, r * 10 ) + _lineSerries2.append(x2, r ) + } + } + Column { + anchors.fill: parent + anchors.topMargin: Variables.mainMenuHeight + Slider { id : _zoomSlider + width : parent.width + minimum : 0 + maximum : 2 + step : 0.1 + value : 0 + onValueChanged: _chartView.zoom(value) + } + TouchRect { + width : 50 + height : 50 + onClicked: _chartView.zoomReset() + } + + ChartView { id: _chartView + title: "Line" + width: parent.width + height: parent.height - _zoomSlider.height + antialiasing: true + backgroundColor: Colors.transparent + + legend.labelColor: Colors.white + + ValueAxis { id: xAxis1 + color: Colors.white + min: 0 + max: _timer.x1 + } + ValueAxis { id: yAxis1 + color: Colors.white + min: 0 + max: 10 + } + SplineSeries { id: _lineSerries1 + name: "LineSeries" + axisX: xAxis1 + axisY: yAxis1 + } + ValueAxis { id: xAxis2 + color: Colors.white + min: 0 + max: _timer.x2 + } + ValueAxis { id: yAxis2 + color: Colors.white + labelsColor: Colors.red + min: 0 + max: 10 + } + SplineSeries { id: _lineSerries2 + name: "LineSeries" + axisX: xAxis2 + axisY: yAxis2 + } + } + } + } + //// Treatment Adjustment Dialogs TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue)