HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2837:e6f5cbaa5aca

Draw the tick and label on logaxis when tick is exactly at high edge...

Miikka Heikkinen -

r2837:e6f5cbaa5aca

parent child

Context file:

r2837:e6f5cbaa5aca

Collapse all files

src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp +11 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/chartlogvalueaxisx_p.h>
             #include <private/chartpresenter_p.h>
             #include <QtCharts/QLogValueAxis>
             #include <private/abstractchartlayout_p.h>
             #include <QtWidgets/QGraphicsLayout>
             #include <QtCore/QtMath>
             #include <QtCore/QDebug>
             #include <cmath>
             QT_CHARTS_BEGIN_NAMESPACE
             ChartLogValueAxisX::ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem *item)
                 : HorizontalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis, SIGNAL(baseChanged(qreal)), this, SLOT(handleBaseChanged(qreal)));
                 QObject::connect(m_axis, SIGNAL(labelFormatChanged(QString)), this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartLogValueAxisX::~ChartLogValueAxisX()
             {
             }
             QVector<qreal> ChartLogValueAxisX::calculateLayout() const
             {
                 QVector<qreal> points;
                 qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
                 qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base());
                 qreal leftEdge = logMin < logMax ? logMin : logMax;
                 qreal ceilEdge = qCeil(leftEdge);
                 int tickCount = qAbs(qCeil(logMax) - qCeil(logMin));
+                // If the high edge sits exactly on the tick value, add a tick
+                qreal highValue = logMin < logMax ? logMax : logMin;
+                if (qFuzzyCompare(highValue, qreal(qCeil(highValue))))
+                    tickCount++;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaX = gridRect.width() / qAbs(logMax - logMin);
                 for (int i = 0; i < tickCount; ++i)
                     points[i] = (ceilEdge + qreal(i)) * deltaX - leftEdge * deltaX + gridRect.left();
                 return points;
             }
             void ChartLogValueAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxisElement::layout();
                 setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
                 HorizontalAxis::updateGeometry();
             }
             void ChartLogValueAxisX::handleBaseChanged(qreal base)
             {
                 Q_UNUSED(base);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartLogValueAxisX::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList;
                 qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
                 qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base());
                 int tickCount = qAbs(qCeil(logMax) - qCeil(logMin));
+                // If the high edge sits exactly on the tick value, add a tick
+                qreal highValue = logMin < logMax ? logMax : logMin;
+                if (qFuzzyCompare(highValue, qreal(qCeil(highValue))))
+                    tickCount++;
                 if (m_axis->max() > m_axis->min() && tickCount > 0)
                     ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat());
                 else
                     ticksList.append(QStringLiteral(" "));
                 // 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 = ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                            QStringLiteral("..."),
                                                                            axis()->labelsAngle());
                     width = boundingRect.width() / 2.0;
                     height = boundingRect.height() + labelPadding() + base.height() + 1.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     qreal labelHeight = 0.0;
                     qreal firstWidth = -1.0;
                     foreach (const QString& s, ticksList) {
                         QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelHeight = qMax(rect.height(), labelHeight);
                         width = rect.width();
                         if (firstWidth < 0.0)
                             firstWidth = width;
                     }
                     height = labelHeight + labelPadding() + base.height() + 1.0;
                     width = qMax(width, firstWidth) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartlogvalueaxisx_p.cpp"
             QT_CHARTS_END_NAMESPACE

src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp +11 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/chartlogvalueaxisy_p.h>
             #include <private/chartpresenter_p.h>
             #include <QtCharts/QLogValueAxis>
             #include <private/abstractchartlayout_p.h>
             #include <QtWidgets/QGraphicsLayout>
             #include <QtCore/QtMath>
             #include <QtCore/QDebug>
             #include <cmath>
             QT_CHARTS_BEGIN_NAMESPACE
             ChartLogValueAxisY::ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem *item)
                 : VerticalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis, SIGNAL(baseChanged(qreal)), this, SLOT(handleBaseChanged(qreal)));
                 QObject::connect(m_axis, SIGNAL(labelFormatChanged(QString)), this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartLogValueAxisY::~ChartLogValueAxisY()
             {
             }
             QVector<qreal> ChartLogValueAxisY::calculateLayout() const
             {
                 QVector<qreal> points;
                 qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
                 qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base());
                 qreal leftEdge = logMin < logMax ? logMin : logMax;
                 qreal ceilEdge = qCeil(leftEdge);
                 int tickCount = qAbs(qCeil(logMax) - qCeil(logMin));
+                // If the high edge sits exactly on the tick value, add a tick
+                qreal highValue = logMin < logMax ? logMax : logMin;
+                if (qFuzzyCompare(highValue, qreal(qCeil(highValue))))
+                    tickCount++;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaY = gridRect.height() / qAbs(logMax - logMin);
                 for (int i = 0; i < tickCount; ++i)
                     points[i] = (ceilEdge + qreal(i)) * -deltaY - leftEdge * -deltaY + gridRect.bottom();
                 return points;
             }
             void ChartLogValueAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxisElement::layout();
                 setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
                 VerticalAxis::updateGeometry();
             }
             void ChartLogValueAxisY::handleBaseChanged(qreal base)
             {
                 Q_UNUSED(base);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartLogValueAxisY::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList;
                 qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
                 qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base());
                 int tickCount = qAbs(qCeil(logMax) - qCeil(logMin));
+                // If the high edge sits exactly on the tick value, add a tick
+                qreal highValue = logMin < logMax ? logMax : logMin;
+                if (qFuzzyCompare(highValue, qreal(qCeil(highValue))))
+                    tickCount++;
                 if (m_axis->max() > m_axis->min() && tickCount > 0)
                     ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat());
                 else
                     ticksList.append(QStringLiteral(" "));
                 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 = ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                            QStringLiteral("..."),
                                                                            axis()->labelsAngle());
                     width = boundingRect.width() + labelPadding() + base.width() + 1.0;
                     height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     qreal labelWidth = 0.0;
                     qreal firstHeight = -1.0;
                     foreach (const QString& s, ticksList) {
                         QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelWidth = qMax(rect.width(), labelWidth);
                         height = rect.height();
                         if (firstHeight < 0.0)
                             firstHeight = height;
                     }
                     width = labelWidth + labelPadding() + base.width() + 2.0; //two pixels of tolerance
                     height = qMax(height, firstHeight) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartlogvalueaxisy_p.cpp"
             QT_CHARTS_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