diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2014-02-19 11:22:24 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2014-02-20 09:28:00 +0200 |
| commit | e0034b33b9e88aae416d6af0751f5826b9b03924 (patch) | |
| tree | 4dc98d6540f0d778d47959763f3f382be97ae996 /src/datavisualization/engine/surface3drenderer_p.h | |
| parent | c81ffed936c4f87bdcb5966ac3561b77c3f5b4c2 (diff) | |
Scaling and offset support for multiseries
Task-number: QTRD-2868
Change-Id: I47cb0c6e26e2445ca39426e6a52963b80ebb3816
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer_p.h')
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 4649fd72..1d57e85d 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -65,10 +65,6 @@ private: GLfloat m_scaleZ; GLfloat m_scaleXWithBackground; GLfloat m_scaleZWithBackground; - GLfloat m_surfaceScaleX; - GLfloat m_surfaceScaleZ; - GLfloat m_surfaceOffsetX; - GLfloat m_surfaceOffsetZ; GLfloat m_minVisibleColumnValue; GLfloat m_maxVisibleColumnValue; GLfloat m_minVisibleRowValue; @@ -131,11 +127,14 @@ private: void checkFlatSupport(SurfaceSeriesRenderCache *cache); void updateObjects(SurfaceSeriesRenderCache *cache, bool dimensionChanged); void updateSliceDataModel(const QPoint &point); + QPoint mapCoordsToSampleSpace(SurfaceSeriesRenderCache *cache, const QPointF &coords); + void findMatchingRow(float y, int &sample, int direction, QSurfaceDataArray &dataArray); + void findMatchingColumn(float x, int &sample, int direction, QSurfaceDataArray &dataArray); void updateSliceObject(SurfaceSeriesRenderCache *cache, const QPoint &point); void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality); void updateTextures(); void initShaders(const QString &vertexShader, const QString &fragmentShader); - QRect calculateSampleRect(const QSurfaceDataArray &array); + QRect calculateSampleRect(SurfaceSeriesRenderCache *cache, const QSurfaceDataArray &array); void loadBackgroundMesh(); void loadGridLineMesh(); void loadLabelMesh(); |