HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2611:f23ac1927350

Fix logarithmic axis point calculation...

Titta Heikkala -

r2611:f23ac1927350

parent child

Context file:

r2611:f23ac1927350

Collapse all files

src/barchart/horizontal/bar/horizontalbarchartitem.cpp 0 -3

                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(value, category - barWidth / 2 + (set + 1)/setCount * barWidth), m_validData);
-                        if (!m_validData)
-                            return QVector<QRectF>();
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp 0 -2

                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : 0, category - barWidth/2), m_validData);
                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(100 * (value + sum)/categorySum, category + barWidth/2), m_validData);
-                        if (!m_validData)
-                             return QVector<QRectF>();
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());

src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +1 -2

                                 topLeft = domain()->calculateGeometryPoint(QPointF(set ? positiveSum : 0, category + barWidth / 2), m_validData);
                             positiveSum += value;
                         }
-                        if (!m_validData)
-                             return QVector<QRectF>();
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());

src/barchart/vertical/bar/barchartitem.cpp 0 -3

                         else
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0), m_validData);
-                        if (!m_validData)
-                             return QVector<QRectF>();
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());

src/barchart/vertical/percent/percentbarchartitem.cpp 0 -2

                         else
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? 100 * sum/categorySum : 0), m_validData);
-                        if (!m_validData)
-                             return QVector<QRectF>();
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());

src/barchart/vertical/stacked/stackedbarchartitem.cpp +1 -2

                                 bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0), m_validData);
                             positiveSum += value;
                         }
-                        if (!m_validData)
-                             return QVector<QRectF>();
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());

src/domain/logxlogydomain.cpp +19 -8

             QPointF LogXLogYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const
             {
+                const qreal deltaX = m_size.width() / qAbs(m_logRightX - m_logLeftX);
+                const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
+                qreal x(0);
+                qreal y(0);
                 if (point.x() > 0 && point.y() > 0) {
-                    const qreal deltaX = m_size.width() / qAbs(m_logRightX - m_logLeftX);
+                    x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - m_logLeftX * deltaX;
-                    const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
+                    y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();
-                    qreal x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - m_logLeftX * deltaX;
-                    qreal y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();
                     ok = true;
-                    return QPointF(x, y);
                 } else {
-                    qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
+                    qWarning() << "Logarithms of zero and negative values are undefined.";
                     ok = false;
-                    return QPointF();
+                    if (point.x() > 0)
+                        x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - m_logLeftX * deltaX;
+                    else
+                        x = 0;
+                    if (point.y() > 0) {
+                        y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY
+                                + m_size.height();
+                    } else {
+                        y = m_size.height();
+                    }
                 }
+                return QPointF(x, y);
             }
             QVector<QPointF> LogXLogYDomain::calculateGeometryPoints(const QList<QPointF> &vector) const
                         result[i].setX(x);
                         result[i].setY(y);
                     } else {
-                        qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
+                        qWarning() << "Logarithms of zero and negative values are undefined.";
                         return QVector<QPointF>();
                     }
                 }

src/domain/logxydomain.cpp +10 -9

             QPointF LogXYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const
             {
+                const qreal deltaX = m_size.width() / (m_logRightX - m_logLeftX);
+                const qreal deltaY = m_size.height() / (m_maxY - m_minY);
+                qreal x(0);
+                qreal y = (point.y() - m_minY) * -deltaY + m_size.height();
                 if (point.x() > 0) {
-                    const qreal deltaX = m_size.width() / (m_logRightX - m_logLeftX);
+                    x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - m_logLeftX * deltaX;
-                    const qreal deltaY = m_size.height() / (m_maxY - m_minY);
-                    qreal x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - m_logLeftX * deltaX;
-                    qreal y = (point.y() - m_minY) * -deltaY + m_size.height();
                     ok = true;
-                    return QPointF(x, y);
                 } else {
-                    qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
+                    x = 0;
+                    qWarning() << "Logarithms of zero and negative values are undefined.";
                     ok = false;
-                    return QPointF();
                 }
+                return QPointF(x, y);
             }
             QVector<QPointF> LogXYDomain::calculateGeometryPoints(const QList<QPointF> &vector) const
                         result[i].setX(x);
                         result[i].setY(y);
                     } else {
-                        qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
+                        qWarning() << "Logarithms of zero and negative values are undefined.";
                         return QVector<QPointF>();
                     }
                 }
                 return result;
             }

src/domain/xlogydomain.cpp +10 -9

             QPointF XLogYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const
             {
-                if (point.y() > 0) {
+                const qreal deltaX = m_size.width() / (m_maxX - m_minX);
-                    const qreal deltaX = m_size.width() / (m_maxX - m_minX);
+                const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
-                    const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
-                    qreal x = (point.x() - m_minX) * deltaX;
+                qreal x = (point.x() - m_minX) * deltaX;
-                    qreal y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();
+                qreal y(0);
+                if (point.y() > 0) {
+                    y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();
                     ok = true;
-                    return QPointF(x, y);
                 } else {
-                    qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
+                    y = m_size.height();
+                    qWarning() << "Logarithms of zero and negative values are undefined.";
                     ok = false;
-                    return QPointF();
                 }
+                return QPointF(x, y);
             }
             QVector<QPointF> XLogYDomain::calculateGeometryPoints(const QList<QPointF> &vector) const
                         result[i].setX(x);
                         result[i].setY(y);
                     } else {
-                        qWarning() << "Logarithm of negative value is undefined. Empty layout returned.";
+                        qWarning() << "Logarithms of zero and negative values are undefined.";
                         return QVector<QPointF>();
                     }
                 }

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