diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-02 12:16:05 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-03 09:27:54 +0300 |
| commit | aaf51bfad10e0eac7a8ee64e36aab5f0c1119468 (patch) | |
| tree | bd20d2ec028bf1acfe4dd418b3a639b17f75b591 /examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml | |
| parent | e076fa05488bb9f58393f0e636c97d07b6fb446d (diff) | |
Enable querying selection label via API
Also enable suppressing drawing the label on graph.
Selection label formatting was consequently moved from renderers
to series.
Task-number: QTRD-2896
Change-Id: Ia6a1a40298d8db0f54349de3eb27fb0b683dd302
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml')
| -rw-r--r-- | examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml index 81884154..5f5bfe1a 100644 --- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml @@ -19,7 +19,7 @@ import QtQuick 2.1 import QtQuick.Layouts 1.0 import QtQuick.Controls 1.0 -import QtDataVisualization 1.0 +import QtDataVisualization 1.1 import "." Item { @@ -72,9 +72,8 @@ Item { drawMode: Surface3DSeries.DrawSurface; flatShadingEnabled: false; meshSmooth: true - itemLabelFormat: "" - - onSelectedPointChanged: mainView.updateSelectionLabel() + itemLabelFormat: "@xLabel, @zLabel: @yLabel" + itemLabelVisible: false } //! [0] @@ -90,10 +89,7 @@ Item { interval: 1000 / frequencySlider.value running: true repeat: true - onTriggered: { - dataSource.update(surfaceSeries) - mainView.updateSelectionLabel() - } + onTriggered: dataSource.update(surfaceSeries) } //! [3] @@ -218,10 +214,18 @@ Item { Text { id: selectionText - text: "No selection" anchors.fill: parent verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter + + Binding on text { + when: surfaceSeries.itemLabel.length + value: surfaceSeries.itemLabel + } + Binding on text { + when: !surfaceSeries.itemLabel.length + value: "No selection" + } } } } @@ -285,15 +289,6 @@ Item { } - //! [1] - function updateSelectionLabel() { - selectionText.text = dataSource.selectionLabel(surfaceSeries, - surfaceGraph.axisX, - surfaceGraph.axisY, - surfaceGraph.axisZ) - } - //! [1] - //! [4] function generateData() { dataSource.generateData(mainView.sampleCache, mainView.sampleRows, |