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

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

Add animations to pie. Works but has some visual issues when adding slices.
Add animations to pie. Works but has some visual issues when adding slices.
Jani Honkonen - - Load All Authors

File last commit:

r618:249071e508d1
r618:249071e508d1
Show More
pieslice.cpp
203 lines | 5.4 KiB | text/x-c | CppLexer
/ src / piechart / pieslice.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add _p to pie internal headers
 r353 #include "pieslice_p.h"
Jani Honkonen
Rename piepresenter -> piechartitem
 r568 #include "piechartitem_p.h"
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 #include "qpieseries.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"
Tero Ahola
Z order for pie
 r490 #include "chartpresenter_p.h"
Tero Ahola
Integrated draft version of pie series
 r51 #include <QPainter>
#include <QDebug>
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 #include <qmath.h>
Jani Honkonen
Make pie work better with chartwidgettest
 r163 #include <QGraphicsSceneEvent>
Jani Honkonen
Refactoring piechart API (and internals)
 r174 #include <QTime>
Tero Ahola
Integrated draft version of pie series
 r51
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 #define PI 3.14159265 // TODO: is this defined in some header?
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 QPointF offset(qreal angle, qreal length)
{
qreal dx = qSin(angle*(PI/180)) * length;
qreal dy = qCos(angle*(PI/180)) * length;
return QPointF(dx, -dy);
}
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 PieSlice::PieSlice(QGraphicsItem* parent)
Jani Honkonen
Refactoring piechart API (and internals)
 r174 :QGraphicsObject(parent),
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 m_isExploded(false),
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 m_explodeDistanceFactor(0),
m_labelVisible(false),
m_labelArmLengthFactor(0)
Tero Ahola
Integrated draft version of pie series
 r51 {
setAcceptHoverEvents(true);
Jani Honkonen
Pie chart refactoring
 r142 setAcceptedMouseButtons(Qt::LeftButton);
Tero Ahola
Z order for pie
 r490 setZValue(ChartPresenter::PieSeriesZValue);
Tero Ahola
Integrated draft version of pie series
 r51 }
PieSlice::~PieSlice()
{
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203
Tero Ahola
Integrated draft version of pie series
 r51 }
QRectF PieSlice::boundingRect() const
{
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 return m_slicePath.boundingRect().united(m_labelTextRect);
Tero Ahola
Integrated draft version of pie series
 r51 }
QPainterPath PieSlice::shape() const
{
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 // Don't include the label and label arm.
// This is used to detect a mouse clicks. We do not want clicks from label.
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 return m_slicePath;
Tero Ahola
Integrated draft version of pie series
 r51 }
Jani Honkonen
Pie chart refactoring
 r142 void PieSlice::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/)
Tero Ahola
Integrated draft version of pie series
 r51 {
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 painter->setClipRect(parentItem()->boundingRect());
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 painter->save();
Jani Honkonen
Renaming pen & brush functions for pie and adding const
 r469 painter->setPen(m_slicePen);
painter->setBrush(m_sliceBrush);
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 painter->drawPath(m_slicePath);
painter->restore();
if (m_labelVisible) {
painter->save();
painter->setPen(m_labelArmPen);
painter->drawPath(m_labelArmPath);
painter->restore();
painter->setFont(m_labelFont);
painter->drawText(m_labelTextRect.bottomLeft(), m_labelText);
}
Tero Ahola
Integrated draft version of pie series
 r51 }
Jani Honkonen
Refactoring piechart API (and internals)
 r174 void PieSlice::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
Tero Ahola
Integrated draft version of pie series
 r51 {
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 emit hoverEnter();
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 }
Jani Honkonen
Make pie work better with chartwidgettest
 r163 void PieSlice::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 {
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 emit hoverLeave();
Tero Ahola
Integrated draft version of pie series
 r51 }
