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

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

Fixed scatter not updating on setBrush/setPen
Fixed scatter not updating on setBrush/setPen
Marek Rosa - - Load All Authors

File last commit:

r1275:5883c94a00fe
r1305:0ab6c866962e
Show More
qsplineseries.cpp
225 lines | 7.2 KiB | text/x-c | CppLexer
/ src / splinechart / qsplineseries.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$
**
****************************************************************************/
Marek Rosa
Spline initial
 r295 #include "qsplineseries.h"
Michal Klocek
Adds big fat pimpl to series classes...
 r938 #include "qsplineseries_p.h"
Michal Klocek
Refactor to use qseries private for implmentation interface...
 r943 #include "splinechartitem_p.h"
#include "chartdataset_p.h"
#include "charttheme_p.h"
#include "chartanimator_p.h"
Marek Rosa
Spline initial
 r295
Marek Rosa
QSplineSeries documentation added
 r433 /*!
\class QSplineSeries
\brief Series type used to store data needed to draw a spline.
QSplineSeries stores the data points along with the segment control points needed by QPainterPath to draw spline
Control points are automatically calculated when data changes. The algorithm computes the points so that the normal spline can be drawn.
Tero Ahola
Documentation fixes....
 r995
\image examples_splinechart.png
Creating basic spline chart is simple:
\code
QSplineSeries* series = new QSplineSeries();
series->append(0, 6);
series->append(2, 4);
...
chart->addSeries(series);
\endcode
Marek Rosa
QSplineSeries documentation added
 r433 */
/*!
\fn QSeriesType QSplineSeries::type() const
Returns the type of the series
*/
Marek Rosa
Spline working somewhat
 r401 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Marek Rosa
QSplineSeries documentation added
 r433 /*!
Constructs empty series object which is a child of \a parent.
Michal Klocek
Krazy reported errors...
 r974 When series object is added to QChartView or QChart instance then the ownerships is transferred.
Marek Rosa
QSplineSeries documentation added
 r433 */
Marek Rosa
Spline initial
 r295 QSplineSeries::QSplineSeries(QObject *parent) :
Michal Klocek
Adds big fat pimpl to series classes...
 r938 QLineSeries(*new QSplineSeriesPrivate(this),parent)
Marek Rosa
Spline initial
 r295 {
Marek Rosa
Fixed spline's broken signals
 r1275 Q_D(QSplineSeries);
QObject::connect(this,SIGNAL(pointAdded(int)), d, SLOT(updateControlPoints()));
QObject::connect(this,SIGNAL(pointRemoved(int)), d, SLOT(updateControlPoints()));
QObject::connect(this,SIGNAL(pointReplaced(int)), d, SLOT(updateControlPoints()));
Marek Rosa
Spline initial
 r295 }
Marek Rosa
Spline some more
 r305
Michal Klocek
Bugfixes for spline vector allocation issues
 r1082 QSplineSeries::~QSplineSeries()
{
Q_D(QSplineSeries);
if(d->m_dataset){
Marek Rosa
Removed controlPoint function from SplineSeries Public API
 r1160 d->m_dataset->removeSeries(this);
Michal Klocek
Bugfixes for spline vector allocation issues
 r1082 }
}
Michal Klocek
Fixes to API , QSeriesType -> SeriesType , add missing getters
 r1107 QAbstractSeries::SeriesType QSplineSeries::type() const
Michal Klocek
Adds big fat pimpl to series classes...
 r938 {
Tero Ahola
Renamed QSeries to QAbstractSeries
 r988 return QAbstractSeries::SeriesTypeSpline;
Michal Klocek
Adds big fat pimpl to series classes...
 r938 }
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries* q):QLineSeriesPrivate(q)
{
Marek Rosa
Fixed spline's broken signals
 r1275 // QObject::connect(this,SIGNAL(pointAdded(int)), this, SLOT(updateControlPoints()));
// QObject::connect(this,SIGNAL(pointRemoved(int)), this, SLOT(updateControlPoints()));
// QObject::connect(this,SIGNAL(pointReplaced(int)), this, SLOT(updateControlPoints()));
Michal Klocek
Adds big fat pimpl to series classes...
 r938 };
