From 631d9bead3aac19bcc5bdbd79df54e7aa216ecff Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 13 Oct 2014 13:43:15 +0300 Subject: Reset camera target when setting a preset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3a1595530a976b73144109cf2eef72a188831a10 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/q3dcamera.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/datavisualization') diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 9c3e4c08..273b8415 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -421,6 +421,9 @@ void Q3DCamera::setCameraPreset(CameraPreset preset) break; } + // All presets target the center of the graph + setTarget(zeroVector); + if (d_ptr->m_activePreset != preset) { d_ptr->m_activePreset = preset; setDirty(true); @@ -604,6 +607,8 @@ void Q3DCamera::setTarget(const QVector3D &target) newTarget.setZ(1.0f); if (d_ptr->m_requestedTarget != newTarget) { + if (d_ptr->m_activePreset != CameraPresetNone) + d_ptr->m_activePreset = CameraPresetNone; d_ptr->m_requestedTarget = newTarget; setDirty(true); emit targetChanged(newTarget); -- cgit v1.2.3