HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2447:ba792163ba0e

Fix int-qreal rounding errors in axislayout calculations...

Miikka Heikkinen -

r2447:ba792163ba0e

parent child

Context file:

r2447:ba792163ba0e

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +1 -1

                  points.resize(count + 2);
                  for (int i = 0; i < count + 2; ++i)
-                     points[i] = offset + (i * delta) + gridRect.left();
+                     points[i] = offset + (qreal(i) * delta) + gridRect.left();
                  return points;
              }

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +1 -1

                  points.resize(count + 2);
                  for (int i = 0; i < count + 2; ++i)
-                     points[i] =  gridRect.bottom() - (i * delta) - offset;
+                     points[i] =  gridRect.bottom() - (qreal(i) * delta) - offset;
                  return points;
              }

src/axis/datetimeaxis/chartdatetimeaxisx.cpp +3 -5

                  QVector<qreal> points;
                  points.resize(tickCount);
                  const QRectF &gridRect = gridGeometry();
-                 const qreal deltaX = gridRect.width() / (tickCount - 1);
-                 for (int i = 0; i < tickCount; ++i) {
-                     int x = i * deltaX + gridRect.left();
-                     points[i] = x;
+                 }
+                 const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0);
+                 for (int i = 0; i < tickCount; ++i)
+                     points[i] =  qreal(i) * deltaX + gridRect.left();
                  return points;
              }

src/axis/datetimeaxis/chartdatetimeaxisy.cpp +3 -5

                  QVector<qreal> points;
                  points.resize(tickCount);
                  const QRectF &gridRect = gridGeometry();
-                 const qreal deltaY = gridRect.height() / (tickCount - 1);
-                 for (int i = 0; i < tickCount; ++i) {
-                     int y = i * -deltaY + gridRect.bottom();
-                     points[i] = y;
+                 }
+                 const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0);
+                 for (int i = 0; i < tickCount; ++i)
+                     points[i] =  qreal(i) * -deltaY + gridRect.bottom();
                  return points;
              }

src/axis/valueaxis/chartvalueaxisx.cpp +3 -4

                  points.resize(tickCount);
                  const QRectF &gridRect = gridGeometry();
-                 const qreal deltaX = gridRect.width() / (tickCount - 1);
-                 for (int i = 0; i < tickCount; ++i) {
-                     points[i] = i * deltaX + gridRect.left();
+                 }
+                 const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0);
+                 for (int i = 0; i < tickCount; ++i)
+                     points[i] = qreal(i) * deltaX + gridRect.left();
                  return points;
              }

src/axis/valueaxis/chartvalueaxisy.cpp +3 -4

                  const QRectF &gridRect = gridGeometry();
-                 const qreal deltaY = gridRect.height() / (tickCount - 1);
-                 for (int i = 0; i < tickCount; ++i) {
-                     points[i] = i * -deltaY + gridRect.bottom();
+                 }
+                 const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0);
+                 for (int i = 0; i < tickCount; ++i)
+                     points[i] = qreal(i) * -deltaY + gridRect.bottom();
                  return points;
              }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages