summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/bars3dcontroller.cpp
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 /src/datavisualization/engine/bars3dcontroller.cpp
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 'src/datavisualization/engine/bars3dcontroller.cpp')
-rw-r--r--src/datavisualization/engine/bars3dcontroller.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index f289de46..cb7ba5cb 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -408,7 +408,7 @@ void Bars3DController::adjustAxisRanges()
int rowCount = proxy->rowCount();
if (rowCount)
rowCount--;
- categoryAxisX->dptr()->setRange(0.0, qreal(rowCount));
+ categoryAxisX->dptr()->setRange(0.0f, float(rowCount));
}
Q3DCategoryAxis *categoryAxisZ = static_cast<Q3DCategoryAxis *>(m_axisZ);
@@ -420,7 +420,7 @@ void Bars3DController::adjustAxisRanges()
}
if (columnCount)
columnCount--;
- categoryAxisZ->dptr()->setRange(0.0, qreal(columnCount));
+ categoryAxisZ->dptr()->setRange(0.0f, float(columnCount));
}
Q3DValueAxis *valueAxis = static_cast<Q3DValueAxis *>(m_axisY);
@@ -432,11 +432,11 @@ void Bars3DController::adjustAxisRanges()
if (limits.first < 0) {
// Call private implementation to avoid unsetting auto adjust flag
valueAxis->dptr()->setRange(limits.first, limits.second);
- } else if (limits.second == 0.0) {
+ } else if (limits.second == 0.0f) {
// Only zero value values in data set, set range to something.
- valueAxis->dptr()->setRange(0.0, 1.0);
+ valueAxis->dptr()->setRange(0.0f, 1.0f);
} else {
- valueAxis->dptr()->setRange(0.0, limits.second);
+ valueAxis->dptr()->setRange(0.0f, limits.second);
}
}
}