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

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

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts
Jani Honkonen - - Load All Authors

File last commit:

r437:8d9e377a1065
r451:465dafc0e5b7 merge
Show More
piepresenter.cpp
242 lines | 7.7 KiB | text/x-c | CppLexer
/ src / piechart / piepresenter.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add _p to pie internal headers
 r353 #include "piepresenter_p.h"
#include "pieslice_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"
Jani Honkonen
Pie chart refactoring
 r142 #include <QDebug>
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 #include <QPainter>
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289
Jani Honkonen
Pie chart refactoring
 r142
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Jani Honkonen
Refactoring piechart API (and internals)
 r174 PiePresenter::PiePresenter(QGraphicsItem *parent, QPieSeries *series)
:ChartItem(parent),
m_series(series)
Jani Honkonen
Pie chart refactoring
 r142 {
Q_ASSERT(series);
Jani Honkonen
Refactoring piechart API (and internals)
 r174 connect(series, SIGNAL(changed(const QPieSeries::ChangeSet&)), this, SLOT(handleSeriesChanged(const QPieSeries::ChangeSet&)));
Jani Honkonen
Make pie work better with chartwidgettest
 r163 connect(series, SIGNAL(sizeFactorChanged()), this, SLOT(updateGeometry()));
connect(series, SIGNAL(positionChanged()), this, SLOT(updateGeometry()));
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 connect(series, SIGNAL(sizePolicyChanged()), this, SLOT(updateGeometry()));
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289
if (m_series->count()) {
QPieSeries::ChangeSet changeSet;
changeSet.appendAdded(m_series->m_slices);
handleSeriesChanged(changeSet);
}
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Moved pie stuff to own .pri file and rename stuff
 r146 PiePresenter::~PiePresenter()
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
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 void PiePresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
Jani Honkonen
Pie chart refactoring
 r142 {
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 }
void PiePresenter::handleSeriesChanged(const QPieSeries::ChangeSet& changeSet)
{
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 //qDebug() << "PiePresenter::handleSeriesChanged()";
//qDebug() << " added : " << changeSet.added();
//qDebug() << " changed: " << changeSet.changed();
//qDebug() << " removed: " << changeSet.removed();
Jani Honkonen
Refactoring piechart API (and internals)
 r174
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 foreach (QPieSlice* s, changeSet.added())
addSlice(s);
foreach (QPieSlice* s, changeSet.changed())
updateSlice(s);
Jani Honkonen
Pie chart refactoring
 r142
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 foreach (QPieSlice* s, changeSet.removed())
deleteSlice(s);
Jani Honkonen
Pie chart refactoring
 r142
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 // every change possibly changes the actual pie size
updateGeometry();
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
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 void PiePresenter::handleDomainChanged(const Domain& domain)
{
// TODO
}
void PiePresenter::handleGeometryChanged(const QRectF& rect)
{
m_rect = rect;
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 prepareGeometryChange();
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 updateGeometry();
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 void PiePresenter::updateGeometry()
Jani Honkonen
Pie chart refactoring
 r142 {
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 if (!m_rect.isValid() || m_rect.isEmpty())
return;
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 // calculate maximum rectangle for pie
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 QRectF pieRect = m_rect;
if (pieRect.width() < pieRect.height()) {
pieRect.setHeight(pieRect.width());
Jani Honkonen
Pie chart refactoring
 r142 } else {
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 pieRect.setWidth(pieRect.height());
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 // position the pie rectangle
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 QPointF center = m_rect.center(); // default position is center
qreal dx = pieRect.width() / 2;
qreal dy = pieRect.height() / 2;
if (m_series->position() & QPieSeries::PiePositionLeft)
center.setX(m_rect.left() + dx);
if (m_series->position() & QPieSeries::PiePositionRight)
center.setX(m_rect.right() - dx);
if (m_series->position() & QPieSeries::PiePositionHCenter)
center.setX(m_rect.center().x());
if (m_series->position() & QPieSeries::PiePositionTop)
center.setY(m_rect.top() + dy);
if (m_series->position() & QPieSeries::PiePositionBottom)
center.setY(m_rect.bottom() - dy);
if (m_series->position() & QPieSeries::PiePositionVCenter)
center.setY(m_rect.center().y());
pieRect.moveCenter(center);
Jani Honkonen
Pie chart refactoring
 r142
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 // calculate how much space we need around the pie rectangle (labels & exploding)
qreal delta = 0;
qreal pieRadius = pieRect.height() / 2;
foreach (QPieSlice* s, m_series->m_slices) {
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 bool exploded = s->isExploded();
if (m_series->sizePolicy() & QPieSeries::PieSizePolicyReserveSpaceForExploding)
exploded = true;
bool labelVisible = s->isLabelVisible();
if (m_series->sizePolicy() & QPieSeries::PieSizePolicyReserveSpaceForLabels)
labelVisible = true;
qreal centerAngle;
QPointF armStart;
QRectF sliceRect = PieSlice::slicePath(center, pieRadius, s->m_startAngle, s->m_angleSpan, exploded, s->explodeDistance(), &centerAngle, &armStart).boundingRect();
if (labelVisible) {
QRectF textRect = PieSlice::labelTextRect(s->labelFont(), s->label());
QPointF textStart;
QRectF armRect = PieSlice::labelArmPath(armStart, centerAngle, s->labelArmLength(), textRect.width(), &textStart).boundingRect();
textRect.moveBottomLeft(textStart);
sliceRect = sliceRect.united(armRect);
sliceRect = sliceRect.united(textRect);
}
qreal dt = m_rect.top() - sliceRect.top();
if (dt > delta)
delta = dt;
qreal dl = m_rect.left() - sliceRect.left();
if (dl > delta)
delta = dl;
qreal dr = sliceRect.right() - m_rect.right();
if (dr > delta)
delta = dr;
qreal db = sliceRect.bottom() - m_rect.bottom();
if (db > delta)
delta = db;
/*
if (s->label() == "Slice 5") {
m_debugRect = sliceRect;
qDebug() << "dt:" << dt << ", dl:" << dl << ", dr:" << dr << ", db:" << db << ", delta:" << delta;
}
*/
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 }
// shrink the pie rectangle so that everything outside it fits the base rectangle
pieRect.adjust(delta, delta, -delta, -delta);
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 /*
// apply size factor (range 0.0 ... 1.0)
pieRect.setWidth(pieRect.width() * m_series->sizeFactor());
pieRect.setHeight(pieRect.height() * m_series->sizeFactor());
// position the pie rectangle (again)
center = m_rect.center(); // default position is center
dx = pieRect.width() / 2;
dy = pieRect.height() / 2;
if (m_series->position() & QPieSeries::PiePositionLeft)
center.setX(m_rect.left() + dx);
if (m_series->position() & QPieSeries::PiePositionRight)
center.setX(m_rect.right() - dx);
if (m_series->position() & QPieSeries::PiePositionHCenter)
center.setX(m_rect.center().x());
if (m_series->position() & QPieSeries::PiePositionTop)
center.setY(m_rect.top() + dy);
if (m_series->position() & QPieSeries::PiePositionBottom)
center.setY(m_rect.bottom() - dy);
if (m_series->position() & QPieSeries::PiePositionVCenter)
center.setY(m_rect.center().y());
pieRect.moveCenter(center);
*/
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 // update slices
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 if (m_pieRect != pieRect) {
m_pieRect = pieRect;
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 //qDebug() << "PiePresenter::updateGeometry()" << m_rect << m_pieRect;
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 foreach (PieSlice* s, m_slices.values()) {
s->setPieRect(m_pieRect);
s->updateGeometry();
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 s->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
Added a pie chart customization example and refactoring the pie interface.
 r437
update();
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 void PiePresenter::addSlice(QPieSlice* sliceData)
Jani Honkonen
Pie chart refactoring
 r142 {
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 //qDebug() << "PiePresenter::addSlice()" << sliceData;
Jani Honkonen
Pie chart refactoring
 r142
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 if (m_slices.keys().contains(sliceData)) {
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 Q_ASSERT(0); // TODO: how to handle this nicely?
Jani Honkonen
Refactoring piechart API (and internals)
 r174 return;
}
// create slice
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 PieSlice *slice = new PieSlice(this);
Jani Honkonen
Fix initial pie position bug
 r208 slice->setPieRect(m_pieRect);
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 slice->updateData(sliceData);
Jani Honkonen
Fix issue with pie label not drawn correctly when first created
 r209 slice->updateGeometry();
slice->update();
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 m_slices.insert(sliceData, slice);
// connect signals
connect(slice, SIGNAL(clicked()), sliceData, SIGNAL(clicked()));
connect(slice, SIGNAL(hoverEnter()), sliceData, SIGNAL(hoverEnter()));
connect(slice, SIGNAL(hoverLeave()), sliceData, SIGNAL(hoverLeave()));
Jani Honkonen
Refactoring piechart API (and internals)
 r174 }
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 void PiePresenter::updateSlice(QPieSlice* sliceData)
{
//qDebug() << "PiePresenter::updateSlice()" << sliceData;
if (!m_slices.contains(sliceData)) {
Q_ASSERT(0); // TODO: how to handle this nicely?
return;
}
m_slices[sliceData]->updateData(sliceData);
}
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 void PiePresenter::deleteSlice(QPieSlice* sliceData)
Jani Honkonen
Refactoring piechart API (and internals)
 r174 {
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 //qDebug() << "PiePresenter::deleteSlice()" << sliceData;
Jani Honkonen
Refactoring piechart API (and internals)
 r174
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 if (!m_slices.contains(sliceData)) {
Q_ASSERT(0); // TODO: how to handle this nicely?
return;
Jani Honkonen
Refactoring piechart API (and internals)
 r174 }
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289
delete m_slices.take(sliceData);
Jani Honkonen
Pie chart refactoring
 r142 }
Jani Honkonen
Add _p to pie internal headers
 r353 #include "moc_piepresenter_p.cpp"
Jani Honkonen
Pie chart refactoring
 r142
QTCOMMERCIALCHART_END_NAMESPACE