From 9beca180adc3109e9e258cbf54459960b33fa7d6 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 3 Jun 2014 10:36:46 +0300 Subject: Misc fixes for bugs found during examples testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - qmlbars TableView year/month display got messed up when scrolled. - qmllegend black background on transparent item bug was back due to some changes in 5.3. Worked around the issue differently. - qmloscilloscope displayed warnings about circular property binding. - Incorrect count was used to determine amount of labels for rows in bar charts. Change-Id: Id5851019af258c256a92648561bb8ce766993b5c Reviewed-by: Tomi Korpipää --- .../qmloscilloscope/qml/qmloscilloscope/main.qml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'examples/datavisualization/qmloscilloscope') diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml index 1373d4f9..c2e6b70b 100644 --- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml @@ -82,6 +82,13 @@ Item { meshSmooth: true itemLabelFormat: "@xLabel, @zLabel: @yLabel" itemLabelVisible: false + + onItemLabelChanged: { + if (surfaceSeries.selectedPoint === surfaceSeries.invalidSelectionPosition) + selectionText.text = "No selection" + else + selectionText.text = surfaceSeries.itemLabel + } } //! [0] @@ -244,15 +251,7 @@ Item { 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" - } + text: "No selection" } } } -- cgit v1.2.3