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

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

Add QML designer plugin...
Add QML designer plugin Added QML designer plugin for Charts. It's possible now to add all possible series in ChartView and PolarChartView type. The properties of ChartView and PolarChartView can be set via the QML designer. The properties of the series are not editable via the QML designer. Change-Id: I51cd6bf5bd33cd8d0f7b7f2fb992e7963e344dae Task-number: QTRD-3356 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Titta Heikkala - - Load All Authors

File last commit:

r2714:929d943d1aab
r2738:6c4e7f2cd60f
Show More
xychart.cpp
189 lines | 5.4 KiB | text/x-c | CppLexer
/ src / charts / xychart / xychart.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
Michal Klocek
Refactors animation handling for xyseries
 r1217 **
Titta Heikkala
Update copyright year...
 r2688 ** Copyright (C) 2014 Digia Plc
Michal Klocek
Refactors animation handling for xyseries
 r1217 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** This file is part of the Qt Enterprise Charts Add-on.
Michal Klocek
Refactors animation handling for xyseries
 r1217 **
** $QT_BEGIN_LICENSE$
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise License Agreement provided with the
Michal Klocek
Refactors animation handling for xyseries
 r1217 ** 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
Add license headers
 r794
Titta Heikkala
Fix include syntax...
 r2714 #include <private/xychart_p.h>
#include <QtCharts/QXYSeries>
#include <private/qxyseries_p.h>
#include <private/chartpresenter_p.h>
#include <private/abstractdomain_p.h>
#include <QtCharts/QXYModelMapper>
#include <private/qabstractaxis_p.h>
#include <QtGui/QPainter>
#include <QtCore/QAbstractItemModel>
Michal Klocek
Refactor animator...
 r1735
Michal Klocek
Add missing files from previous commit
 r466
Titta Heikkala
Qt Charts project file structure change...
 r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Add missing files from previous commit
 r466
Miikka Heikkinen
Add Polar chart support...
 r2483 XYChart::XYChart(QXYSeries *series, QGraphicsItem *item):
Michal Klocek
Refactors internals...
 r2273 ChartItem(series->d_func(),item),
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 m_series(series),
m_animation(0),
m_dirty(true)
Michal Klocek
Refactors animation handling for xyseries
 r1217 {
Tero Ahola
Minor: extra colons, commented out code
 r1782 QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int)));
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
 r1783 QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced()));
Tero Ahola
Minor: extra colons, commented out code
 r1782 QObject::connect(series, SIGNAL(pointAdded(int)), this, SLOT(handlePointAdded(int)));
QObject::connect(series, SIGNAL(pointRemoved(int)), this, SLOT(handlePointRemoved(int)));
QObject::connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));
Marek Rosa
Added hovered signal to QLineSeries. Updated callout example
 r2255 QObject::connect(this, SIGNAL(hovered(QPointF,bool)), series, SIGNAL(hovered(QPointF,bool)));
Michal Klocek
Refactors animation handling for xyseries
 r1217 }
Miikka Heikkinen
Add Polar chart support...
 r2483 void XYChart::setGeometryPoints(const QVector<QPointF> &points)
Michal Klocek
Refactors animation handling for xyseries
 r1217 {
m_points = points;
}
Jani Honkonen
more coding style fixes for src-folder...
 r2104 void XYChart::setAnimation(XYAnimation *animation)
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 m_animation = animation;
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactors axis animation, line animations
 r1241 void XYChart::setDirty(bool dirty)
{
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 m_dirty = dirty;
Michal Klocek
Refactors axis animation, line animations
 r1241 }
Miikka Heikkinen
Add Polar chart support...
 r2483 // Returns a vector with same size as geometryPoints vector, indicating
// the off grid status of points.
QVector<bool> XYChart::offGridStatusVector()
{
qreal minX = domain()->minX();
qreal maxX = domain()->maxX();
qreal minY = domain()->minY();
qreal maxY = domain()->maxY();
QVector<bool> returnVector;
returnVector.resize(m_points.size());
Miikka Heikkinen
Further animation fixes...
 r2492 // During remove animation series may have different number of points,
Miikka Heikkinen
Fix crash when adding/removing points during animation...
 r2489 // so ensure we don't go over the index. No need to check for zero points, this
// will not be called in such a situation.
const int seriesLastIndex = m_series->count() - 1;
Miikka Heikkinen
Add Polar chart support...
 r2483
for (int i = 0; i < m_points.size(); i++) {
Miikka Heikkinen
Refactor the new QXYSeries::pointAt() -> QXYSeries::at()...
 r2491 const QPointF &seriesPoint = m_series->at(qMin(seriesLastIndex, i));
Miikka Heikkinen
Add Polar chart support...
 r2483 if (seriesPoint.x() < minX
|| seriesPoint.x() > maxX
|| seriesPoint.y() < minY
|| seriesPoint.y() > maxY) {
returnVector[i] = true;
} else {
returnVector[i] = false;
}
}
return returnVector;
}
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
Michal Klocek
Add missing files from previous commit
 r466 {
Michal Klocek
adds QLineAnimation fixes
 r1271
Michal Klocek
Refactors animation handling for xyseries
 r1217 if (m_animation) {
Michal Klocek
adds QLineAnimation fixes
 r1271 m_animation->setup(oldPoints, newPoints, index);
Tero Ahola
Minor: extra colons, commented out code
 r1782 m_points = newPoints;
Michal Klocek
Refactors axis animation, line animations
 r1241 setDirty(false);
presenter()->startAnimation(m_animation);
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 } else {
Tero Ahola
Minor: extra colons, commented out code
 r1782 m_points = newPoints;
Michal Klocek
Refactors animation handling for xyseries
 r1217 updateGeometry();
Michal Klocek
Animation refactor...
 r530 }
Michal Klocek
Add missing files from previous commit
 r466 }
