Gradient adjustment logic was broken.

Bug in adjustment logic caused adjustment to happen pretty much always.

Task-number: QTRD-3374
Change-Id: Id6151d2d3eb8369bbf9252e4eb4b76ed57fb1f3c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

2 files changed, 9 insertions, 5 deletions

diff --git a/src/datavisualization/utils/scatterobjectbufferhelper.cpp b/src/datavisualization/utils/scatterobjectbufferhelper.cpp
index 6135c225..8925a7a4 100644
--- a/src/datavisualization/utils/scatterobjectbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterobjectbufferhelper.cpp
@@ -233,8 +233,8 @@ uint ScatterObjectBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache
     const ScatterRenderItemArray &renderArray = cache->renderArray();
     const bool updateAll = (cache->updateIndices().size() == 0);
     const int updateSize = updateAll ? renderArray.size() : cache->updateIndices().size();
-    const float yAdjustment = 0.1f / gradientTextureHeight;
-    const float flippedYAdjustment = 0.9f / gradientTextureHeight;
+    const float yAdjustment = 0.1f;
+    const float flippedYAdjustment = 0.9f;
 
     QVector2D uv;
     uv.setX(0.0f);
@@ -250,11 +250,11 @@ uint ScatterObjectBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache
         // Avoid values near gradient texel boundary, as this causes artifacts
         // with some graphics cards.
         const float floorY = float(qFloor(y * gradientTextureHeight));
-        const float diff = y - floorY;
+        const float diff = (y * gradientTextureHeight) - floorY;
         if (diff < yAdjustment)
-            y += yAdjustment;
+            y += yAdjustment / gradientTextureHeight;
         else if (diff > flippedYAdjustment)
-            y -= yAdjustment;
+            y -= yAdjustment / gradientTextureHeight;
         uv.setY(y);
 
         int offset = pos * uvsCount;
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index e5a7acc3..7d625d3f 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -47,6 +47,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_chart->setAxisX(new QValue3DAxis);
     m_chart->setAxisY(new QValue3DAxis);
     m_chart->setAxisZ(new QValue3DAxis);
+    m_chart->axisY()->setLabelFormat(QStringLiteral("%.7f"));
     static_cast<Q3DInputHandler *>(m_chart->activeInputHandler())->setZoomAtTargetEnabled(true);
 
     createAndAddSeries();
@@ -736,6 +737,9 @@ void ScatterDataModifier::changeBunch()
                 items[i].setY(-1.0f);
             else  if (i == 4)
                 items[i].setY(1.2f);
+//            else
+//                items[i].setY(0.1001f - (0.00001f * float(i)));
+
         }
 
         m_targetSeries->dataProxy()->setItems(0, items);