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

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

Few more axes docs updates
Few more axes docs updates
sauimone - - Load All Authors

File last commit:

r1603:0ff3e515e1f0
r1637:77c03282e0b6
Show More
barchartitem.cpp
230 lines | 6.8 KiB | text/x-c | CppLexer
/ src / barchart / barchartitem.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
**
** 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$
**
****************************************************************************/
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 #include "barchartitem_p.h"
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 #include "bar_p.h"
sauimone
minor fix
 r240 #include "qbarset.h"
sauimone
barchart PIMPL part 2. Cleaning up leftovers in public api
 r962 #include "qbarset_p.h"
sauimone
renamed barseries files to abstractbarseries
 r1586 #include "qabstractbarseries.h"
#include "qabstractbarseries_p.h"
sauimone
Labels for barchart to axis
 r487 #include "qchart.h"
sauimone
barhcart zvalue added
 r594 #include "chartpresenter_p.h"
sauimone
Animation framework for barchart.
 r671 #include "chartanimator_p.h"
Michal Klocek
Refactors barchart axis hadnling...
 r679 #include "chartdataset_p.h"
sauimone
fixed clipping in barcharts
 r839 #include <QPainter>
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126
QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
QBarSeries to QAbstractBarSeries
 r1584 BarChartItem::BarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) :
Michal Klocek
Refactors chartitem...
 r677 ChartItem(presenter),
sauimone
minor code review fixes, part n
 r763 m_series(series)
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 {
sauimone
barchart mouse event fix
 r852 setFlag(ItemClipsChildrenToShape);
sauimone
barchart PIMPL part 2. Cleaning up leftovers in public api
 r962 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
sauimone
fixed crash in barseries with empty sets
 r1339 connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
sauimone
barseries fix: series visibility now affects also label visibility
 r1464 connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
sauimone
barhcart zvalue added
 r594 setZValue(ChartPresenter::BarSeriesZValue);
sauimone
fixed crash in barseries with empty sets
 r1339 handleDataStructureChanged();
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 }
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 BarChartItem::~BarChartItem()
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 {
}
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 {
sauimone
barchart mouse event fix
 r852 Q_UNUSED(painter);
Q_UNUSED(option);
Q_UNUSED(widget);
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 }
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 QRectF BarChartItem::boundingRect() const
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 {
sauimone
barchart: layout calculation fix
 r976 return m_rect;
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 }
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
 r165
sauimone
barchart animation mechanics working. still some todo
 r681 QVector<QRectF> BarChartItem::calculateLayout()
sauimone
Animation framework for barchart.
 r671 {
sauimone
barchart animation mechanics working. still some todo
 r681 QVector<QRectF> layout;
sauimone
removed categories from barseries. categories are now only on axis
 r1321 // Use temporary qreals for accuracy
qreal categoryCount = m_series->d_func()->categoryCount();
Tero Ahola
Minor modifications to properties of abstract, area and bar series
 r1462 qreal setCount = m_series->count();
sauimone
visible property to barseries
 r1284 bool barsVisible = m_series->isVisible();
sauimone
barchart animation mechanics working. still some todo
 r681
sauimone
percent barchart layout fix. signal fix
 r850 // Domain:
sauimone
build error fix after merge
 r682 qreal width = geometry().width();
qreal height = geometry().height();
sauimone
new series: groupedbarseries
 r1167 qreal rangeY = m_domainMaxY - m_domainMinY;
qreal rangeX = m_domainMaxX - m_domainMinX;
qreal scaleY = (height / rangeY);
qreal scaleX = (width / rangeX);
sauimone
barmargin replaced with barwidth
 r1425 qreal barWidth = scaleX * m_series->d_func()->barWidth();
sauimone
barchart animation mechanics working. still some todo
 r681
int itemIndex(0);
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
 r737 for (int category = 0; category < categoryCount; category++) {
sauimone
new series: groupedbarseries
 r1167 qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
sauimone
barchart animation mechanics working. still some todo
 r681 for (int set = 0; set < setCount; set++) {
sauimone
Removed QPointF from QBarSet
 r1580 QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
sauimone
fixed crash in barchartitem after refactoring
 r1603 qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
qreal barHeight = barSet->at(category).y() * scaleY;
sauimone
Barchart value layout fix
 r817
sauimone
minor code review fixes, part n
 r763 Bar* bar = m_bars.at(itemIndex);
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
 r737 QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
sauimone
new series: groupedbarseries
 r1167
sauimone
barchart animation mechanics working. still some todo
 r681 layout.append(rect);
sauimone
Removed QPointF from QBarSet
 r1580 bar->setPen(barSet->m_pen);
bar->setBrush(barSet->m_brush);
sauimone
fixed crash in barchartitem after refactoring
 r1603 if (qFuzzyIsNull(barHeight)) {
bar->setVisible(false);
} else {
bar->setVisible(barsVisible);
}
sauimone
barchart animation mechanics working. still some todo
 r681
sauimone
removed barlabel. label visibility control is now per series instead of per set
 r1246 QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
sauimone
barchart animation mechanics working. still some todo
 r681
sauimone
fixed crash in barchartitem after refactoring
 r1603 if (!qFuzzyIsNull(barSet->at(category).y())) {
label->setText(QString::number(barSet->at(category).y()));
sauimone
barchart animation mechanics working. still some todo
 r681 } else {
sauimone
renamed barchart floating values with labels to be consistent with piechart
 r820 label->setText(QString(""));
sauimone
barchart animation mechanics working. still some todo
 r681 }
sauimone
renamed barchart floating values with labels to be consistent with piechart
 r820 label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
,yPos - barHeight/2 - label->boundingRect().height()/2);
sauimone
Removed QPointF from QBarSet
 r1580 label->setFont(barSet->m_labelFont);
label->setBrush(barSet->m_labelBrush);
sauimone
simple text item for barvalue
 r811
sauimone
barchart animation mechanics working. still some todo
 r681 itemIndex++;
}
}
sauimone
new series: groupedbarseries
 r1167
