##// END OF EJS Templates
Fix axis geometry when there is no axis title...
Fix axis geometry when there is no axis title SizeHint won't include title padding when there is no title, yet updateGeometry() always assumed it was there when determining space for labels, causing truncated labels when title was missing. Also made missing/empty/hidden axis title work consistently. Now axis geometries should be updated correctly always when title text or visibility status changes. Task-number: QTRD-1903 Reviewed-by: Mika Salmela

File last commit:

r2412:38736d0999b4
r2415:65ea14fdb747
Show More
chartbarcategoryaxisy.cpp
146 lines | 4.3 KiB | text/x-c | CppLexer
/ src / axis / barcategoryaxis / chartbarcategoryaxisy.cpp
/****************************************************************************
**
** Copyright (C) 2012 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 "chartbarcategoryaxisy_p.h"
#include "chartpresenter_p.h"
#include "qbarcategoryaxis_p.h"
#include "chartlayout_p.h"
#include <qmath.h>
#include <QFontMetrics>
#include <QDebug>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis, QGraphicsItem* item)
: VerticalAxis(axis, item, true),
m_categoriesAxis(axis)
{
QObject::connect( m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
handleCategoriesChanged();
}
ChartBarCategoryAxisY::~ChartBarCategoryAxisY()
{
}
QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
{
QVector<qreal> points;
const QRectF& gridRect = gridGeometry();
qreal range = max() - min();
const qreal delta = gridRect.height()/range;
if(delta<2) return points;
qreal offset = - min() - 0.5;
offset = int(offset * delta)%int(delta);
int count = qFloor(range);
if(count < 1 ) return points;
points.resize(count+2);
for (int i = 0; i < count+2; ++i) {
points[i] = gridRect.bottom() - i * delta -offset;
}
return points;
}
QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& layout) const
{
QStringList result;
const QRectF &gridRect = gridGeometry();
qreal d = (max() - min()) / gridRect.height();
for (int i = 0; i < layout.count() - 1; ++i) {
qreal x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
result << m_categoriesAxis->categories().at(x);
} else {
// No label for x coordinate
result << "";
}
}
result << "";
return result;
}
void ChartBarCategoryAxisY::updateGeometry()
{
const QVector<qreal>& layout = ChartAxis::layout();
if (layout.isEmpty())
return;
setLabels(createCategoryLabels(layout));
VerticalAxis::updateGeometry();
}
void ChartBarCategoryAxisY::handleCategoriesChanged()
{
QGraphicsLayoutItem::updateGeometry();
if(presenter()) presenter()->layout()->invalidate();
}
QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
{
Q_UNUSED(constraint)
QFontMetrics fn(font());
QSizeF sh;
QSizeF base = VerticalAxis::sizeHint(which, constraint);
QStringList ticksList = m_categoriesAxis->categories();
qreal width=0;
qreal height=0;
switch (which) {
case Qt::MinimumSize: {
QRectF boundingRect = labelBoundingRect(fn, "...");
width = boundingRect.width() + labelPadding();
width += base.width();
if (base.width() > 0)
width += labelPadding();
height = qMax(boundingRect.height(), base.height());
sh = QSizeF(width, height);
break;
}
case Qt::PreferredSize:{
int labelWidth = 0;
foreach (const QString& s, ticksList) {
QRect rect = labelBoundingRect(fn, s);
labelWidth = qMax(rect.width(), labelWidth);
height += rect.height();
}
width = labelWidth + labelPadding() + 1;
width += base.width();
if (base.width() > 0)
width += labelPadding();
height = qMax(height, base.height());
sh = QSizeF(width, height);
break;
}
default:
break;
}
return sh;
}
#include "moc_chartbarcategoryaxisy_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE