diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /tests/barstest/chart.h | |
parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'tests/barstest/chart.h')
-rw-r--r-- | tests/barstest/chart.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index 47d29c25..9713d06c 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -20,7 +20,7 @@ #define CHARTMODIFIER_H #include <QtDataVisualization/q3dbars.h> -#include <QtDataVisualization/qabstract3dinputhandler.h> +#include <QtDataVisualization/q3dinputhandler.h> #include <QtDataVisualization/qbar3dseries.h> #include <QtDataVisualization/q3dtheme.h> #include <QFont> @@ -94,6 +94,13 @@ public: void addRemoveSeries(); void testItemAndRowChanges(); void reverseValueAxis(int enabled); + void setInputHandlerRotationEnabled(int enabled); + void setInputHandlerZoomEnabled(int enabled); + void setInputHandlerSelectionEnabled(int enabled); + void setInputHandlerZoomAtTargetEnabled(int enabled); + void setReflection(bool enabled); + void setReflectivity(int value); + void toggleCustomItem(); public slots: void flipViews(); @@ -115,6 +122,11 @@ public slots: void triggerRotation(); void handleValueAxisLabelsChanged(); void handleFpsChange(qreal fps); + void setCameraTargetX(int value); + void setCameraTargetY(int value); + void setCameraTargetZ(int value); + void setFloorLevel(int value); + void setGraphMargin(int value); signals: void shadowQualityChanged(int quality); @@ -159,7 +171,7 @@ private: QValue3DAxis *m_currentAxis; bool m_negativeValuesOn; bool m_useNullInputHandler; - QAbstract3DInputHandler *m_defaultInputHandler; + Q3DInputHandler *m_defaultInputHandler; Q3DTheme *m_ownTheme; Q3DTheme *m_builtinTheme; QTimer m_insertRemoveTimer; @@ -169,6 +181,7 @@ private: QTimer m_rotationTimer; QLabel *m_fpsLabel; QBar3DSeries *m_extraSeries; + QVector3D m_cameraTarget; }; #endif |