diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:46:49 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:48:41 +0200 |
| commit | bc317e1ea56c85a41413a5ddde4112623a1b4913 (patch) | |
| tree | e51b2b78f81940cfc70b49953308197080cd368f /examples | |
| parent | 03cbebd97354b7251e87dcde8adc6b49eba973e5 (diff) | |
| parent | 46ef32d424d7e0209e52528286e31f656c654289 (diff) | |
Merge branch 'develop'
Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/datavisualization/qmloscilloscope/datasource.cpp | 4 | ||||
| -rw-r--r-- | examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index f466b2b0..353c878b 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(); @@ -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) { 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 { |