summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-09-13 09:18:49 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-09-13 09:33:30 +0300
commitdbacb74d0c66e959f2486d16d0115ec60c73542e (patch)
treef92ab04947bd079012e7280b08682c9dbc19450f /src/datavisualization/engine
parentbf50e48feddf827b387f5ae3de2199ea284157a7 (diff)
Rotation in slice view issue fixed
Task-number: QTRD-2264 Change-Id: I4bc51367f33f2c0855e6e7e9380b3798b4ad3a61 Change-Id: I4bc51367f33f2c0855e6e7e9380b3798b4ad3a61 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 03a0f416..bcccf833 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -669,6 +669,10 @@ QDataVis::CameraPreset Abstract3DController::cameraPreset() const
void Abstract3DController::setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint distance)
{
+ // disable camera movement if in slice view
+ if (scene()->isSlicingActivated())
+ return;
+
m_horizontalRotation = qBound(-180.0f, horizontal, 180.0f);
m_verticalRotation = qBound(0.0f, vertical, 90.0f);
m_scene->camera()->setZoomLevel(qBound(10, distance, 500));