diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-22 10:00:08 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-22 10:15:56 +0200 |
| commit | 892bd7976b2980947adf216b8afc5c6f2a63ce65 (patch) | |
| tree | f38a25d0ebffd164b713860d8ed6b3f365398280 /src/datavisualization/data/qheightmapsurfacedataproxy.cpp | |
| parent | 072b7614c6b1a1f32a4baebb8260866d72ee9299 (diff) | |
Made jira tasks of TODOs, part 2
+ commented-out code and qDebugs removed
Task-number: QTRD-2398
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data/qheightmapsurfacedataproxy.cpp')
| -rw-r--r-- | src/datavisualization/data/qheightmapsurfacedataproxy.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp index feb6cded..d71f65a4 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp @@ -296,9 +296,7 @@ const QHeightMapSurfaceDataProxyPrivate *QHeightMapSurfaceDataProxy::dptrc() con return static_cast<const QHeightMapSurfaceDataProxyPrivate *>(d_ptr.data()); } -// // QHeightMapSurfaceDataProxyPrivate -// QHeightMapSurfaceDataProxyPrivate::QHeightMapSurfaceDataProxyPrivate(QHeightMapSurfaceDataProxy *q) : QSurfaceDataProxyPrivate(q), @@ -321,7 +319,8 @@ QHeightMapSurfaceDataProxy *QHeightMapSurfaceDataProxyPrivate::qptr() return static_cast<QHeightMapSurfaceDataProxy *>(q_ptr); } -void QHeightMapSurfaceDataProxyPrivate::setValueRanges(float minX, float maxX, float minZ, float maxZ) +void QHeightMapSurfaceDataProxyPrivate::setValueRanges(float minX, float maxX, + float minZ, float maxZ) { bool minXChanged = false; bool maxXChanged = false; @@ -509,10 +508,10 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve() for (; j < lastCol; j++) newRow[j].setPosition(QVector3D((float(j) * xMul) + m_minXValue, float(bits[bitCount + (j * 4)]), - zVal)); + zVal)); newRow[j].setPosition(QVector3D(m_maxXValue, float(bits[bitCount + (j * 4)]), - zVal)); + zVal)); } } else { // Not grayscale, we'll need to calculate height from RGB |