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

Collapse all files

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

             /****************************************************************************
              **
              ** Copyright (C) 2013 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include "chartbarcategoryaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoryaxis_p.h"
             #include "chartlayout_p.h"
             #include <QFontMetrics>
             #include <QDebug>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis, QGraphicsItem* item)
                 : HorizontalAxis(axis, item, true),
                   m_categoriesAxis(axis)
             {
                 QObject::connect(m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
                 handleCategoriesChanged();
             }
             ChartBarCategoryAxisX::~ChartBarCategoryAxisX()
             {
             }
             QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
             {
                 QVector<qreal> points;
                 const QRectF& gridRect = gridGeometry();
                 qreal range = max() - min();
                 const qreal delta = gridRect.width() / range;
                 if (delta < 2)
                     return points;
                 qreal adjustedMin = min() + 0.5;
                 qreal offset = (ceil(adjustedMin) - adjustedMin) * delta;
                 int count = qFloor(range);
                 if (count < 1)
                     return points;
                 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;
             }
             QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const
             {
                 QStringList result ;
                 const QRectF &gridRect = gridGeometry();
                 qreal d = (max() - min()) / gridRect.width();
                 for (int i = 0; i < layout.count() - 1; ++i) {
                     qreal x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5));
                     if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
                         result << m_categoriesAxis->categories().at(x);
                     } else {
                         // No label for x coordinate
                         result << "";
                     }
                 }
                 result << "";
                 return result;
             }
             void ChartBarCategoryAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createCategoryLabels(layout));
                 HorizontalAxis::updateGeometry();
             }
             void ChartBarCategoryAxisX::handleCategoriesChanged()
             {
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = m_categoriesAxis->categories();
                 qreal width = 0; // Width is irrelevant for X axes with interval labels
                 qreal height = 0;
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
                         height = boundingRect.height() + labelPadding();
                         height += base.height();
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize:{
                         int labelHeight = 0;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelHeight = qMax(rect.height(), labelHeight);
                         }
                         height = labelHeight + labelPadding();
                         height += base.height();
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                       break;
                 }
                 return sh;
             }
             #include "moc_chartbarcategoryaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
              **
              ** Copyright (C) 2013 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include "chartbarcategoryaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoryaxis_p.h"
             #include "chartlayout_p.h"
             #include <qmath.h>
             #include <QFontMetrics>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item, true),
                   m_categoriesAxis(axis)
             {
                 QObject::connect( m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
                 handleCategoriesChanged();
             }
             ChartBarCategoryAxisY::~ChartBarCategoryAxisY()
             {
             }
             QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
             {
                 QVector<qreal> points;
                 const QRectF& gridRect = gridGeometry();
                 qreal range = max() - min();
                 const qreal delta = gridRect.height() / range;
                 if (delta < 2)
                     return points;
                 qreal adjustedMin = min() + 0.5;
                 qreal offset = (ceil(adjustedMin) - adjustedMin) * delta;
                 int count = qFloor(range);
                 if (count < 1)
                     return points;
                 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;
             }
             QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& layout) const
             {
                 QStringList result;
                 const QRectF &gridRect = gridGeometry();
                 qreal d = (max() - min()) / gridRect.height();
                 for (int i = 0; i < layout.count() - 1; ++i) {
                     qreal x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
                     if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
                         result << m_categoriesAxis->categories().at(x);
                     } else {
                         // No label for x coordinate
                         result << "";
                     }
                 }
                 result << "";
                 return result;
             }
             void ChartBarCategoryAxisY::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createCategoryLabels(layout));
                 VerticalAxis::updateGeometry();
             }
             void ChartBarCategoryAxisY::handleCategoriesChanged()
             {
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = m_categoriesAxis->categories();
                 qreal width = 0;
                 qreal height = 0; // Height is irrelevant for Y axes with interval labels
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
                         width = boundingRect.width() + labelPadding();
                         width += base.width();
                         if (base.width() > 0)
                             width += labelPadding();
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize:{
                         int labelWidth = 0;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelWidth = qMax(rect.width(), labelWidth);
                         }
                         width = labelWidth + labelPadding() + 1;
                         width += base.width();
                         if (base.width() > 0)
                             width += labelPadding();
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                       break;
                   }
                   return sh;
             }
             #include "moc_chartbarcategoryaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartdatetimeaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qdatetimeaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QDateTime>
             #include <QFontMetrics>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartDateTimeAxisX::ChartDateTimeAxisX(QDateTimeAxis *axis, QGraphicsItem* item)
                 : HorizontalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis,SIGNAL(formatChanged(QString)),this, SLOT(handleFormatChanged(QString)));
             }
             ChartDateTimeAxisX::~ChartDateTimeAxisX()
             {
             }
             QVector<qreal> ChartDateTimeAxisX::calculateLayout() const
             {
                 int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
-                const qreal deltaX = gridRect.width() / (tickCount - 1);
+                const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0);
-                for (int i = 0; i < tickCount; ++i) {
+                for (int i = 0; i < tickCount; ++i)
-                    int x = i * deltaX + gridRect.left();
+                    points[i] =  qreal(i) * deltaX + gridRect.left();
-                    points[i] = x;
                 return points;
             }
             void ChartDateTimeAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createDateTimeLabels(min(),max(), layout.size(),m_axis->format()));
                 HorizontalAxis::updateGeometry();
             }
             void ChartDateTimeAxisX::handleTickCountChanged(int tick)
             {
                 Q_UNUSED(tick)
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartDateTimeAxisX::handleFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createDateTimeLabels(min(),max(),m_axis->tickCount(),m_axis->format());
                 // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past
                 // first and last ticks. Base width is irrelevant.
                 qreal width = 0;
                 qreal height = 0;
                 if (ticksList.empty())
                     return sh;
                 switch (which) {
                 case Qt::MinimumSize:{
                     QRectF boundingRect = labelBoundingRect(fn, "...");
                     width = boundingRect.width() / 2.0;
                     height = boundingRect.height() + labelPadding();
                     height += base.height();
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelHeight = 0;
                     int firstWidth = -1;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelHeight = qMax(rect.height(), labelHeight);
                         width = rect.width();
                         if (firstWidth < 0)
                             firstWidth = width;
                     }
                     height = labelHeight + labelPadding();
                     height += base.height();
                     width = qMax(width, qreal(firstWidth)) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartdatetimeaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartdatetimeaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qdatetimeaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <QDateTime>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartDateTimeAxisY::ChartDateTimeAxisY(QDateTimeAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis,SIGNAL(formatChanged(QString)),this, SLOT(handleFormatChanged(QString)));
             }
             ChartDateTimeAxisY::~ChartDateTimeAxisY()
             {
             }
             QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
             {
                 int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
-                const qreal deltaY = gridRect.height() / (tickCount - 1);
+                const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0);
-                for (int i = 0; i < tickCount; ++i) {
+                for (int i = 0; i < tickCount; ++i)
-                    int y = i * -deltaY + gridRect.bottom();
+                    points[i] =  qreal(i) * -deltaY + gridRect.bottom();
-                    points[i] = y;
                 return points;
             }
             void ChartDateTimeAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createDateTimeLabels(min(),max(), layout.size(),m_axis->format()));
                 VerticalAxis::updateGeometry();
             }
             void ChartDateTimeAxisY::handleTickCountChanged(int tick)
             {
                 Q_UNUSED(tick)
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartDateTimeAxisY::handleFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createDateTimeLabels(min(),max(),m_axis->tickCount(),m_axis->format());
                 qreal width = 0;
                 // Height of vertical axis sizeHint indicates the maximum distance labels can extend past
                 // first and last ticks. Base height is irrelevant.
                 qreal height = 0;
                 if (ticksList.empty())
                     return sh;
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
                         width = boundingRect.width() + labelPadding();
                         width += base.width();
                         height = boundingRect.height() / 2.0;
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize: {
                         int labelWidth = 0;
                         int firstHeight = -1;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelWidth = qMax(rect.width(), labelWidth);
                             height = rect.height();
                             if (firstHeight < 0)
                                 firstHeight = height;
                         }
                         width = labelWidth + labelPadding() + 2; //two pixels of tolerance
                         width += base.width();
                         height = qMax(height, qreal(firstHeight)) / 2.0;
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartdatetimeaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartvalueaxisx_p.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include "qvalueaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartValueAxisX::ChartValueAxisX(QValueAxis *axis, QGraphicsItem* item )
                 : HorizontalAxis(axis, item),
                   m_axis(axis)
             {
             	QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartValueAxisX::~ChartValueAxisX()
             {
             }
             QVector<qreal> ChartValueAxisX::calculateLayout() const
             {
             	int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
-                const qreal deltaX = gridRect.width() / (tickCount - 1);
+                const qreal deltaX = gridRect.width() / (qreal(tickCount) - 1.0);
-                for (int i = 0; i < tickCount; ++i) {
+                for (int i = 0; i < tickCount; ++i)
-                    points[i] = i * deltaX + gridRect.left();
+                    points[i] = qreal(i) * deltaX + gridRect.left();
                 return points;
             }
             void ChartValueAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createValueLabels(min(),max(),layout.size(),m_axis->labelFormat()));
                 HorizontalAxis::updateGeometry();
             }
             void ChartValueAxisX::handleTickCountChanged(int tick)
             {
             	Q_UNUSED(tick);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartValueAxisX::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat());
                 // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past
                 // first and last ticks. Base width is irrelevant.
                 qreal width = 0;
                 qreal height = 0;
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
                         width = boundingRect.width() / 2.0;
                         height = boundingRect.height() + labelPadding();
                         height += base.height();
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize: {
                         int labelHeight = 0;
                         int firstWidth = -1;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelHeight = qMax(rect.height(), labelHeight);
                             width = rect.width();
                             if (firstWidth < 0)
                                 firstWidth = width;
                         }
                         height = labelHeight + labelPadding();
                         height += base.height();
                         width = qMax(width, qreal(firstWidth)) / 2.0;
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                         break;
                 }
                 return sh;
             }
             #include "moc_chartvalueaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartvalueaxisy_p.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include "qvalueaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartValueAxisY::ChartValueAxisY(QValueAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item),
                   m_axis(axis)
             {
             	QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartValueAxisY::~ChartValueAxisY()
             {
             }
             QVector<qreal> ChartValueAxisY::calculateLayout() const
             {
             	int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
-                const qreal deltaY = gridRect.height() / (tickCount - 1);
+                const qreal deltaY = gridRect.height() / (qreal(tickCount) - 1.0);
-                for (int i = 0; i < tickCount; ++i) {
+                for (int i = 0; i < tickCount; ++i)
-                    points[i] = i * -deltaY + gridRect.bottom();
+                    points[i] = qreal(i) * -deltaY + gridRect.bottom();
                 return points;
             }
             void ChartValueAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createValueLabels(min(),max(),layout.size(),m_axis->labelFormat()));
                 VerticalAxis::updateGeometry();
             }
             void ChartValueAxisY::handleTickCountChanged(int tick)
             {
             	Q_UNUSED(tick);
                 QGraphicsLayoutItem::updateGeometry();
             	if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartValueAxisY::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat());
                 qreal width = 0;
                 // Height of vertical axis sizeHint indicates the maximum distance labels can extend past
                 // first and last ticks. Base height is irrelevant.
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF boundingRect = labelBoundingRect(fn, "...");
                     width = boundingRect.width() + labelPadding();
                     width += base.width();
                     height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelWidth = 0;
                     int firstHeight = -1;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelWidth = qMax(rect.width(), labelWidth);
                         height = rect.height();
                         if (firstHeight < 0)
                             firstHeight = height;
                     }
                     width = labelWidth + labelPadding() + 2; //two pixels of tolerance
                     width += base.width();
                     height = qMax(height, qreal(firstHeight)) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartvalueaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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