summaryrefslogtreecommitdiffstats
path: root/tests/multigraphs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-25 12:19:18 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-25 14:22:32 +0200
commite029d0ea1d486dd3dbbfa4519a2125da202f22e4 (patch)
treefc9f87f637a9adcca5a555355d96717d43eddc77 /tests/multigraphs
parente7e01ec065d3874d28e9e28d213783c4275d8813 (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/multigraphs')
-rw-r--r--tests/multigraphs/data.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index f69c296e..dc4fcaec 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -217,14 +217,14 @@ void Data::setData(const QImage &image)
int limitsX = imageWidth / 2;
int limitsZ = imageHeight / 2;
- qreal height = 0;
+ float height = 0;
int count = 0;
for (int i = -limitsZ; i < limitsZ; i++, bitCount -= widthBits) {
for (int j = -limitsX; j < limitsX; j++) {
- height = qreal(bits[bitCount + ((j + limitsX) * 4)]) - 128.0;
+ height = float(bits[bitCount + ((j + limitsX) * 4)]) - 128.0;
if (height > -128) {
- ptrToDataArray->setPosition(QVector3D(qreal(j), height, qreal(i)));
+ ptrToDataArray->setPosition(QVector3D(float(j), height, float(i)));
ptrToDataArray++;
count++;
}
@@ -238,7 +238,7 @@ void Data::setData(const QImage &image)
for (int i = 0; i < imageHeight; i++, bitCount -= widthBits) {
QBarDataRow &newRow = *dataArray->at(i);
for (int j = 0; j < imageWidth; j++)
- newRow[j] = qreal(bits[bitCount + (j * 4)]);
+ newRow[j] = float(bits[bitCount + (j * 4)]);
}
m_bars->seriesList().at(0)->dataProxy()->resetArray(dataArray);