summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-24 10:18:46 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-24 10:19:52 +0200
commit0823b8212508f7ea504e15e4649c103757d80389 (patch)
treeb76f72dd23d14d918149fb06bb34154623042d43
parent7139e43dec65fae9c5f2df6c762fdac50f62a768 (diff)
Fix the variable naming in findMatchingRow
Y -> Z Change-Id: I793b956212ba51c523f965c5f99db250d0cac1cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp10
-rw-r--r--src/datavisualization/engine/surface3drenderer_p.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 2a51094a..3bc15a94 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -476,16 +476,16 @@ QPoint Surface3DRenderer::mapCoordsToSampleSpace(SurfaceSeriesRenderCache *cache
return point;
}
-void Surface3DRenderer::findMatchingRow(float y, int &sample, int direction,
+void Surface3DRenderer::findMatchingRow(float z, int &sample, int direction,
QSurfaceDataArray &dataArray)
{
- int maxY = dataArray.size() - 1;
+ int maxZ = dataArray.size() - 1;
QSurfaceDataItem item = dataArray.at(sample)->at(0);
- float distance = qAbs(y - item.z());
+ float distance = qAbs(z - item.z());
int newSample = sample + direction;
- while (newSample >= 0 && newSample <= maxY) {
+ while (newSample >= 0 && newSample <= maxZ) {
item = dataArray.at(newSample)->at(0);
- float newDist = qAbs(y - item.z());
+ float newDist = qAbs(z - item.z());
if (newDist < distance) {
sample = newSample;
distance = newDist;
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 2614ecba..9945a1d4 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -127,7 +127,7 @@ private:
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 findMatchingRow(float z, 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);