diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
tree | bed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualization/engine/q3dscene.cpp | |
parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'src/datavisualization/engine/q3dscene.cpp')
-rw-r--r-- | src/datavisualization/engine/q3dscene.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index be64b928..9464bc8d 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -16,22 +16,17 @@ ** ****************************************************************************/ -#include "datavisualizationglobal_p.h" - -#include "q3dscene.h" #include "q3dscene_p.h" #include "q3dcamera_p.h" #include "q3dlight_p.h" -#include <QtCore/qmath.h> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! * \class Q3DScene * \inmodule QtDataVisualization * \brief Q3DScene class provides description of the 3D scene being visualized. - * \since Qt Data Visualization 1.0 + * \since QtDataVisualization 1.0 * * The 3D scene contains a single active camera and a single active light source. * Visualized data is assumed to be at a fixed location. @@ -260,8 +255,12 @@ void Q3DScene::setSecondarySubViewport(const QRect &secondarySubViewport) * * This property contains the coordinates for the user input that should be processed * by the scene as selection. If this is set to value other than invalidSelectionPoint() the - * graph tries to select a data item at the given \a point within the primary viewport. - * After the rendering pass the property is returned to its default state of invalidSelectionPoint(). + * graph tries to select a data item, axis label, or a custom item at the given \a point within + * the primary viewport. + * After the rendering pass the property is returned to its default state of + * invalidSelectionPoint(). + * + * \sa QAbstract3DGraph::selectedElement */ void Q3DScene::setSelectionQueryPosition(const QPoint &point) { @@ -411,6 +410,7 @@ void Q3DScene::setActiveLight(Q3DLight *light) d_ptr->m_sceneDirty = true; emit activeLightChanged(light); + emit d_ptr->needRender(); } } @@ -554,7 +554,6 @@ void Q3DScenePrivate::setWindowSize(const QSize &size) m_windowSize = size; updateGLViewport(); m_changeTracker.windowSizeChanged = true; - m_sceneDirty = true; emit needRender(); } } |