summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3dcontroller_p.h
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2013-09-17 11:48:54 +0300
committerMika Salmela <mika.salmela@digia.com>2013-09-17 12:04:49 +0300
commitab8343a2df664545575b5233b74ea0329647c7df (patch)
treebe72d823cbfb9fa22d1d2c9ff90229252e02d74e /src/datavisualization/engine/surface3dcontroller_p.h
parentdbc876fa0f9c5c87d0ee250efa4d7a211bde3ddf (diff)
Misc bug fixes
- Enabled zooming on Surface C++ api - User modified gradient takes effect - Scene pointer is updated to selection pointer - Font changing is listened on selection pointer and label's are generated using selected font - Selection label format copied from scatter. Looks to be very handy. - Check for OpenGL 1.5 version and block coarse surface if below - Added some theme handling. Not sure if the bug is fully fixed. Probably requires shadow fixes to be fully similar to others. - HAHAA. Now even single rows and columns supported. Even one value will produce surface Task-number: QTRD-2279 Task-number: QTRD-2265 Task-number: QTRD-2261 Task-number: QTRD-2269 Task-number: QTRD-2268 Task-number: QTRD-2272 Change-Id: Id34d843b2898e4cf1e4dde10ce23e0eaab4738a7 Signed-off-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3dcontroller_p.h')
-rw-r--r--src/datavisualization/engine/surface3dcontroller_p.h28
1 files changed, 19 insertions, 9 deletions
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 55597922..290b18b4 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -38,21 +38,31 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
class Surface3DRenderer;
+struct Surface3DChangeBitField {
+ bool gradientColorChanged : 1;
+ bool smoothStatusChanged : 1;
+ bool surfaceGridChanged : 1;
+
+ Surface3DChangeBitField() :
+ gradientColorChanged(true),
+ smoothStatusChanged(true),
+ surfaceGridChanged(true)
+ {
+ }
+};
+
class QT_DATAVISUALIZATION_EXPORT Surface3DController : public Abstract3DController
{
Q_OBJECT
private:
+ Surface3DChangeBitField m_changeTracker;
+
+ // Rendering
Surface3DRenderer *m_renderer;
- QList<qreal> m_series; // TODO: TEMP
- int m_dataWidth;
- int m_dataDepth;
- bool m_smoothSurface;
- bool m_surfaceGrid;
-
- GLint m_segmentCount;
- GLfloat m_segmentStep;
- GLfloat m_segmentMinimum;
+ bool m_isSmoothSurfaceEnabled;
+ bool m_isSurfaceGridEnabled;
+ QLinearGradient m_userDefinedGradient;
public:
explicit Surface3DController(QRect rect);