##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixed paint and mouse event issues with QLineSeries...
Fixed paint and mouse event issues with QLineSeries 1. The bounding rectangle of QLineSeries item did not take line width into account; this caused paint issues if the width is bigger than 1. 2. The width of the shape of the item was always 1. This caused problems with mouse events; onClicked was not always signaled, even if you click on top (but not in the middle of) a thick line series.
Michal Klocek - - Load All Authors

File last commit:

r1538:8f0be28e5215
r1791:877b494897a0
Show More
chartlayout.cpp
166 lines | 6.1 KiB | text/x-c | CppLexer
/ src / chartlayout.cpp
History | Source | Raw |Copy content |Copy permalink
Michal Klocek
Adds missing license headers
 r1535 /****************************************************************************
**
** 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$
**
****************************************************************************/
Michal Klocek
Refactors layout managment...
 r1534 #include "chartlayout_p.h"
#include "chartpresenter_p.h"
#include "chartaxis_p.h"
Michal Klocek
Fixes blinking and minimal false size for legend
 r1538 #include <QDebug>
Michal Klocek
Adds missing license headers
 r1535
Michal Klocek
Refactors layout managment...
 r1534 QTCOMMERCIALCHART_BEGIN_NAMESPACE
ChartLayout::ChartLayout(ChartPresenter* presenter):
m_presenter(presenter),
m_marginBig(60),
m_marginSmall(20),
m_marginTiny(10),
m_chartMargins(QPointF(m_marginBig,m_marginBig),QPointF(m_marginBig,m_marginBig))
{
}
ChartLayout::~ChartLayout()
{
}
void ChartLayout::setGeometry(const QRectF& rect)
{
Michal Klocek
Fixes blinking and minimal false size for legend
 r1538
Michal Klocek
Refactors layout managment...
 r1534 if (!rect.isValid()) return;
QGraphicsLayout::setGeometry(rect);
// check title size
QSize titleSize = QSize(0,0);
if (m_presenter->titleItem()) {
titleSize= m_presenter->titleItem()->boundingRect().size().toSize();
}
qreal axisHeight = 0;
qreal axisWidth = 0;
// check axis size
foreach (ChartAxis* axis,m_presenter->axisItems()){
if(axis->axisType() == ChartAxis::X_AXIS)
axisHeight = qMax(axis->minimumHeight(),axisHeight);
else
axisWidth = qMax(axis->minimumWidth(),axisWidth);
}
QLegend* legend = m_presenter->legend();
qreal titlePadding = m_chartMargins.top()/2;
QRectF chartMargins = m_chartMargins;
// recalculate legend position
if (legend != 0 && legend->isVisible() && legend->isAttachedToChart()) {
// Reserve some space for legend
switch (legend->alignment()) {
case Qt::AlignTop: {
QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(rect.width(),-1));
int topMargin = 2*m_marginTiny + titleSize.height() + legendSize.height() + m_marginTiny;
chartMargins = QRect(QPoint(m_chartMargins.left(),topMargin),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
m_legendMargins = QRect(QPoint(chartMargins.left(),topMargin - (legendSize.height() + m_marginTiny)),QPoint(chartMargins.right(),rect.height()-topMargin + m_marginTiny));
titlePadding = m_marginTiny + m_marginTiny;
break;
}
case Qt::AlignBottom: {
QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(rect.width(),-1));
int bottomMargin = m_marginTiny + m_marginSmall + legendSize.height() + m_marginTiny + axisHeight;
chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(m_chartMargins.right(),bottomMargin));
m_legendMargins = QRect(QPoint(chartMargins.left(),rect.height()-bottomMargin + m_marginTiny + axisHeight),QPoint(chartMargins.right(),m_marginTiny + m_marginSmall));
titlePadding = chartMargins.top()/2;
break;
}
case Qt::AlignLeft: {
QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(-1,rect.height()));
int leftPadding = m_marginTiny + m_marginSmall + legendSize.width() + m_marginTiny + axisWidth;
chartMargins = QRect(QPoint(leftPadding,m_chartMargins.top()),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
m_legendMargins = QRect(QPoint(m_marginTiny + m_marginSmall,chartMargins.top()),QPoint(rect.width()-leftPadding + m_marginTiny + axisWidth,chartMargins.bottom()));
titlePadding = chartMargins.top()/2;
break;
}
case Qt::AlignRight: {
QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(-1,rect.height()));
int rightPadding = m_marginTiny + m_marginSmall + legendSize.width() + m_marginTiny;
chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(rightPadding,m_chartMargins.bottom()));
m_legendMargins = QRect(QPoint(rect.width()- rightPadding+ m_marginTiny ,chartMargins.top()),QPoint(m_marginTiny + m_marginSmall,chartMargins.bottom()));
titlePadding = chartMargins.top()/2;
break;
}
default: {
break;
}
}
legend->setGeometry(rect.adjusted(m_legendMargins.left(),m_legendMargins.top(),-m_legendMargins.right(),-m_legendMargins.bottom()));
}
// recalculate title position
if (m_presenter->titleItem()) {
QPointF center = rect.center() - m_presenter->titleItem()->boundingRect().center();
m_presenter->titleItem()->setPos(center.x(),titlePadding);
}
//recalculate background gradient
if (m_presenter->backgroundItem()) {
m_presenter->backgroundItem()->setRect(rect.adjusted(m_marginTiny,m_marginTiny, -m_marginTiny, -m_marginTiny));
}
QRectF chartRect = rect.adjusted(chartMargins.left(),chartMargins.top(),-chartMargins.right(),-chartMargins.bottom());
if(m_presenter->geometry()!=chartRect && chartRect.isValid()){
m_presenter->setGeometry(chartRect);
}else if(chartRect.size().isEmpty()){
m_presenter->setGeometry(QRect(rect.width()/2,rect.height()/2,1,1));
}
}
QSizeF ChartLayout::sizeHint ( Qt::SizeHint which, const QSizeF & constraint) const
{
Q_UNUSED(constraint);
if(which == Qt::MinimumSize)
return QSize(2*(m_chartMargins.top()+m_chartMargins.bottom()),2*(m_chartMargins.top() + m_chartMargins.bottom()));
else
return QSize(-1,-1);
}
void ChartLayout::setMarginsMinimum(const QRectF& margins)
{
if(m_chartMargins != margins){
m_chartMargins = margins;
updateGeometry();
}
}
QRectF ChartLayout::margins() const
{
return m_chartMargins;
}
QTCOMMERCIALCHART_END_NAMESPACE