Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r5c21e83a3fdc897cb99ac62e1cec0213f411cd73 -r1b24a85761c65a685fac98f396e244af97b94443 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5c21e83a3fdc897cb99ac62e1cec0213f411cd73) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 1b24a85761c65a685fac98f396e244af97b94443) @@ -98,41 +98,64 @@ _lineSerries2.append(x2, r ) } } - ChartView { - title: "Line" + Column { anchors.fill: parent - antialiasing: true - backgroundColor: Colors.transparent - ValueAxis { id: xAxis1 - color: Colors.white - min: 0 - max: _timer.x1 + anchors.topMargin: Variables.mainMenuHeight + Slider { id : _zoomSlider + width : parent.width + minimum : 0 + maximum : 2 + step : 0.1 + value : 0 + onValueChanged: _chartView.zoom(value) } - ValueAxis { id: yAxis1 - color: Colors.white - min: 0 - max: 10 + TouchRect { + width : 50 + height : 50 + onClicked: _chartView.zoomReset() } - SplineSeries { id: _lineSerries1 - name: "LineSeries" - axisX: xAxis1 - axisY: yAxis1 + + 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 + } } - ValueAxis { id: xAxis2 - color: Colors.white - min: 0 - max: _timer.x2 - } - ValueAxis { id: yAxis2 - color: Colors.white - min: 0 - max: 10 - } - SplineSeries { id: _lineSerries2 - name: "LineSeries" - axisX: xAxis2 - axisY: yAxis2 - } } }