##// END OF EJS Templates
Fix legend markers truncation...
Fix legend markers truncation Geometry calculation was using different font than sizehint calculation. Also, sizehint calculation was still using QFontMetrics instead of textBoundingRect(). Task-number: QTRD-1927 Change-Id: Ibfda7847cbc1f8e22377b01a4fdd946095302aba Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

File last commit:

r2539:74f3dbde7a75
r2544:9f0ff996f528
Show More
chartlogvalueaxisx.cpp
137 lines | 4.5 KiB | text/x-c | CppLexer
/****************************************************************************
**
** 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 "chartlogvalueaxisx_p.h"
#include "chartpresenter_p.h"
#include "qlogvalueaxis.h"
#include "abstractchartlayout_p.h"
#include <QGraphicsLayout>
#include <qmath.h>
#include <QDebug>
QTCOMMERCIALCHART_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 = log10(m_axis->max()) / log10(m_axis->base());
qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
qreal leftEdge = logMin < logMax ? logMin : logMax;
qreal ceilEdge = ceil(leftEdge);
int tickCount = qAbs(ceil(logMax) - ceil(logMin));
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();
if (layout.isEmpty())
return;
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 = log10(m_axis->max()) / log10(m_axis->base());
qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
int tickCount = qAbs(ceil(logMax) - ceil(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(QString(" "));
// 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(), "...", 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"
QTCOMMERCIALCHART_END_NAMESPACE