diff options
author | Mika Salmela <mika.salmela@digia.com> | 2014-02-06 12:56:54 +0200 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2014-02-06 13:00:59 +0200 |
commit | e91237b54c2f58eaa8a2ce36bf016e2d8e8588f2 (patch) | |
tree | ec99b80a217b2e316a280c299fe5bc84edd7eb1b /tests/surfacetest/graphmodifier.h | |
parent | 427e7f5f5c62f728e159462dd28ae1ef76761d75 (diff) |
Multiseries support for surface
Task-number: QTRD-2767
Change-Id: Ifa7ca07f2afdb27974ad20819f0a4646293764b0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/surfacetest/graphmodifier.h')
-rw-r--r-- | tests/surfacetest/graphmodifier.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index 8ccff62f..308db1f0 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -25,6 +25,9 @@ #include <QSlider> #include <QTimer> #include <QLabel> +#include <QCheckBox> + +#define MULTI_SERIES using namespace QtDataVisualization; @@ -41,10 +44,27 @@ public: explicit GraphModifier(Q3DSurface *graph); ~GraphModifier(); + void toggleSeries1(bool enabled); + void toggleSeries2(bool enabled); + void toggleSeries3(bool enabled); + void toggleSeries4(bool enabled); void toggleSmooth(bool enabled); void toggleSurfaceGrid(bool enable); void toggleSurface(bool enable); void toggleSeriesVisible(bool enable); + void toggleSmoothS2(bool enabled); + void toggleSurfaceGridS2(bool enable); + void toggleSurfaceS2(bool enable); + void toggleSeries2Visible(bool enable); + void toggleSmoothS3(bool enabled); + void toggleSurfaceGridS3(bool enable); + void toggleSurfaceS3(bool enable); + void toggleSeries3Visible(bool enable); + void toggleSmoothS4(bool enabled); + void toggleSurfaceGridS4(bool enable); + void toggleSurfaceS4(bool enable); + void toggleSeries4Visible(bool enable); + void toggleSqrtSin(bool enable); void togglePlane(bool enable); void setHeightMapData(bool enable); @@ -55,6 +75,10 @@ public: void setAxisRangeSliderZ(QSlider *slider) { m_axisRangeSliderZ = slider; } void setAxisMinSliderX(QSlider *slider) { m_axisMinSliderX = slider; } void setAxisMinSliderZ(QSlider *slider) { m_axisMinSliderZ = slider; } + void setSeries1CB(QCheckBox *cb) { m_series1CB = cb; } + void setSeries2CB(QCheckBox *cb) { m_series2CB = cb; } + void setSeries3CB(QCheckBox *cb) { m_series3CB = cb; } + void setSeries4CB(QCheckBox *cb) { m_series4CB = cb; } void adjustXCount(int count); void adjustZCount(int count); void adjustXRange(int range); @@ -92,16 +116,26 @@ public slots: void handleAxisZChanged(QValue3DAxis *axis); private: + void fillSeries(); void resetArrayAndSliders(QSurfaceDataArray *array, float minZ, float maxZ, float minX, float maxX); Q3DSurface *m_graph; + QSurface3DSeries *m_multiseries[4]; + QSurface3DSeries *m_series1; + QSurface3DSeries *m_series2; + QSurface3DSeries *m_series3; + QSurface3DSeries *m_series4; QSlider *m_gridSliderX; QSlider *m_gridSliderZ; QSlider *m_axisRangeSliderX; QSlider *m_axisRangeSliderZ; QSlider *m_axisMinSliderX; QSlider *m_axisMinSliderZ; + QCheckBox *m_series1CB; + QCheckBox *m_series2CB; + QCheckBox *m_series3CB; + QCheckBox *m_series4CB; bool m_gridSlidersLocked; int m_xCount; int m_zCount; @@ -119,6 +153,11 @@ private: QLabel *m_selectionInfoLabel; QSurface3DSeries *m_theSeries; QSurface3DSeries::DrawFlags m_drawMode; + QSurface3DSeries::DrawFlags m_drawMode2; + QSurface3DSeries::DrawFlags m_drawMode3; + QSurface3DSeries::DrawFlags m_drawMode4; + float m_limitX; + float m_limitZ; }; #endif |