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

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

minor. missing line option
minor. missing line option
Michal Klocek - - Load All Authors

File last commit:

r996:ce5f1c868418
r999:748ed6762b03
Show More
piechartitem.cpp
210 lines | 6.1 KiB | text/x-c | CppLexer
/ src / piechart / piechartitem.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$
**
****************************************************************************/
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 #include "piechartitem_p.h"
Jani Honkonen
rename PieSlice -> PieSliceItem
 r673 #include "piesliceitem_p.h"
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 #include "qpieslice.h"
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 #include "qpieseries.h"
Tero Ahola
Z order for pie
 r490 #include "chartpresenter_p.h"
Jani Honkonen
Fix add/remove animation for pie and apply colors from theme when adding/removing
 r659 #include "chartdataset_p.h"
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 #include "chartanimator_p.h"
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 #include <QPainter>
Jani Honkonen
Refactoring pie series and animations.
 r621 #include <QTimer>
Jani Honkonen
Pie chart refactoring
 r142
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors chartitem...
 r677 PieChartItem::PieChartItem(QPieSeries *series, ChartPresenter* presenter)
:ChartItem(presenter),
m_series(series)
Jani Honkonen
Pie chart refactoring
 r142 {
Q_ASSERT(series);
Jani Honkonen
Refactoring pie series and animations.
 r621 connect(series, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
connect(series, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
connect(series, SIGNAL(piePositionChanged()), this, SLOT(handlePieLayoutChanged()));
connect(series, SIGNAL(pieSizeChanged()), this, SLOT(handlePieLayoutChanged()));
Jani Honkonen
Fix piechart clipping bug
 r905 QTimer::singleShot(0, this, SLOT(initialize())); // TODO: get rid of this
Tero Ahola
Z order for pie
 r490
// Note: the following does not affect as long as the item does not have anything to paint
setZValue(ChartPresenter::PieSeriesZValue);
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 PieChartItem::~PieChartItem()
Jani Honkonen
Pie chart refactoring
 r142 {
Jani Honkonen
Refactoring piechart API (and internals)
 r174 // slices deleted automatically through QGraphicsItem
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 void PieChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
Jani Honkonen
Pie chart refactoring
 r142 {
Tero Ahola
Squashed bunch of warnings
 r611 Q_UNUSED(painter)
Jani Honkonen
Refactoring piechart API (and internals)
 r174 // TODO: paint shadows for all components
// - get paths from items & merge & offset and draw with shadow color?
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 //painter->setBrush(QBrush(Qt::red));
//painter->drawRect(m_debugRect);
Jani Honkonen
Refactoring piechart API (and internals)
 r174 }
Jani Honkonen
Refactoring pie series and animations.
 r621 void PieChartItem::initialize()
{
Jani Honkonen
Adding PIMPL to pie
 r669 handleSlicesAdded(m_series->slices());
Jani Honkonen
Refactoring pie series and animations.
 r621 }
void PieChartItem::handleSlicesAdded(QList<QPieSlice*> slices)
{
Jani Honkonen
Nicer animation for adding a pie initially.
 r634 bool isEmpty = m_slices.isEmpty();
Michal Klocek
Refactor to use qseries private for implmentation interface...
 r943 presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
Jani Honkonen
Fix add/remove animation for pie and apply colors from theme when adding/removing
 r659
Jani Honkonen
Refactoring pie series and animations.
 r621 foreach (QPieSlice *s, slices) {
Jani Honkonen
rename PieSlice -> PieSliceItem
 r673 PieSliceItem* item = new PieSliceItem(this);
m_slices.insert(s, item);
Jani Honkonen
Refactoring pie series and animations.
 r621 connect(s, SIGNAL(changed()), this, SLOT(handleSliceChanged()));
Jani Honkonen
Add mousebuttons to pie clicked signals
 r707 connect(item, SIGNAL(clicked(Qt::MouseButtons)), s, SIGNAL(clicked(Qt::MouseButtons)));
Jani Honkonen
rename PieSlice -> PieSliceItem
 r673 connect(item, SIGNAL(hoverEnter()), s, SIGNAL(hoverEnter()));
connect(item, SIGNAL(hoverLeave()), s, SIGNAL(hoverLeave()));
Jani Honkonen
Refactoring pie series and animations.
 r621
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 PieSliceData data = sliceData(s);
Jani Honkonen
Refactoring pie series and animations.
 r621
Michal Klocek
Refactors barchart axis hadnling...
 r679 if (animator())
animator()->addAnimation(this, s, data, isEmpty);
Jani Honkonen
Refactoring pie series and animations.
 r621 else
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 setLayout(s, data);
Jani Honkonen
Refactoring pie series and animations.
 r621 }
}
void PieChartItem::handleSlicesRemoved(QList<QPieSlice*> slices)
{
Michal Klocek
Refactor to use qseries private for implmentation interface...
 r943 presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
Jani Honkonen
Fix add/remove animation for pie and apply colors from theme when adding/removing
 r659
Jani Honkonen
Refactoring pie series and animations.
 r621 foreach (QPieSlice *s, slices) {
Michal Klocek
Refactors chartitem...
 r677 if (animator())
animator()->removeAnimation(this, s);
Jani Honkonen
Refactoring pie series and animations.
 r621 else
destroySlice(s);
}
}
void PieChartItem::handlePieLayoutChanged()
Jani Honkonen
Refactoring piechart API (and internals)
 r174 {
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
 r629 PieLayout layout = calculateLayout();
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 applyLayout(layout);
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 update();
}
Jani Honkonen
Pie chart refactoring
 r142
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 void PieChartItem::handleSliceChanged()
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 {
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
Q_ASSERT(m_slices.contains(slice));
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 PieSliceData data = sliceData(slice);
updateLayout(slice, data);
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 update();
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 }
Jani Honkonen
Refactoring piechart API (and internals)
 r174
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 void PieChartItem::handleDomainChanged(qreal, qreal, qreal, qreal)
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 {
// TODO
}
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 void PieChartItem::handleGeometryChanged(const QRectF& rect)
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 {
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 prepareGeometryChange();
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 m_rect = rect;
Jani Honkonen
Refactoring pie series and animations.
 r621 handlePieLayoutChanged();
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Refactoring pie series and animations.
 r621 void PieChartItem::calculatePieLayout()
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 {
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 // find pie center coordinates
Tero Ahola
QSeries name and QPieSeries properties to QML api
 r884 m_pieCenter.setX(m_rect.left() + (m_rect.width() * m_series->horizontalPosition()));
m_pieCenter.setY(m_rect.top() + (m_rect.height() * m_series->verticalPosition()));
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 // find maximum radius for pie
Jani Honkonen
Refactoring pie series and animations.
 r621 m_pieRadius = m_rect.height() / 2;
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 if (m_rect.width() < m_rect.height())
Jani Honkonen
Refactoring pie series and animations.
 r621 m_pieRadius = m_rect.width() / 2;
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 // apply size factor
Jani Honkonen
Refactoring pie series and animations.
 r621 m_pieRadius *= m_series->pieSize();
}
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 PieSliceData PieChartItem::sliceData(QPieSlice *slice)
Jani Honkonen
Refactoring pie series and animations.
 r621 {
Jani Honkonen
Refactoring QPieSlice private implementation. Removes the useless QPieSlicePrivate layer and uses PieSliceData directly.
 r818 // TODO: This function is kid of useless now. Refactor.
Jani Honkonen
Polish QPieSlice API by removing the DataPtr stuff
 r822 PieSliceData sliceData = PieSliceData::data(slice);
Jani Honkonen
rename PieSlice -> PieSliceItem
 r673 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 sliceData.m_radius = m_pieRadius;
return sliceData;
Jani Honkonen
Refactoring pie series and animations.
 r621 }
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
 r629 PieLayout PieChartItem::calculateLayout()
Jani Honkonen
Refactoring pie series and animations.
 r621 {
calculatePieLayout();
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 PieLayout layout;
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 foreach (QPieSlice* s, m_series->slices()) {
Jani Honkonen
Refactoring pie series and animations.
 r621 if (m_slices.contains(s)) // calculate layout only for those slices that are already visible
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 layout.insert(s, sliceData(s));
Jani Honkonen
Refactoring piechart API (and internals)
 r174 }
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 return layout;
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
 r629 void PieChartItem::applyLayout(const PieLayout &layout)
Jani Honkonen
Pie chart refactoring
 r142 {
Michal Klocek
Refactors chartitem...
 r677 if (animator())
animator()->updateLayout(this, layout);
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 else
setLayout(layout);
Jani Honkonen
Refactoring piechart API (and internals)
 r174 }
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 void PieChartItem::updateLayout(QPieSlice *slice, const PieSliceData &sliceData)
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 {
Michal Klocek
Refactors barchart axis hadnling...
 r679 if (animator())
animator()->updateLayout(this, slice, sliceData);
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 else
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 setLayout(slice, sliceData);
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 }
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
 r629 void PieChartItem::setLayout(const PieLayout &layout)
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 {
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
 r629 foreach (QPieSlice *slice, layout.keys()) {
Jani Honkonen
rename PieSlice -> PieSliceItem
 r673 PieSliceItem *item = m_slices.value(slice);
Q_ASSERT(item);
item->setSliceData(layout.value(slice));
item->updateGeometry();
item->update();
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 }
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 }
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 void PieChartItem::setLayout(QPieSlice *slice, const PieSliceData &sliceData)
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 {
// find slice
Jani Honkonen
rename PieSlice -> PieSliceItem
 r673 PieSliceItem *item = m_slices.value(slice);
Q_ASSERT(item);
item->setSliceData(sliceData);
item->updateGeometry();
item->update();
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 }
void PieChartItem::destroySlice(QPieSlice *slice)
{
delete m_slices.take(slice);
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 #include "moc_piechartitem_p.cpp"
Jani Honkonen
Pie chart refactoring
 r142
QTCOMMERCIALCHART_END_NAMESPACE