Marek Rosa
QSplineSeries documentation added
 r433 /*!
Calculates control points which are needed by QPainterPath.cubicTo function to draw the cubic Bezier cureve between two points.
*/
Michal Klocek
Adds big fat pimpl to series classes...
 r938 void QSplineSeriesPrivate::calculateControlPoints()
Marek Rosa
Spline working somewhat
 r401 {
Michal Klocek
Fix xy series model issues due to API changes
 r1059 Q_Q(QSplineSeries);
const QList<QPointF>& points = q->points();
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
Fix xy series model issues due to API changes
 r1059 int n = points.count() - 1;
Michal Klocek
minor. Release polishing
 r1049
Marek Rosa
Spline working somewhat
 r401 if (n == 1)
Michal Klocek
minor. Release polishing
 r1049 {
//for n==1
Michal Klocek
Fix xy series model issues due to API changes
 r1059 m_controlPoints[0].setX((2 * points[0].x() + points[1].x()) / 3);
m_controlPoints[0].setY((2 * points[0].y() + points[1].y()) / 3);
m_controlPoints[1].setX(2 * m_controlPoints[0].x() - points[0].x());
m_controlPoints[1].setY(2 * m_controlPoints[0].y() - points[0].y());
Marek Rosa
Spline working somewhat
 r401 return;
Marek Rosa
Further changes
 r318 }
Marek Rosa
Spline working somewhat
 r401 // Calculate first Bezier control points
// Right hand side vector
// Set of equations for P0 to Pn points.
//
// | 2 1 0 0 ... 0 0 0 ... 0 0 0 | | P1_1 | | P0 + 2 * P1 |
// | 1 4 1 0 ... 0 0 0 ... 0 0 0 | | P1_2 | | 4 * P1 + 2 * P2 |
// | 0 1 4 1 ... 0 0 0 ... 0 0 0 | | P1_3 | | 4 * P2 + 2 * P3 |
// | . . . . . . . . . . . . | | ... | | ... |
// | 0 0 0 0 ... 1 4 1 ... 0 0 0 | * | P1_i | = | 4 * P(i-1) + 2 * Pi |
// | . . . . . . . . . . . . | | ... | | ... |
// | 0 0 0 0 0 0 0 0 ... 1 4 1 | | P1_(n-1)| | 4 * P(n-2) + 2 * P(n-1) |
// | 0 0 0 0 0 0 0 0 ... 0 2 7 | | P1_n | | 8 * P(n-1) + Pn |
//
Michal Klocek
Fixes and improvments to series API...
 r1057 QVector<qreal> vector;
vector.resize(n);
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
Fix xy series model issues due to API changes
 r1059 vector[0] = points[0].x() + 2 * points[1].x();
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
Fixes and improvments to series API...
 r1057 for (int i = 1; i < n - 1; ++i){
Michal Klocek
Fix xy series model issues due to API changes
 r1059 vector[i] = 4 * points[i].x() + 2 * points[i + 1].x();
Michal Klocek
Fixes and improvments to series API...
 r1057 }
Michal Klocek
minor. Release polishing
 r1049
Michal Klocek
Fix xy series model issues due to API changes
 r1059 vector[n - 1] = (8 * points[n-1].x() + points[n].x()) / 2.0;
Michal Klocek
minor. Release polishing
 r1049
Michal Klocek
Fixes and improvments to series API...
 r1057 QVector<qreal> xControl = firstControlPoints(vector);
Michal Klocek
Fix xy series model issues due to API changes
 r1059 vector[0] = points[0].y() + 2 * points[1].y();
Michal Klocek
minor. Release polishing
 r1049
for (int i = 1; i < n - 1; ++i) {
Michal Klocek
Fix xy series model issues due to API changes
 r1059 vector[i] = 4 * points[i].y() + 2 * points[i + 1].y();
Michal Klocek
minor. Release polishing
 r1049 }
Michal Klocek
Fix xy series model issues due to API changes
 r1059 vector[n - 1] = (8 * points[n-1].y() + points[n].y()) / 2.0;
Michal Klocek
Fixes and improvments to series API...
 r1057
QVector<qreal> yControl = firstControlPoints(vector);
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
Fixes and improvments to series API...
 r1057 for (int i = 0,j =0; i < n; ++i, ++j) {
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
Fixes and improvments to series API...
 r1057 m_controlPoints[j].setX(xControl[i]);
m_controlPoints[j].setY(yControl[i]);
Michal Klocek
minor. Release polishing
 r1049
Michal Klocek
Fixes and improvments to series API...
 r1057 j++;
Michal Klocek
minor. Release polishing
 r1049
Michal Klocek
Fixes and improvments to series API...
 r1057 if (i < n - 1){
Michal Klocek
Fix xy series model issues due to API changes
 r1059 m_controlPoints[j].setX(2 * points[i+1].x() - xControl[i + 1]);
m_controlPoints[j].setY(2 * points[i+1].y() - yControl[i + 1]);
Michal Klocek
Fixes and improvments to series API...
 r1057 }else{
Michal Klocek
Fix xy series model issues due to API changes
 r1059 m_controlPoints[j].setX((points[n].x() + xControl[n - 1]) / 2);
m_controlPoints[j].setY((points[n].y() + yControl[n - 1]) / 2);
Michal Klocek
Fixes and improvments to series API...
 r1057 }
Marek Rosa
Further changes
 r318 }
Marek Rosa
Spline working somewhat
 r401 }
