3 files changed, 9 insertions, 6 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));
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index f721a375..51f0670a 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -59,12 +59,11 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos
         setInputPosition(QPoint(0, 0));
     } else if (Qt::RightButton == event->button()) {
         // disable rotating when in slice view
-        setInputState(QDataVis::InputRotating);
+        if (!scene()->isSlicingActivated())
+            setInputState(QDataVis::InputRotating);
         // update mouse positions to prevent jumping when releasing or repressing a button
         setInputPosition(mousePos);
     }
-    // TODO: Call actual camera class when it's been written.
-    //m_cameraHelper->updateMousePos(m_mousePos);}
 }
 
 void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos)
@@ -80,8 +79,8 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP
 void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos)
 {
     Q_UNUSED(event);
-    if (QDataVis::InputRotating == inputState()) {
 
+    if (QDataVis::InputRotating == inputState()) {
         // Calculate mouse movement since last frame
         QPointF rotations = scene()->camera()->rotations();
         GLfloat xRotation = rotations.x();
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 4df735a2..75ef0d0c 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -33,7 +33,7 @@ QTouch3DInputHandler::~QTouch3DInputHandler()
 void QTouch3DInputHandler::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (!scene()->isSlicingActivated()) {
-        setInputState( QDataVis::InputOnScene );
+        setInputState(QDataVis::InputOnScene);
         // update mouse positions to prevent jumping when releasing or repressing a button
         setInputPosition( event->pos() );
     }
@@ -45,7 +45,7 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event)
     points = event->touchPoints();
 
     if (!scene()->isSlicingActivated() && points.count() == 2) {
-        setInputState( QDataVis::InputOnPinch );
+        setInputState(QDataVis::InputOnPinch);
 
         QPointF distance = points.at(0).pos() - points.at(1).pos();
         int newDistance = distance.manhattanLength();