//handlers
Michal Klocek
Refactor xychartitem -> xychart
 r1218 void XYChart::handlePointAdded(int index)
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 Q_ASSERT(index < m_series->count());
Q_ASSERT(index >= 0);
Michal Klocek
Refactors animation handling for xyseries
 r1217
Michal Klocek
Refactors axis animation, line animations
 r1241 QVector<QPointF> points;
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 if (m_dirty || m_points.isEmpty()) {
Michal Klocek
Refactors internals...
 r2273 points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 } else {
points = m_points;
Marek Rosa
Negative values with log axis handled
 r2356 QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData);
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 if (!m_validData)
Marek Rosa
Negative values with log axis handled
 r2356 m_points.clear();
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 else
points.insert(index, point);
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 }
Michal Klocek
Refactors axis animation, line animations
 r1241
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 updateChart(m_points, points, index);
Michal Klocek
Add missing files from previous commit
 r466 }
Marek Rosa
QXYSeries: support for adding data to model when using custom mapping
 r1054
Michal Klocek
Refactor xychartitem -> xychart
 r1218 void XYChart::handlePointRemoved(int index)
Michal Klocek
Adds big fat pimpl to series classes...
 r938 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 Q_ASSERT(index <= m_series->count());
Q_ASSERT(index >= 0);
Michal Klocek
Refactors animation handling for xyseries
 r1217
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 QVector<QPointF> points;
Michal Klocek
Refactors animation handling for xyseries
 r1217
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 if (m_dirty || m_points.isEmpty()) {
Michal Klocek
Refactors internals...
 r2273 points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 } else {
points = m_points;
points.remove(index);
}
Michal Klocek
Refactors axis animation, line animations
 r1241
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 updateChart(m_points, points, index);
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 void XYChart::handlePointReplaced(int index)
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 Q_ASSERT(index < m_series->count());
Q_ASSERT(index >= 0);
Michal Klocek
Refactors animation handling for xyseries
 r1217
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 QVector<QPointF> points;
Michal Klocek
Refactors animation handling for xyseries
 r1217
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 if (m_dirty || m_points.isEmpty()) {
Michal Klocek
Refactors internals...
 r2273 points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 } else {
Marek Rosa
Negative values with log axis handled
 r2356 QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData);
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 if (!m_validData)
Marek Rosa
Negative values with log axis handled
 r2356 m_points.clear();
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 points = m_points;
Miikka Heikkinen
Fix crash when changing the values to empty model with logarithmic axis...
 r2427 if (m_validData)
points.replace(index, point);
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 }
Michal Klocek
Refactors axis animation, line animations
 r1241
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 updateChart(m_points, points, index);
Michal Klocek
Add missing files from previous commit
 r466 }
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
 r1783 void XYChart::handlePointsReplaced()
{
// All the points were replaced -> recalculate
Michal Klocek
Refactors internals...
 r2273 QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
 r1783 updateChart(m_points, points, -1);
}
Michal Klocek
Refactors Domain and Axis...
 r1698 void XYChart::handleDomainUpdated()
Michal Klocek
Add missing files from previous commit
 r466 {
sauimone
minor code review issues. indent, spaces, brackets etc.
 r743 if (isEmpty()) return;
Michal Klocek
Refactors internals...
 r2273 QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 updateChart(m_points, points);
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 bool XYChart::isEmpty()
Michal Klocek
Add missing files from previous commit
 r466 {
Michal Klocek
Refactors internals...
 r2273 return domain()->isEmpty() || m_series->points().isEmpty();
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 #include "moc_xychart_p.cpp"
Michal Klocek
Add missing files from previous commit
 r466
Titta Heikkala
Qt Charts project file structure change...
 r2712 QT_CHARTS_END_NAMESPACE