##// 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:

r2356:c0053ad31507
r2415:65ea14fdb747
Show More
xydomain.cpp
180 lines | 4.9 KiB | text/x-c | CppLexer
/****************************************************************************
**
** 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 "xydomain_p.h"
#include "qabstractaxis_p.h"
#include <qmath.h>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
XYDomain::XYDomain(QObject *parent)
: AbstractDomain(parent)
{
}
XYDomain::~XYDomain()
{
}
void XYDomain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)
{
bool axisXChanged = false;
bool axisYChanged = false;
if (!qFuzzyCompare(m_minX, minX) || !qFuzzyCompare(m_maxX, maxX)) {
m_minX = minX;
m_maxX = maxX;
axisXChanged = true;
if(!m_signalsBlocked)
emit rangeHorizontalChanged(m_minX, m_maxX);
}
if (!qFuzzyCompare(m_minY, minY) || !qFuzzyCompare(m_maxY, maxY)) {
m_minY = minY;
m_maxY = maxY;
axisYChanged = true;
if(!m_signalsBlocked)
emit rangeVerticalChanged(m_minY, m_maxY);
}
if (axisXChanged || axisYChanged)
emit updated();
}
void XYDomain::zoomIn(const QRectF &rect)
{
qreal dx = spanX() / m_size.width();
qreal dy = spanY() / m_size.height();
qreal maxX = m_maxX;
qreal minX = m_minX;
qreal minY = m_minY;
qreal maxY = m_maxY;
maxX = minX + dx * rect.right();
minX = minX + dx * rect.left();
minY = maxY - dy * rect.bottom();
maxY = maxY - dy * rect.top();
setRange(minX, maxX, minY, maxY);
}
void XYDomain::zoomOut(const QRectF &rect)
{
qreal dx = spanX() / rect.width();
qreal dy = spanY() / rect.height();
qreal maxX = m_maxX;
qreal minX = m_minX;
qreal minY = m_minY;
qreal maxY = m_maxY;
minX = maxX - dx * rect.right();
maxX = minX + dx * m_size.width();
maxY = minY + dy * rect.bottom();
minY = maxY - dy * m_size.height();
setRange(minX, maxX, minY, maxY);
}
void XYDomain::move(qreal dx, qreal dy)
{
qreal x = spanX() / m_size.width();
qreal y = spanY() / m_size.height();
qreal maxX = m_maxX;
qreal minX = m_minX;
qreal minY = m_minY;
qreal maxY = m_maxY;
if (dx != 0) {
minX = minX + x * dx;
maxX = maxX + x * dx;
}
if (dy != 0) {
minY = minY + y * dy;
maxY = maxY + y * dy;
}
setRange(minX, maxX, minY, maxY);
}
QPointF XYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const
{
const qreal deltaX = m_size.width() / (m_maxX - m_minX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
qreal x = (point.x() - m_minX) * deltaX;
qreal y = (point.y() - m_minY) * -deltaY + m_size.height();
ok = true;
return QPointF(x, y);
}
QVector<QPointF> XYDomain::calculateGeometryPoints(const QList<QPointF>& vector) const
{
const qreal deltaX = m_size.width() / (m_maxX - m_minX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
QVector<QPointF> result;
result.resize(vector.count());
for (int i = 0; i < vector.count(); ++i) {
qreal x = (vector[i].x() - m_minX) * deltaX;
qreal y = (vector[i].y() - m_minY) * -deltaY + m_size.height();
result[i].setX(x);
result[i].setY(y);
}
return result;
}
QPointF XYDomain::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);
qreal x = point.x() / deltaX + m_minX;
qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;
return QPointF(x, y);
}
// operators
bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const XYDomain &domain1, const XYDomain &domain2)
{
return (qFuzzyCompare(domain1.m_maxX, domain2.m_maxX) &&
qFuzzyCompare(domain1.m_maxY, domain2.m_maxY) &&
qFuzzyCompare(domain1.m_minX, domain2.m_minX) &&
qFuzzyCompare(domain1.m_minY, domain2.m_minY));
}
bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const XYDomain &domain1, const XYDomain &domain2)
{
return !(domain1 == domain2);
}
QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &domain)
{
dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size;
return dbg.maybeSpace();
}
#include "moc_xydomain_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE