From 20d1d25119e67724ac8fcb0a69451cd8c1fb984c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 30 Oct 2014 13:19:28 +0200 Subject: Fix crash on qmloscilloscope in Qt 5.4 Binding slider value to its minimum value is not correct, so just initialize it on component complete. Change-Id: Ia21ecbffdef84448b70c6b09d240ea4f854ca541 Reviewed-by: Mika Salmela --- examples/datavisualization/qmloscilloscope/datasource.cpp | 2 +- examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index f466b2b0..0bb5ec2b 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -45,7 +45,7 @@ void DataSource::generateData(int cacheCount, int rowCount, int columnCount, float xMin, float xMax, float yMin, float yMax, float zMin, float zMax) { - if (!cacheCount) + if (!cacheCount || !rowCount || !columnCount) return; clearData(); diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml index c2e6b70b..2ad43e97 100644 --- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml @@ -150,7 +150,7 @@ Item { maximumValue: minimumValue * 10 stepSize: mainView.sampleCache updateValueWhileDragging: false - value: minimumValue * 2 + Component.onCompleted: value = minimumValue * 2 } Rectangle { -- cgit v1.2.3 From 8a7c69cb943a1d0676549e7cee47863524e10fb6 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 31 Oct 2014 14:05:21 +0200 Subject: Fix qmloscilloscope linking issue on some envs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iab45f95e8ff0faacc5cf50fdf052bf2c69d7988a Reviewed-by: Tomi Korpipää --- examples/datavisualization/qmloscilloscope/datasource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index 0bb5ec2b..353c878b 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -84,7 +84,7 @@ void DataSource::generateData(int cacheCount, int rowCount, int columnCount, float colWave = float(qSin((2.0 * M_PI * colMod) - (1.0 / 2.0 * M_PI)) + 1.0); float y = (colWave * ((float(qSin(rowColWaveAngleMul * colMod) + 1.0)))) * rowColWaveMul - + (0.15f * float(rand()) / float(RAND_MAX)) * yRangeMod; + + (0.15f * float(qrand()) / float(RAND_MAX)) * yRangeMod; int index = k + cacheIndexAdjustment; if (index >= columnCount) { -- cgit v1.2.3