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

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

Remove warnings about unmatched parentheses...
Remove warnings about unmatched parentheses Property declarations divided into several lines caused qmake to warn of cat() function about deprecated unmatched parentheses. The property declarations are now done in one line. Task-number: QTRD-3159 Change-Id: Ieb839ff81d707a5a40cdebd62a52ac32f51517b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Titta Heikkala - - Load All Authors

File last commit:

r2689:db3eff743f50
r2692:d672b074a893
Show More
abstractbarchartitem.cpp
264 lines | 8.6 KiB | text/x-c | CppLexer
/ src / barchart / abstractbarchartitem.cpp
History | Source | Raw |Copy content |Copy permalink
sauimone
refactoring internal barchart items
 r1674 /****************************************************************************
**
Titta Heikkala
Update copyright year...
 r2688 ** Copyright (C) 2014 Digia Plc
sauimone
refactoring internal barchart items
 r1674 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** This file is part of the Qt Enterprise Charts Add-on.
sauimone
refactoring internal barchart items
 r1674 **
** $QT_BEGIN_LICENSE$
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise License Agreement provided with the
sauimone
refactoring internal barchart items
 r1674 ** 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"
Michal Klocek
Refactor animator...
 r1735 #include "charttheme_p.h"
Marek Rosa
Bar animations refactored
 r2316 #include "baranimation_p.h"
sauimone
refactoring internal barchart items
 r1674 #include "chartdataset_p.h"
#include <QPainter>
Miikka Heikkinen
Fix text item margins...
 r2592 #include <QTextDocument>
sauimone
refactoring internal barchart items
 r1674
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors internals...
 r2273 AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item) :
ChartItem(series->d_func(),item),
sauimone
refactoring internal barchart items
 r1674 m_animation(0),
m_series(series)
{
sauimone
fix: changing barset colors no more triggers layout calculations
 r1917
sauimone
refactoring internal barchart items
 r1674 setFlag(ItemClipsChildrenToShape);
sauimone
fix: changing barset colors no more triggers layout calculations
 r1917 connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleUpdatedBars()));
sauimone
refactoring internal barchart items
 r1674 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()));
Tero Ahola
Added opacity property to QAbstractSeries
 r2067 connect(series, SIGNAL(opacityChanged()), this, SLOT(handleOpacityChanged()));
Titta Heikkala
Added possibility to show series value...
 r2689 connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(handleUpdatedBars()));
connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
this, SLOT(handleLabelsPositionChanged()));
Marek Rosa
Bar animations refactored
 r2316 setZValue(ChartPresenter::BarSeriesZValue);
sauimone
refactoring internal barchart items
 r1674 handleDataStructureChanged();
Marek Rosa
BarChartItems code cleanup
 r2305 handleVisibleChanged();
handleUpdatedBars();
sauimone
refactoring internal barchart items
 r1674 }
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)
{
Marek Rosa
Bar animations refactored
 r2316 QSizeF size = geometry().size();
if (geometry().size().isValid()) {
if (m_animation) {
if (m_layout.count() == 0 || m_oldSize != size) {
initializeLayout();
m_oldSize = size;
}
m_animation->setup(m_layout, layout);
presenter()->startAnimation(m_animation);
} else {
setLayout(layout);
update();
}
sauimone
refactoring internal barchart items
 r1674 }
}
Marek Rosa
Bar animations refactored
 r2316 void AbstractBarChartItem::setAnimation(BarAnimation *animation)
sauimone
refactoring internal barchart items
 r1674 {
m_animation = animation;
}
void AbstractBarChartItem::setLayout(const QVector<QRectF> &layout)
{
if (layout.count() != m_bars.count())
return;
Michal Klocek
Refactors Domain and Axis...
 r1698 m_layout = layout;
sauimone
refactoring internal barchart items
 r1674
Titta Heikkala
Added possibility to show series value...
 r2689 for (int i = 0; i < m_bars.count(); i++)
sauimone
refactoring internal barchart items
 r1674 m_bars.at(i)->setRect(layout.at(i));
Marek Rosa
BarChartItems code cleanup
 r2305
Titta Heikkala
Added possibility to show series value...
 r2689 positionLabels();
sauimone
refactoring internal barchart items
 r1674 }
//handlers
Michal Klocek
Refactors Domain and Axis...
 r1698 void AbstractBarChartItem::handleDomainUpdated()
sauimone
refactoring internal barchart items
 r1674 {
Michal Klocek
Refactors Domain and Axis...
 r1698 m_domainMinX = domain()->minX();
m_domainMaxX = domain()->maxX();
m_domainMinY = domain()->minY();
m_domainMaxY = domain()->maxY();
sauimone
refactoring internal barchart items
 r1674
Michal Klocek
Refactors internals...
 r2273 QRectF rect(QPointF(0,0),domain()->size());
if(m_rect != rect){
prepareGeometryChange();
m_rect = rect;
}
sauimone
refactoring internal barchart items
 r1674 handleLayoutChanged();
}
void AbstractBarChartItem::handleLayoutChanged()
{
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 if ((m_rect.width() <= 0) || (m_rect.height() <= 0))
return; // rect size zero.
sauimone
refactoring internal barchart items
 r1674 QVector<QRectF> layout = calculateLayout();
applyLayout(layout);
Marek Rosa
BarChart brush and labels fix
 r2311 handleUpdatedBars();
sauimone
refactoring internal barchart items
 r1674 }
void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
{
Miikka Heikkinen
Added HTML support for various text items...
 r2539 foreach (QGraphicsTextItem *label, m_labels)
sauimone
refactoring internal barchart items
 r1674 label->setVisible(visible);
update();
}
void AbstractBarChartItem::handleDataStructureChanged()
{
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 foreach (QGraphicsItem *item, childItems())
sauimone
refactoring internal barchart items
 r1674 delete item;
m_bars.clear();
m_labels.clear();
m_layout.clear();
// 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
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 Bar *bar = new Bar(set, c, this);
sauimone
refactoring internal barchart items
 r1674 m_bars.append(bar);
Jani Honkonen
normalize signal/slot signatures
 r2110 connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*)));
connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));
Titta Heikkala
Add hovered signal with index for bar charts...
 r2600 connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), m_series, SIGNAL(hovered(bool, int, QBarSet*)));
Jani Honkonen
normalize signal/slot signatures
 r2110 connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
Titta Heikkala
Add hovered signal with index for bar charts...
 r2600 connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), set, SIGNAL(hovered(bool, int)));
Marek Rosa
Bar animations refactored
 r2316 // m_layout.append(QRectF(0, 0, 1, 1));
sauimone
refactoring internal barchart items
 r1674
// Labels
Miikka Heikkinen
Fix text item margins...
 r2592 QGraphicsTextItem *newLabel = new QGraphicsTextItem(this);
newLabel->document()->setDocumentMargin(ChartPresenter::textMargin());
m_labels.append(newLabel);
sauimone
refactoring internal barchart items
 r1674 }
}
Michal Klocek
Refactors internals...
 r2273 if(themeManager()) themeManager()->updateSeries(m_series);
sauimone
refactoring internal barchart items
 r1674 handleLayoutChanged();
Marek Rosa
BarChart brush and labels fix
 r2311 handleVisibleChanged();
sauimone
refactoring internal barchart items
 r1674 }
void AbstractBarChartItem::handleVisibleChanged()
{
bool visible = m_series->isVisible();
sauimone
barlabel visibility fix
 r2309 if (visible)
handleLabelsVisibleChanged(m_series->isLabelsVisible());
else
handleLabelsVisibleChanged(visible);
foreach (QGraphicsItem *bar, m_bars)
bar->setVisible(visible);
Tero Ahola
Added opacity property to QAbstractSeries
 r2067 }
void AbstractBarChartItem::handleOpacityChanged()
{
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 foreach (QGraphicsItem *item, childItems())
Tero Ahola
Added opacity property to QAbstractSeries
 r2067 item->setOpacity(m_series->opacity());
sauimone
refactoring internal barchart items
 r1674 }
sauimone
fix: changing barset colors no more triggers layout calculations
 r1917 void AbstractBarChartItem::handleUpdatedBars()
{
Titta Heikkala
Improve theme initialization performance for bar series...
 r2598 if (!m_series->d_func()->blockBarUpdate()) {
// Handle changes in pen, brush, labels etc.
int categoryCount = m_series->d_func()->categoryCount();
int setCount = m_series->count();
int itemIndex(0);
Titta Heikkala
Added possibility to show series value...
 r2689 static const QString valueTag(QLatin1String("@value"));
Titta Heikkala
Improve theme initialization performance for bar series...
 r2598
for (int category = 0; category < categoryCount; category++) {
for (int set = 0; set < setCount; set++) {
QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
Bar *bar = m_bars.at(itemIndex);
bar->setPen(barSet->m_pen);
bar->setBrush(barSet->m_brush);
bar->update();
QGraphicsTextItem *label = m_labels.at(itemIndex);
Titta Heikkala
Added possibility to show series value...
 r2689 QString valueLabel;
if (m_series->labelsFormat().isEmpty()) {
valueLabel = QString("%1").arg(barSet->value(category));
} else {
valueLabel = m_series->labelsFormat();
valueLabel.replace(valueTag, QString::number(barSet->value(category)));
}
label->setHtml(valueLabel);
Titta Heikkala
Improve theme initialization performance for bar series...
 r2598 label->setFont(barSet->m_labelFont);
label->setDefaultTextColor(barSet->m_labelBrush.color());
label->update();
itemIndex++;
}
sauimone
fix: changing barset colors no more triggers layout calculations
 r1917 }
}
}
Titta Heikkala
Added possibility to show series value...
 r2689 void AbstractBarChartItem::handleLabelsPositionChanged()
{
positionLabels();
}
void AbstractBarChartItem::positionLabels()
{
for (int i = 0; i < m_layout.count(); i++) {
QGraphicsTextItem *label = m_labels.at(i);
qreal xPos = 0;
qreal yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
xPos = m_layout.at(i).right() - label->boundingRect().width();
else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
xPos = m_layout.at(i).left();
else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
xPos = m_layout.at(i).right();
label->setPos(xPos, yPos);
label->setZValue(zValue() + 1);
}
}
sauimone
refactoring internal barchart items
 r1674 #include "moc_abstractbarchartitem_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE