From aaf51bfad10e0eac7a8ee64e36aab5f0c1119468 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 2 Apr 2014 12:16:05 +0300
Subject: Enable querying selection label via API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../qmloscilloscope/qml/qmloscilloscope/main.qml   | 31 +++++++++-------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml')

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,
-- 
cgit v1.2.3