diff options
Diffstat (limited to 'src/datavisualization/input')
4 files changed, 12 insertions, 18 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 1a197418..f0044096 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -18,7 +18,6 @@ #include "datavisualizationglobal_p.h" #include "q3dinputhandler_p.h" -#include "q3dcamera_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -37,7 +36,7 @@ const float rotationSpeed = 100.0f; * \class Q3DInputHandler * \inmodule QtDataVisualization * \brief Basic wheel mouse based input handler. - * \since Qt Data Visualization 1.0 + * \since QtDataVisualization 1.0 * * Q3DInputHandler is the basic input handler for wheel mouse type of input devices. * @@ -88,19 +87,18 @@ Q3DInputHandler::~Q3DInputHandler() */ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos) { -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(Q_OS_IOS) Q_UNUSED(event); Q_UNUSED(mousePos); #else if (Qt::LeftButton == event->button()) { if (scene()->isSlicingActive()) { - if (scene()->isPointInPrimarySubView(mousePos)) { + if (scene()->isPointInPrimarySubView(mousePos)) setInputView(InputViewOnPrimary); - } else if (scene()->isPointInSecondarySubView(mousePos)) { + else if (scene()->isPointInSecondarySubView(mousePos)) setInputView(InputViewOnSecondary); - } else { + else setInputView(InputViewNone); - } } else { // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); @@ -128,7 +126,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos) { Q_UNUSED(event); -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(Q_OS_IOS) Q_UNUSED(mousePos); #else if (QAbstract3DInputHandlerPrivate::InputStateRotating == d_ptr->m_inputState) { @@ -147,7 +145,7 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) { Q_UNUSED(event); -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(Q_OS_IOS) Q_UNUSED(mousePos); #else if (QAbstract3DInputHandlerPrivate::InputStateRotating == d_ptr->m_inputState) { diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 9e1e314c..5109631f 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "qabstract3dinputhandler_p.h" -#include "q3dscene.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -25,7 +24,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \class QAbstract3DInputHandler * \inmodule QtDataVisualization * \brief The base class for implementations of input handlers. - * \since Qt Data Visualization 1.0 + * \since QtDataVisualization 1.0 * * QAbstract3DInputHandler is the base class that is subclassed by different input handling implementations * that take input events and translate those to camera and light movements. Input handlers also translate @@ -56,7 +55,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * * This type is uncreatable. * - * For AbstractInputHandler3D enums, see \l QAbstract3DInputHandler::InputView + * For AbstractInputHandler3D enums, see \l{QAbstract3DInputHandler::InputView}. */ /*! @@ -231,7 +230,8 @@ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputH m_previousInputPos(QPoint(0,0)), m_inputView(QAbstract3DInputHandler::InputViewNone), m_inputPosition(QPoint(0,0)), - m_scene(0) + m_scene(0), + m_isDefaultHandler(false) { } diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index fa5a2315..b4b2eda2 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -55,9 +55,6 @@ public: int m_prevDistance; QPoint m_previousInputPos; - GLfloat m_defaultXRotation; - GLfloat m_defaultYRotation; - private: QAbstract3DInputHandler::InputView m_inputView; QPoint m_inputPosition; diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index d40fbf5a..30f31d4a 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "qtouch3dinputhandler_p.h" -#include "q3dcamera_p.h" #include <QtCore/QTimer> #include <QtCore/qmath.h> @@ -39,7 +38,7 @@ const int maxZoomLevel = 500; * \class QTouch3DInputHandler * \inmodule QtDataVisualization * \brief Basic touch display based input handler. - * \since Qt Data Visualization 1.0 + * \since QtDataVisualization 1.0 * * QTouch3DInputHandler is the basic input handler for touch screen devices. * |