Jani Honkonen
Make pie work better with chartwidgettest
 r163 void PieSlice::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
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 emit clicked();
}
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 void PieSlice::setLayout(PieSliceLayout layout)
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 {
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 m_layout = layout;
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 }
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 void PieSlice::updateGeometry()
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 {
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 if (m_layout.m_radius <= 0)
Jani Honkonen
Make pie fit better inside its given rectangle. Label texts still go outside. Needs a bit more work...
 r289 return;
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 prepareGeometryChange();
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 // update slice path
qreal centerAngle;
QPointF armStart;
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 m_slicePath = slicePath(m_layout.m_center, m_layout.m_radius, m_layout.m_startAngle, m_layout.m_angleSpan, &centerAngle, &armStart);
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 // update text rect
m_labelTextRect = labelTextRect(m_labelFont, m_labelText);
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 // update label arm path
QPointF labelTextStart;
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 m_labelArmPath = labelArmPath(armStart, centerAngle, m_layout.m_radius * m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 // update text position
m_labelTextRect.moveBottomLeft(labelTextStart);
Jani Honkonen
Refactoring piechart API (and internals)
 r174
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 //qDebug() << "PieSlice::updateGeometry" << m_labelText << boundingRect() << m_startAngle << m_startAngle + m_angleSpan;
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 }
void PieSlice::updateData(const QPieSlice* sliceData)
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 {
Jani Honkonen
Refactor pie (again). QPieSlice's now emit signals and no id's anymore. Just pointers in the interface.
 r203 // TODO: compare what has changes to avoid unneccesary geometry updates
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 m_isExploded = sliceData->isExploded();
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 m_explodeDistanceFactor = sliceData->explodeDistanceFactor();
Jani Honkonen
Renaming pen & brush functions for pie and adding const
 r469 m_slicePen = sliceData->slicePen();
m_sliceBrush = sliceData->sliceBrush();
Jani Honkonen
Refactoring piechart API (and internals)
 r174
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 m_labelVisible = sliceData->isLabelVisible();
m_labelText = sliceData->label();
m_labelFont = sliceData->labelFont();
Jani Honkonen
Introducing vertical and horizontal factors to control the position of the pie.
 r454 m_labelArmLengthFactor = sliceData->labelArmLengthFactor();
Jani Honkonen
Renaming pen & brush functions for pie and adding const
 r469 m_labelArmPen = sliceData->labelArmPen();
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 }
Jani Honkonen
Fix issue with pie label not drawn correctly when first created
 r209
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 QPointF PieSlice::sliceCenter(QPointF point, qreal radius, QPieSlice *slice)
{
if (slice->isExploded()) {
qreal centerAngle = slice->startAngle() + (slice->m_angleSpan/2);
qreal len = radius * slice->explodeDistanceFactor();
qreal dx = qSin(centerAngle*(PI/180)) * len;
qreal dy = -qCos(centerAngle*(PI/180)) * len;
point += QPointF(dx, dy);
}
return point;
Jani Honkonen
Use signals from pieseries, visible hover and exploding slices
 r157 }
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 QPainterPath PieSlice::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal* centerAngle, QPointF* armStart)
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437 {
// calculate center angle
*centerAngle = startAngle + (angleSpan/2);
// calculate slice rectangle
QRectF rect(center.x()-radius, center.y()-radius, radius*2, radius*2);
// slice path
// TODO: draw the shape so that it might have a hole in the center
QPainterPath path;
path.moveTo(rect.center());
path.arcTo(rect, -startAngle + 90, -angleSpan);
path.closeSubpath();
// calculate label arm start point
*armStart = center;
Jani Honkonen
Refactoring the pie for animations (no actual animations yet)
 r566 *armStart += offset(*centerAngle, radius + PIESLICE_LABEL_GAP);
Jani Honkonen
Added a pie chart customization example and refactoring the pie interface.
 r437
return path;
}
QPainterPath PieSlice::labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF* textStart)
{
qreal dx = qSin(angle*(PI/180)) * length;
qreal dy = -qCos(angle*(PI/180)) * length;
QPointF parm1 = start + QPointF(dx, dy);
QPointF parm2 = parm1;
if (angle < 180) { // arm swings the other way on the left side
parm2 += QPointF(textWidth, 0);
*textStart = parm1;
}
else {
parm2 += QPointF(-textWidth,0);
*textStart = parm2;
}
// elevate the text position a bit so that it does not hit the line
*textStart += QPointF(0, -5);
QPainterPath path;
path.moveTo(start);
path.lineTo(parm1);
path.lineTo(parm2);
return path;
}
QRectF PieSlice::labelTextRect(QFont font, QString text)
{
QFontMetricsF fm(font);
return fm.boundingRect(text);
}
Jani Honkonen
Add _p to pie internal headers
 r353 #include "moc_pieslice_p.cpp"
Jani Honkonen
Refactoring piechart API (and internals)
 r174
Tero Ahola
Integrated draft version of pie series
 r51 QTCOMMERCIALCHART_END_NAMESPACE