diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-22 10:00:08 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-22 10:15:56 +0200 |
commit | 892bd7976b2980947adf216b8afc5c6f2a63ce65 (patch) | |
tree | f38a25d0ebffd164b713860d8ed6b3f365398280 /src/datavisualization/engine/q3dscene.cpp | |
parent | 072b7614c6b1a1f32a4baebb8260866d72ee9299 (diff) |
Made jira tasks of TODOs, part 2
+ commented-out code and qDebugs removed
Task-number: QTRD-2398
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dscene.cpp')
-rw-r--r-- | src/datavisualization/engine/q3dscene.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index d2cf9c58..19672484 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -208,8 +208,10 @@ bool Q3DScene::isPointInPrimarySubView(const QPoint &point) int x = point.x(); int y = point.y(); int areaMinX = d_ptr->m_primarySubViewport.x(); - int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_primarySubViewport.x() + d_ptr->m_primarySubViewport.width(); - int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_primarySubViewport.y() + d_ptr->m_primarySubViewport.height(); + int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_primarySubViewport.x() + + d_ptr->m_primarySubViewport.width(); + int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_primarySubViewport.y() + + d_ptr->m_primarySubViewport.height(); int areaMinY = d_ptr->m_viewport.y() + d_ptr->m_primarySubViewport.y(); return ( x > areaMinX && x < areaMaxX && y > areaMinY && y < areaMaxY ); @@ -226,8 +228,10 @@ bool Q3DScene::isPointInSecondarySubView(const QPoint &point) int x = point.x(); int y = point.y(); int areaMinX = d_ptr->m_secondarySubViewport.x(); - int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_secondarySubViewport.x() + d_ptr->m_secondarySubViewport.width(); - int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_secondarySubViewport.y() + d_ptr->m_secondarySubViewport.height(); + int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_secondarySubViewport.x() + + d_ptr->m_secondarySubViewport.width(); + int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_secondarySubViewport.y() + + d_ptr->m_secondarySubViewport.height(); int areaMinY = d_ptr->m_viewport.y() + d_ptr->m_secondarySubViewport.y(); return ( x > areaMinX && x < areaMaxX && y > areaMinY && y < areaMaxY ); @@ -607,7 +611,8 @@ void Q3DScenePrivate::updateGLViewport() { // Update GL viewport m_glViewport.setX(m_viewport.x() * m_devicePixelRatio); - m_glViewport.setY((m_windowSize.height() - (m_viewport.y() + m_viewport.height())) * m_devicePixelRatio); + m_glViewport.setY((m_windowSize.height() - (m_viewport.y() + m_viewport.height())) + * m_devicePixelRatio); m_glViewport.setWidth(m_viewport.width() * m_devicePixelRatio); m_glViewport.setHeight(m_viewport.height() * m_devicePixelRatio); @@ -622,12 +627,17 @@ void Q3DScenePrivate::updateGLViewport() void Q3DScenePrivate::updateGLSubViewports() { m_glPrimarySubViewport.setX((m_primarySubViewport.x() + m_viewport.x()) * m_devicePixelRatio); - m_glPrimarySubViewport.setY((m_windowSize.height() - (m_primarySubViewport.y() + m_viewport.y() + m_primarySubViewport.height())) * m_devicePixelRatio); + m_glPrimarySubViewport.setY((m_windowSize.height() - (m_primarySubViewport.y() + m_viewport.y() + + m_primarySubViewport.height())) + * m_devicePixelRatio); m_glPrimarySubViewport.setWidth(m_primarySubViewport.width() * m_devicePixelRatio); m_glPrimarySubViewport.setHeight(m_primarySubViewport.height() * m_devicePixelRatio); m_glSecondarySubViewport.setX(m_secondarySubViewport.x() * m_devicePixelRatio); - m_glSecondarySubViewport.setY((m_windowSize.height() - (m_secondarySubViewport.y() + m_viewport.y() + m_secondarySubViewport.height())) * m_devicePixelRatio); + m_glSecondarySubViewport.setY((m_windowSize.height() - (m_secondarySubViewport.y() + + m_viewport.y() + + m_secondarySubViewport.height())) + * m_devicePixelRatio); m_glSecondarySubViewport.setWidth(m_secondarySubViewport.width() * m_devicePixelRatio); m_glSecondarySubViewport.setHeight(m_secondarySubViewport.height() * m_devicePixelRatio); } |