summaryrefslogtreecommitdiffstats
path: root/examples/datavisualization/qmloscilloscope/qml
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-03 10:36:46 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-03 10:44:39 +0300
commit9beca180adc3109e9e258cbf54459960b33fa7d6 (patch)
tree97a3377cb26d9d9e6964c878bc2bfd97b28f67ad /examples/datavisualization/qmloscilloscope/qml
parentd946344ac21393e4b08e42e657d217a0981840f9 (diff)
Misc fixes for bugs found during examples testing
- 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ää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/datavisualization/qmloscilloscope/qml')
-rw-r--r--examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml17
1 files changed, 8 insertions, 9 deletions
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"
}
}
}