##// END OF EJS Templates
Fix issue with ghost axes being drawn when last axis removed...
Fix issue with ghost axes being drawn when last axis removed Change-Id: Id638bc225ef901301a4268530f574a2de6f2ff63 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

File last commit:

r2776:bc1f6aa59d42
r2836:7a48aa2a436d
Show More
chartlogvalueaxisy.cpp
136 lines | 4.7 KiB | text/x-c | CppLexer
/****************************************************************************
**
** 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));
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 (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