diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-20 09:58:22 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-20 10:01:25 +0300 |
commit | d8662133def955c4aedf83e9b035fbece35a6710 (patch) | |
tree | 17400fb99e06ff5fef1029e1a47c5bbfc58da2cc /src/datavisualization/engine | |
parent | 61f323fde93cf105fb2c70c74cf756211e5aba4f (diff) |
Surface: Implemented giving a height map via API
Task-number: QTRD-2273
Change-Id: Ib0c540d52711ced38421b744664de7eddd97b585
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index e93b3a2c..e64928eb 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -242,6 +242,7 @@ QRect Surface3DRenderer::calculateSampleRect(QSurfaceDataProxy *dataProxy) QRect sampleSpace(0, 0, dataProxy->columnCount(), dataProxy->rowCount()); // TODO: Calculate the actual sample rect, for now it is required data and axis ranges are the same +#if 0 if (m_axisCacheX.min() != dataProxy->minValueColumns() || m_axisCacheX.max() != dataProxy->maxValueColumns() || m_axisCacheZ.min() != dataProxy->minValueRows() || m_axisCacheZ.max() != dataProxy->maxValueRows()) { qWarning() << "Warning: Technology preview doesn't support axis ranges that are different from data ranges -" @@ -250,7 +251,7 @@ QRect Surface3DRenderer::calculateSampleRect(QSurfaceDataProxy *dataProxy) << m_axisCacheZ.min() << dataProxy->minValueRows() << "-" << m_axisCacheZ.max() << dataProxy->maxValueRows(); } - +#endif return sampleSpace; } |