sauimone
Animation framework for barchart.
 r671 return layout;
}
sauimone
barchart animation mechanics working. still some todo
 r681 void BarChartItem::applyLayout(const QVector<QRectF> &layout)
sauimone
Animation framework for barchart.
 r671 {
sauimone
fixed crash in barseries with empty sets
 r1339 if (animator()) {
sauimone
minor code review fixes, part n
 r763 animator()->updateLayout(this, m_layout, layout);
sauimone
fixed crash in barseries with empty sets
 r1339 } else {
sauimone
Animation framework for barchart.
 r671 setLayout(layout);
sauimone
barchart animation blink fix
 r1389 update();
sauimone
fixed crash in barseries with empty sets
 r1339 }
sauimone
Animation framework for barchart.
 r671 }
sauimone
barchart animation mechanics working. still some todo
 r681 void BarChartItem::setLayout(const QVector<QRectF> &layout)
sauimone
Animation framework for barchart.
 r671 {
Marek Rosa
Fix to BarSeries animation on BarSets restructured
 r1418 if (layout.count() != m_bars.count())
return;
m_layout = layout;
sauimone
barchart animation mechanics working. still some todo
 r681
sauimone
fixed crash in barseries with empty sets
 r1339 for (int i=0; i < m_bars.count(); i++) {
sauimone
minor code review fixes, part n
 r763 m_bars.at(i)->setRect(layout.at(i));
sauimone
fixed crash in barseries with empty sets
 r1339 }
sauimone
Animation framework for barchart.
 r671 }
Michal Klocek
Refactored for MVP...
 r139 //handlers
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 void BarChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
Michal Klocek
Refactored for MVP...
 r139 {
sauimone
minor code review fixes, part n
 r763 m_domainMinX = minX;
m_domainMaxX = maxX;
m_domainMinY = minY;
m_domainMaxY = maxY;
sauimone
barchart animation mechanics working. still some todo
 r681 handleLayoutChanged();
Michal Klocek
Refactored for MVP...
 r139 }
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
 r737 void BarChartItem::handleGeometryChanged(const QRectF &rect)
Michal Klocek
Refactored for MVP...
 r139 {
sauimone
percent barchart layout fix. signal fix
 r850 prepareGeometryChange();
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
 r737 m_rect = rect;
sauimone
build error fix after merge
 r682 handleLayoutChanged();
Michal Klocek
Refactored for MVP...
 r139 }
sauimone
Animation framework for barchart.
 r671 void BarChartItem::handleLayoutChanged()
{
sauimone
percent barchart layout fix. signal fix
 r850 if ((m_rect.width() <= 0) || (m_rect.height() <= 0)) {
// rect size zero.
return;
}
sauimone
barchart animation mechanics working. still some todo
 r681 QVector<QRectF> layout = calculateLayout();
sauimone
Animation framework for barchart.
 r671 applyLayout(layout);
}
sauimone
barseries fix: series visibility now affects also label visibility
 r1464
sauimone
fixed crash in barseries with empty sets
 r1339 void BarChartItem::handleLabelsVisibleChanged(bool visible)
sauimone
removed barlabel. label visibility control is now per series instead of per set
 r1246 {
foreach (QGraphicsSimpleTextItem* label, m_labels) {
label->setVisible(visible);
}
update();
}
sauimone
barseries fix: series visibility now affects also label visibility
 r1464 void BarChartItem::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);
sauimone
removed double signal emitting from barseries/set
 r1563 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)));
sauimone
barseries fix: series visibility now affects also label visibility
 r1464 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 BarChartItem::handleVisibleChanged()
{
bool visible = m_series->isVisible();
handleLabelsVisibleChanged(visible);
foreach(QGraphicsItem *item, childItems()) {
item->setVisible(visible);
}
}
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 #include "moc_barchartitem_p.cpp"
Michal Klocek
Refactored for MVP...
 r139
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 QTCOMMERCIALCHART_END_NAMESPACE