##// END OF EJS Templates
Adjust various margins and paddings....
Adjust various margins and paddings. The text items have been changed to use QGraphicsTextItem bounding rects instead of calculating dimensions using QFontMetrics. It seems that QGraphicsTextItem boundingRect involves a lot more of a margin than QFontMetrics provided. To compensate, various margins and paddings have been adjusted lower. Change-Id: Idebf939f5dd804fb96daeaea4bbf1b45f4f02908 Reviewed-by: Mika Salmela <mika.salmela@digia.com>

File last commit:

r2545:d1d46096c185
r2569:f4eaee212ddc
Show More
xypolardomain.cpp
180 lines | 4.7 KiB | text/x-c | CppLexer
/ src / domain / xypolardomain.cpp
Miikka Heikkinen
Add Polar chart support...
r2483 /****************************************************************************
**
** 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 "xypolardomain_p.h"
#include "qabstractaxis_p.h"
#include <qmath.h>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
XYPolarDomain::XYPolarDomain(QObject *parent)
: PolarDomain(parent)
{
}
XYPolarDomain::~XYPolarDomain()
{
}
void XYPolarDomain::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 XYPolarDomain::zoomIn(const QRectF &rect)
{
Miikka Heikkinen
Added QChart::zoomReset() and QChart::isZoomed()...
r2545 storeZoomReset();
Miikka Heikkinen
Add Polar chart support...
r2483 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 XYPolarDomain::zoomOut(const QRectF &rect)
{
Miikka Heikkinen
Added QChart::zoomReset() and QChart::isZoomed()...
r2545 storeZoomReset();
Miikka Heikkinen
Add Polar chart support...
r2483 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 XYPolarDomain::move(qreal dx, qreal dy)
{
// One unit scrolls one degree angular and one pixel radial
qreal x = spanX() / 360.0;
qreal y = spanY() / m_radius;
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 XYPolarDomain::calculateDomainPoint(const QPointF &point) const
{
if (point == m_center)
return QPointF(0.0, m_minX);
QLineF line(m_center, point);
qreal a = 90.0 - line.angle();
if (a < 0.0)
a += 360.0;
a = ((a / 360.0) * (m_maxX - m_minX)) + m_minX;
qreal r = m_minY + ((m_maxY - m_minY) * (line.length() / m_radius));
return QPointF(a, r);
}
qreal XYPolarDomain::toAngularCoordinate(qreal value, bool &ok) const
{
ok = true;
qreal f = (value - m_minX) / (m_maxX - m_minX);
return f * 360.0;
}
qreal XYPolarDomain::toRadialCoordinate(qreal value, bool &ok) const
{
ok = true;
if (value < m_minY)
value = m_minY;
// Dont limit the max. The drawing should clip the stuff that goes out of the grid
qreal f = (value - m_minY) / (m_maxY - m_minY);
return f * m_radius;
}
// operators
bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const XYPolarDomain &domain1, const XYPolarDomain &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 XYPolarDomain &domain1, const XYPolarDomain &domain2)
{
return !(domain1 == domain2);
}
QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain)
{
dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size;
return dbg.maybeSpace();
}
#include "moc_xypolardomain_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE