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/surfacetest/graphmodifier.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/surfacetest/graphmodifier.h')
| -rw-r--r-- | tests/surfacetest/graphmodifier.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index 5f1a252a..223a6854 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -41,7 +41,7 @@ public: Map }; - explicit GraphModifier(Q3DSurface *graph); + explicit GraphModifier(Q3DSurface *graph, QWidget *parentWidget); ~GraphModifier(); void toggleSeries1(bool enabled); @@ -112,8 +112,9 @@ public: void massiveTestAppendAndScroll(); void testAxisReverse(); void testDataOrdering(); - void setAspectRatio(int ratio); + void setHorizontalAspectRatio(int ratio); + void setSurfaceTexture(bool enabled); public slots: void changeShadowQuality(int quality); @@ -121,6 +122,7 @@ public slots: void flipViews(); void changeSelectionMode(int mode); void timeout(); + void graphQueryTimeout(); void handleAxisXChanged(QValue3DAxis *axis); void handleAxisYChanged(QValue3DAxis *axis); @@ -131,6 +133,11 @@ public slots: void toggleAxisTitleFixed(bool enabled); void toggleXAscending(bool enabled); void toggleZAscending(bool enabled); + void togglePolar(bool enabled); + void setCameraTargetX(int value); + void setCameraTargetY(int value); + void setCameraTargetZ(int value); + void setGraphMargin(int value); private: void fillSeries(); @@ -184,6 +191,11 @@ private: float m_multiSampleOffsetX[4]; float m_multiSampleOffsetZ[4]; QSurfaceDataArray m_massiveTestCacheArray; + QVector3D m_cameraTarget; + QWidget *m_parentWidget; + QTimer m_graphPositionQueryTimer; + bool m_ascendingX; + bool m_ascendingZ; }; #endif |