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 /src/datavisualization/engine/abstract3dcontroller.cpp | |
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 'src/datavisualization/engine/abstract3dcontroller.cpp')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index e185d322..b84bb2f7 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -528,7 +528,7 @@ void Abstract3DController::setSecondarySubViewport(const QRect &secondarySubView m_scene->setSecondarySubViewport(secondarySubViewport); } -void Abstract3DController::updateDevicePixelRatio(qreal ratio) +void Abstract3DController::updateDevicePixelRatio(float ratio) { m_scene->setDevicePixelRatio(ratio); } @@ -974,7 +974,7 @@ void Abstract3DController::handleAxisLabelsChangedBySender(QObject *sender) emitNeedRender(); } -void Abstract3DController::handleAxisRangeChanged(qreal min, qreal max) +void Abstract3DController::handleAxisRangeChanged(float min, float max) { Q_UNUSED(min) Q_UNUSED(max) @@ -1190,12 +1190,7 @@ Q3DAbstractAxis *Abstract3DController::createDefaultAxis(Q3DAbstractAxis::AxisOr Q3DValueAxis *Abstract3DController::createDefaultValueAxis() { // Default value axis has single segment, empty label format, and auto scaling - // TODO: Grid should be also hidden, but that is not currently controlled by axis Q3DValueAxis *defaultAxis = new Q3DValueAxis; - defaultAxis->setSegmentCount(1); - defaultAxis->setSubSegmentCount(1); - defaultAxis->setAutoAdjustRange(true); - defaultAxis->setLabelFormat(QString()); defaultAxis->d_ptr->setDefaultAxis(true); return defaultAxis; @@ -1204,9 +1199,7 @@ Q3DValueAxis *Abstract3DController::createDefaultValueAxis() Q3DCategoryAxis *Abstract3DController::createDefaultCategoryAxis() { // Default category axis has no labels - // TODO: Grid should be also hidden, but that is not currently controlled by axis. Q3DCategoryAxis *defaultAxis = new Q3DCategoryAxis; - defaultAxis->setAutoAdjustRange(true); defaultAxis->d_ptr->setDefaultAxis(true); return defaultAxis; } |