HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2283:ed9af3142ed9

LogDomains: calculateDomainPoint implemented

Marek Rosa -

r2283:ed9af3142ed9

parent child

Context file:

r2283:ed9af3142ed9

demos/chartviewer/charts/domain/linelogxlogy.cpp +1 -1

                     }
                     QLogValueAxis *axisX= new QLogValueAxis();
-                    axisX->setBase(1.2);
+                    axisX->setBase(2);
                     QLogValueAxis *axisY= new QLogValueAxis();
                     axisY->setBase(2);
                     foreach (QAbstractSeries *series, chart->series()) {

src/axis/logvalueaxis/qlogvalueaxis.cpp +6 -3

             void QLogValueAxis::setBase(qreal base)
             {
                 // check if base is correct
-                if (base <= 0 || qFuzzyCompare(base, 1))
+                if (qFuzzyCompare(base, 1))
                     return;
-                Q_D(QLogValueAxis);
+                if (base > 0) {
-                d->m_base = base;
+                    Q_D(QLogValueAxis);
+                    d->m_base = base;
+                    emit d->baseChanged(base);
+                }
             }
             qreal QLogValueAxis::base() const

src/axis/logvalueaxis/qlogvalueaxis_p.h +3 0

                 void setRange(const QVariant &min, const QVariant &max);
                 int tickCount() const;
+                Q_SIGNALS:
+                void baseChanged(qreal base);
                 protected:
                 qreal m_min;
                 qreal m_max;

src/domain/logxlogydomain.cpp +6 -4

             QPointF LogXLogYDomain::calculateDomainPoint(const QPointF &point) const
             {
-                const qreal deltaX = m_size.width() / (m_maxX - m_minX);
+                const qreal leftEdgeX= m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;
-                const qreal deltaY = m_size.height() / (m_maxY - m_minY);
+                const qreal leftEdgeY = m_logMinY < m_logMaxY ? m_logMinY : m_logMaxY;
-                qreal x = point.x() / deltaX + m_minX;
+                const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);
-                qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;
+                const qreal deltaY = m_size.height() / qAbs(m_logMaxY - m_logMinY);
+                qreal x = qPow(m_logBaseX, leftEdgeX + point.x() / deltaX);
+                qreal y = qPow(m_logBaseY, leftEdgeY + (m_size.height() - point.y()) / deltaY);
                 return QPointF(x, y);
             }

src/domain/logxydomain.cpp +3 -2

             QPointF LogXYDomain::calculateDomainPoint(const QPointF &point) const
             {
-                const qreal deltaX = m_size.width() / (m_maxX - m_minX);
+                const qreal leftEdgeX= m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;
+                const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);
                 const qreal deltaY = m_size.height() / (m_maxY - m_minY);
-                qreal x = point.x() / deltaX + m_minX;
+                qreal x = qPow(m_logBaseX, leftEdgeX + point.x() / deltaX);
                 qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;
                 return QPointF(x, y);
             }

src/domain/xlogydomain.cpp +3 -2

             QPointF XLogYDomain::calculateDomainPoint(const QPointF &point) const
             {
                 const qreal deltaX = m_size.width() / (m_maxX - m_minX);
-                const qreal deltaY = m_size.height() / (m_maxY - m_minY);
+                const qreal leftEdgeY = m_logMinY < m_logMaxY ? m_logMinY : m_logMaxY;
+                const qreal deltaY = m_size.height() / qAbs(m_logMaxY - m_logMinY);
                 qreal x = point.x() / deltaX + m_minX;
-                qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;
+                qreal y = qPow(m_logBaseY, leftEdgeY + (m_size.height() - point.y()) / deltaY);
                 return QPointF(x, y);
             }

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