diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /src/charts/xychart/xychart.cpp | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/charts/xychart/xychart.cpp')
-rw-r--r-- | src/charts/xychart/xychart.cpp | 189 |
1 files changed, 189 insertions, 0 deletions
diff --git a/src/charts/xychart/xychart.cpp b/src/charts/xychart/xychart.cpp new file mode 100644 index 00000000..18347d26 --- /dev/null +++ b/src/charts/xychart/xychart.cpp @@ -0,0 +1,189 @@ +/**************************************************************************** + ** + ** Copyright (C) 2014 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 Enterprise Charts Add-on. + ** + ** $QT_BEGIN_LICENSE$ + ** Licensees holding valid Qt Enterprise licenses may use this file in + ** accordance with the Qt Enterprise 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$ + ** + ****************************************************************************/ + +#include "xychart_p.h" +#include "qxyseries.h" +#include "qxyseries_p.h" +#include "chartpresenter_p.h" +#include "abstractdomain_p.h" +#include "qxymodelmapper.h" +#include "qabstractaxis_p.h" +#include <QPainter> +#include <QAbstractItemModel> + + +QT_CHARTS_BEGIN_NAMESPACE + +XYChart::XYChart(QXYSeries *series, QGraphicsItem *item): + ChartItem(series->d_func(),item), + m_series(series), + m_animation(0), + m_dirty(true) +{ + QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int))); + QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced())); + 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))); + QObject::connect(this, SIGNAL(hovered(QPointF,bool)), series, SIGNAL(hovered(QPointF,bool))); +} + +void XYChart::setGeometryPoints(const QVector<QPointF> &points) +{ + m_points = points; +} + +void XYChart::setAnimation(XYAnimation *animation) +{ + m_animation = animation; +} + +void XYChart::setDirty(bool dirty) +{ + m_dirty = dirty; +} + +// 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()); + // During remove animation series may have different number of points, + // 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; + + for (int i = 0; i < m_points.size(); i++) { + const QPointF &seriesPoint = m_series->at(qMin(seriesLastIndex, i)); + if (seriesPoint.x() < minX + || seriesPoint.x() > maxX + || seriesPoint.y() < minY + || seriesPoint.y() > maxY) { + returnVector[i] = true; + } else { + returnVector[i] = false; + } + } + return returnVector; +} + +void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index) +{ + + if (m_animation) { + m_animation->setup(oldPoints, newPoints, index); + m_points = newPoints; + setDirty(false); + presenter()->startAnimation(m_animation); + } else { + m_points = newPoints; + updateGeometry(); + } +} + +//handlers + +void XYChart::handlePointAdded(int index) +{ + Q_ASSERT(index < m_series->count()); + Q_ASSERT(index >= 0); + + QVector<QPointF> points; + + if (m_dirty || m_points.isEmpty()) { + points = domain()->calculateGeometryPoints(m_series->points()); + } else { + points = m_points; + QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData); + if (!m_validData) + m_points.clear(); + else + points.insert(index, point); + } + + updateChart(m_points, points, index); +} + +void XYChart::handlePointRemoved(int index) +{ + Q_ASSERT(index <= m_series->count()); + Q_ASSERT(index >= 0); + + QVector<QPointF> points; + + if (m_dirty || m_points.isEmpty()) { + points = domain()->calculateGeometryPoints(m_series->points()); + } else { + points = m_points; + points.remove(index); + } + + updateChart(m_points, points, index); +} + +void XYChart::handlePointReplaced(int index) +{ + Q_ASSERT(index < m_series->count()); + Q_ASSERT(index >= 0); + + QVector<QPointF> points; + + if (m_dirty || m_points.isEmpty()) { + points = domain()->calculateGeometryPoints(m_series->points()); + } else { + QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData); + if (!m_validData) + m_points.clear(); + points = m_points; + if (m_validData) + points.replace(index, point); + } + + updateChart(m_points, points, index); +} + +void XYChart::handlePointsReplaced() +{ + // All the points were replaced -> recalculate + QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points()); + updateChart(m_points, points, -1); +} + +void XYChart::handleDomainUpdated() +{ + if (isEmpty()) return; + QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points()); + updateChart(m_points, points); +} + +bool XYChart::isEmpty() +{ + return domain()->isEmpty() || m_series->points().isEmpty(); +} + +#include "moc_xychart_p.cpp" + +QT_CHARTS_END_NAMESPACE |