diff options
| author | Tero Ahola <tero.ahola@digia.com> | 2012-11-27 13:34:49 +0200 |
|---|---|---|
| committer | Tero Ahola <tero.ahola@digia.com> | 2012-11-27 13:34:49 +0200 |
| commit | e292969eeb52802ce33ded4b8413f749dc38753e (patch) | |
| tree | 0e2f0a8bc9693a8c0e2fabb872f46065461ec230 /demos | |
| parent | 26696b77b7feda4ac7406d014d06f282a083b4a5 (diff) | |
Fixed a bug with axes duplicated in QML Oscilloscope
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml b/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml index ce30f428..1a7b2b0e 100644 --- a/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml +++ b/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml @@ -81,16 +81,16 @@ ChartView { // but the series have their own y-axes to make it possible to control the y-offset // of the "signal sources". if (type == "line") { - scopeView.createSeries(ChartView.SeriesTypeLine, "signal 1", createAxis(0, 1000), createAxis(-1, 4)); - scopeView.createSeries(ChartView.SeriesTypeLine, "signal 2", chartView.axisX(), createAxis(-10, 5)); + scopeView.createSeries(ChartView.SeriesTypeLine, "signal 1", axisX, axisY1); + scopeView.createSeries(ChartView.SeriesTypeLine, "signal 2", axisX, axisY2); } else if (type == "spline") { - scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 1", createAxis(0, 1000), createAxis(-1, 4)); - scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 2", chartView.axisX(), createAxis(-10, 5)); + scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 1", axisX, axisY1); + scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 2", axisX, axisY2); } else { - var series1 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 1", createAxis(0, 1000), createAxis(-1, 4)); + var series1 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 1", axisX, axisY1); series1.markerSize = 3; series1.borderColor = "transparent"; - var series2 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 2", chartView.axisX(), createAxis(-10, 5)); + var series2 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 2", axisX, axisY2); series2.markerSize = 3; series2.borderColor = "transparent"; } |