Michal Klocek
Fixes and improvments to series API...
 r1057 QVector<qreal> QSplineSeriesPrivate::firstControlPoints(const QVector<qreal>& vector)
Marek Rosa
Spline working somewhat
 r401 {
Michal Klocek
Fixes and improvments to series API...
 r1057 QVector<qreal> result;
int count = vector.count();
result.resize(count);
result[0] = vector[0] / 2.0;
QVector<qreal> temp;
temp.resize(count);
temp[0] = 0;
Marek Rosa
Spline working somewhat
 r401
qreal b = 2.0;
Michal Klocek
Fixes and improvments to series API...
 r1057
for (int i = 1; i < count; i++) {
temp[i] = 1 / b;
b = (i < count - 1 ? 4.0 : 3.5) - temp[i];
result[i]=(vector[i] - result[i - 1]) / b;
Marek Rosa
Spline working somewhat
 r401 }
Michal Klocek
Fixes and improvments to series API...
 r1057 for (int i = 1; i < count; i++)
result[count - i - 1] -= temp[count - i] * result[count - i];
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
minor. Release polishing
 r1049 return result;
Marek Rosa
Spline working somewhat
 r401 }
Marek Rosa
Added automatic refresh of control points on add/remove point. Spline example updated
 r431
Marek Rosa
Removed controlPoint function from SplineSeries Public API
 r1160 QPointF QSplineSeriesPrivate::controlPoint(int index) const
{
// Q_D(const QSplineSeries);
// return d->m_controlPoints[index];
return m_controlPoints[index];
}
Marek Rosa
QSplineSeries documentation added
 r433 /*!
Updates the control points, besed on currently avaiable knots.
*/
Michal Klocek
Adds big fat pimpl to series classes...
 r938 void QSplineSeriesPrivate::updateControlPoints()
Marek Rosa
Added automatic refresh of control points on add/remove point. Spline example updated
 r431 {
Michal Klocek
Fix xy series model issues due to API changes
 r1059 Q_Q(QSplineSeries);
if (q->count() > 1) {
m_controlPoints.resize(2*q->count()-2);
Marek Rosa
Added automatic refresh of control points on add/remove point. Spline example updated
 r431 calculateControlPoints();
}
}
Michal Klocek
Refactor to use qseries private for implmentation interface...
 r943 Chart* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)
{
Q_Q(QSplineSeries);
SplineChartItem* spline = new SplineChartItem(q,presenter);
if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
Michal Klocek
Refactors animation handling for xyseries
 r1217 spline->setAnimator(presenter->animator());
spline->setAnimation(new SplineAnimation(spline));
Michal Klocek
Refactor to use qseries private for implmentation interface...
 r943 }
Michal Klocek
Refactors animation handling for xyseries
 r1217
Michal Klocek
Refactor to use qseries private for implmentation interface...
 r943 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
return spline;
}
Marek Rosa
Spline working somewhat
 r401 #include "moc_qsplineseries.cpp"
Michal Klocek
Adds big fat pimpl to series classes...
 r938 #include "moc_qsplineseries_p.cpp"
Marek Rosa
Spline working somewhat
 r401
QTCOMMERCIALCHART_END_NAMESPACE