diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 12:19:18 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 14:22:32 +0200 |
| commit | e029d0ea1d486dd3dbbfa4519a2125da202f22e4 (patch) | |
| tree | fc9f87f637a9adcca5a555355d96717d43eddc77 /tests/spectrum | |
| parent | e7e01ec065d3874d28e9e28d213783c4275d8813 (diff) | |
Change qreals to floats
+ Fix default axes to sensible
+ Fix some rounding errors in surface creation
Task-number: QTRD-2622
Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'tests/spectrum')
| -rw-r--r-- | tests/spectrum/spectrumapp/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index e9913706..8b18e467 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -75,7 +75,7 @@ MainApp::MainApp(Q3DBars *window) // Disable grid m_chart->setGridVisible(false); // Disable auto-scaling of height by defining explicit range - m_chart->valueAxis()->setRange(0.0, 1.0); + m_chart->valueAxis()->setRange(0.0f, 1.0f); // Disable shadows m_chart->setShadowQuality(QDataVis::ShadowQualityNone); #if USE_CONES @@ -87,15 +87,15 @@ MainApp::MainApp(Q3DBars *window) m_chart->setBarType(QDataVis::MeshStyleCones, true); // Adjust zoom manually; automatic zoom level calculation does not work well with negative // spacings (in setBarSpacing) - m_chart->setCameraPosition(10.0f, 5.0f, 70); + m_chart->setCameraPosition(10.0f, 5.0f, 70.0f); #else // Set bar specifications; make them twice as wide as they're deep - m_chart->setBarThickness(2.0); + m_chart->setBarThickness(2.0f); m_chart->setBarSpacing(QSizeF(0.0, 0.0)); // Set bar type, flat bars m_chart->setBarType(QDataVis::MeshStyleBars, false); // Adjust camera position - m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75); + m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75.0f); #endif // Set color scheme m_chart->setBarColor(QColor(Qt::red)); @@ -141,7 +141,7 @@ void MainApp::spectrumChanged(qint64 position, qint64 length, const FrequencySpe for ( ; i != end; ++i) { const FrequencySpectrum::Element e = *i; if (e.frequency >= m_lowFreq && e.frequency < m_highFreq) { - (*data)[barIndex(e.frequency)].setValue(qMax(data->at(barIndex(e.frequency)).value(), qreal(e.amplitude))); + (*data)[barIndex(e.frequency)].setValue(qMax(data->at(barIndex(e.frequency)).value(), float(e.amplitude))); } } m_chart->seriesList().at(0)->dataProxy()->insertRow(0, data); |