##// END OF EJS Templates
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.

File last commit:

r1735:0a19606ca1b1
r1791:877b494897a0
Show More
abstractbarchartitem.cpp
179 lines | 5.1 KiB | text/x-c | CppLexer
/ src / barchart / abstractbarchartitem.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 "abstractbarchartitem_p.h"
#include "bar_p.h"
#include "qbarset.h"
#include "qbarset_p.h"
#include "qabstractbarseries.h"
#include "qabstractbarseries_p.h"
#include "qchart.h"
#include "chartpresenter_p.h"
#include "charttheme_p.h"
#include "abstractbaranimation_p.h"
#include "chartdataset_p.h"
#include <QPainter>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) :
ChartItem(presenter),
m_animation(0),
m_series(series)
{
setFlag(ItemClipsChildrenToShape);
connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
setZValue(ChartPresenter::BarSeriesZValue);
handleDataStructureChanged();
}
AbstractBarChartItem::~AbstractBarChartItem()
{
}
void AbstractBarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(painter);
Q_UNUSED(option);
Q_UNUSED(widget);
}
QRectF AbstractBarChartItem::boundingRect() const
{
return m_rect;
}
void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)
{
if (m_animation) {
m_animation->setup(m_layout,layout);
presenter()->startAnimation(m_animation);
} else {
setLayout(layout);
update();
}
}
void AbstractBarChartItem::setAnimation(AbstractBarAnimation *animation)
{
m_animation = animation;
}
void AbstractBarChartItem::setLayout(const QVector<QRectF> &layout)
{
if (layout.count() != m_bars.count())
return;
m_layout = layout;
for (int i=0; i < m_bars.count(); i++) {
m_bars.at(i)->setRect(layout.at(i));
}
}
//handlers
void AbstractBarChartItem::handleDomainUpdated()
{
m_domainMinX = domain()->minX();
m_domainMaxX = domain()->maxX();
m_domainMinY = domain()->minY();
m_domainMaxY = domain()->maxY();
handleLayoutChanged();
}
void AbstractBarChartItem::handleGeometryChanged(const QRectF &rect)
{
prepareGeometryChange();
m_rect = rect;
handleLayoutChanged();
}
void AbstractBarChartItem::handleLayoutChanged()
{
if ((m_rect.width() <= 0) || (m_rect.height() <= 0)) {
// rect size zero.
return;
}
QVector<QRectF> layout = calculateLayout();
applyLayout(layout);
}
void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
{
foreach (QGraphicsSimpleTextItem* label, m_labels) {
label->setVisible(visible);
}
update();
}
void AbstractBarChartItem::handleDataStructureChanged()
{
foreach(QGraphicsItem *item, childItems()) {
delete item;
}
m_bars.clear();
m_labels.clear();
m_layout.clear();
bool labelsVisible = m_series->isLabelsVisible();
// Create new graphic items for bars
for (int c = 0; c < m_series->d_func()->categoryCount(); c++) {
for (int s = 0; s < m_series->count(); s++) {
QBarSet *set = m_series->d_func()->barsetAt(s);
// Bars
Bar *bar = new Bar(set,c,this);
m_bars.append(bar);
connect(bar, SIGNAL(clicked(int, QBarSet*)), m_series, SIGNAL(clicked(int, QBarSet*)));
connect(bar, SIGNAL(hovered(bool, QBarSet*)), m_series, SIGNAL(hovered(bool, QBarSet*)));
connect(bar, SIGNAL(clicked(int, QBarSet*)), set, SIGNAL(clicked(int)));
connect(bar, SIGNAL(hovered(bool, QBarSet*)), set, SIGNAL(hovered(bool)));
m_layout.append(QRectF(0, 0, 0, 0));
// Labels
QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(this);
label->setVisible(labelsVisible);
m_labels.append(label);
}
}
// TODO: Is this the right place to call it?
presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
handleLayoutChanged();
}
void AbstractBarChartItem::handleVisibleChanged()
{
bool visible = m_series->isVisible();
handleLabelsVisibleChanged(visible);
foreach(QGraphicsItem *item, childItems()) {
item->setVisible(visible);
}
}
#include "moc_abstractbarchartitem_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE