From e0034b33b9e88aae416d6af0751f5826b9b03924 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Wed, 19 Feb 2014 11:22:24 +0200 Subject: Scaling and offset support for multiseries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2868 Change-Id: I47cb0c6e26e2445ca39426e6a52963b80ebb3816 Reviewed-by: Tomi Korpipää Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/surfaceseriesrendercache_p.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/datavisualization/engine/surfaceseriesrendercache_p.h') diff --git a/src/datavisualization/engine/surfaceseriesrendercache_p.h b/src/datavisualization/engine/surfaceseriesrendercache_p.h index a0d23e45..c0a3cec3 100644 --- a/src/datavisualization/engine/surfaceseriesrendercache_p.h +++ b/src/datavisualization/engine/surfaceseriesrendercache_p.h @@ -35,6 +35,8 @@ #include "qsurface3dseries_p.h" #include "surfaceobject_p.h" +#include + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Abstract3DRenderer; @@ -59,7 +61,7 @@ public: inline bool isValid() const { return m_valid; } inline SurfaceObject *surfaceObject() { return m_surfaceObj; } inline SurfaceObject *sliceSurfaceObject() { return m_sliceSurfaceObj; } - inline const QRect sampleSpace() const { return m_sampleSpace; } + inline const QRect &sampleSpace() const { return m_sampleSpace; } inline void setSampleSpace(const QRect &sampleSpace) { m_sampleSpace = sampleSpace; } inline QSurface3DSeries *series() const { return static_cast(m_series); } inline QSurfaceDataArray &dataArray() { return m_dataArray; } @@ -76,6 +78,13 @@ public: selection <= m_selectionIdEnd; } inline bool isFlatStatusDirty() const { return m_flatStatusDirty; } inline void setFlatStatusDirty(bool status) { m_flatStatusDirty = status; } + inline void setScale(const QVector3D &scale) { m_scale = scale; } + inline const QVector3D &scale() const { return m_scale; } + inline void setOffset(const QVector3D &offset) { m_offset = offset; } + inline const QVector3D &offset() const { return m_offset; } + // m_MVPMatrix is volatile, used only for optimizing rendering a bit + inline void setMVPMatrix(const QMatrix4x4 &matrix) { m_MVPMatrix = matrix; } + inline const QMatrix4x4 &MVPMatrix() { return m_MVPMatrix; } protected: bool m_surfaceVisible; @@ -91,6 +100,9 @@ protected: uint m_selectionIdEnd; bool m_flatChangeAllowed; bool m_flatStatusDirty; + QVector3D m_scale; + QVector3D m_offset; + QMatrix4x4 m_MVPMatrix; bool m_valid; bool m_objectDirty; -- cgit v1.2.3