diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-30 13:22:05 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-31 08:05:46 +0200 |
commit | 23c544c4881a5b72fef9d02c40a81cf894ac3309 (patch) | |
tree | 38b1771c44d057a553cc4c808f9237f11c6d434e /src/datavisualization/engine/abstract3dcontroller_p.h | |
parent | 1eefb471180746dda5882344deecd750305fea21 (diff) |
Cleaning controller callbacks from renderers, part 1
Input state and position via synchronization
Task-number: QTRD-2216
Change-Id: If53530aa9f65a8668fb628ba86d367149a62e64f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller_p.h')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index dd5a56ce..e6ea33eb 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -81,6 +81,8 @@ struct Abstract3DChangeBitField { bool axisXLabelFormatChanged : 1; bool axisYLabelFormatChanged : 1; bool axisZLabelFormatChanged : 1; + bool inputStateChanged : 1; + bool inputPositionChanged : 1; Abstract3DChangeBitField() : positionChanged(true), @@ -115,7 +117,9 @@ struct Abstract3DChangeBitField { axisZSubSegmentCountChanged(true), axisXLabelFormatChanged(true), axisYLabelFormatChanged(true), - axisZLabelFormatChanged(true) + axisZLabelFormatChanged(true), + inputStateChanged(true), + inputPositionChanged(true) { } }; @@ -154,7 +158,6 @@ private: bool m_isBackgroundEnabled; bool m_isGridEnabled; QString m_objFile; - Q3DScene *m_scene; protected: @@ -281,7 +284,6 @@ public: bool isSlicingActive(); void setSlicingActive(bool isSlicing); - // override bar type with own mesh virtual void setMeshFileName(const QString &fileName); virtual QString meshFileName(); @@ -313,6 +315,7 @@ public slots: void handleAxisAutoAdjustRangeChanged(bool autoAdjust); void handleAxisLabelFormatChanged(const QString &format); void handleInputStateChanged(QDataVis::InputState state); + void handleInputPositionChanged(const QPoint &position); signals: void shadowQualityChanged(QDataVis::ShadowQuality quality); |