summaryrefslogtreecommitdiffstats
path: root/plugins/declarative/declarativescatterseries.cpp
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-07-01 07:10:00 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2014-10-14 13:04:52 +0300
commitc544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch)
tree7659625abb566dec55d3783ed820b928542d9b2b /plugins/declarative/declarativescatterseries.cpp
parent76339f714f088645e911cee65bdb66055fe029aa (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 'plugins/declarative/declarativescatterseries.cpp')
-rw-r--r--plugins/declarative/declarativescatterseries.cpp114
1 files changed, 0 insertions, 114 deletions
diff --git a/plugins/declarative/declarativescatterseries.cpp b/plugins/declarative/declarativescatterseries.cpp
deleted file mode 100644
index 9314db4d..00000000
--- a/plugins/declarative/declarativescatterseries.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** 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 "declarativescatterseries.h"
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-
-DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :
- QScatterSeries(parent),
- m_axes(new DeclarativeAxes(this))
-{
- connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisXChanged(QAbstractAxis*)));
- connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisYChanged(QAbstractAxis*)));
- connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SIGNAL(axisXTopChanged(QAbstractAxis*)));
- connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis*)), this, SIGNAL(axisYRightChanged(QAbstractAxis*)));
- connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisAngularChanged(QAbstractAxis*)));
- connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
- connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
- connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
- connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
-}
-
-void DeclarativeScatterSeries::handleCountChanged(int index)
-{
- Q_UNUSED(index)
- emit countChanged(QScatterSeries::count());
-}
-
-qreal DeclarativeScatterSeries::borderWidth() const
-{
- return pen().widthF();
-}
-
-void DeclarativeScatterSeries::setBorderWidth(qreal width)
-{
- if (width != pen().widthF()) {
- QPen p = pen();
- p.setWidthF(width);
- setPen(p);
- emit borderWidthChanged(width);
- }
-}
-
-QDECLARATIVE_LIST_PROPERTY<QObject> DeclarativeScatterSeries::declarativeChildren()
-{
- return QDECLARATIVE_LIST_PROPERTY<QObject>(this, 0, &appendDeclarativeChildren LIST_PROPERTY_PARAM_DEFAULTS);
-}
-
-void DeclarativeScatterSeries::appendDeclarativeChildren(QDECLARATIVE_LIST_PROPERTY<QObject> *list, QObject *element)
-{
- Q_UNUSED(list)
- Q_UNUSED(element)
- // Empty implementation, children are parsed in componentComplete
-}
-
-QString DeclarativeScatterSeries::brushFilename() const
-{
- return m_brushFilename;
-}
-
-void DeclarativeScatterSeries::setBrushFilename(const QString &brushFilename)
-{
- QImage brushImage(brushFilename);
- if (QScatterSeries::brush().textureImage() != brushImage) {
- QBrush brush = QScatterSeries::brush();
- brush.setTextureImage(brushImage);
- QScatterSeries::setBrush(brush);
- m_brushFilename = brushFilename;
- m_brushImage = brushImage;
- emit brushFilenameChanged(brushFilename);
- }
-}
-
-void DeclarativeScatterSeries::setBrush(const QBrush &brush)
-{
- QScatterSeries::setBrush(brush);
- emit brushChanged();
-}
-
-QBrush DeclarativeScatterSeries::brush() const
-{
- return QScatterSeries::brush();
-}
-
-void DeclarativeScatterSeries::handleBrushChanged()
-{
- // If the texture image of the brush has changed along the brush
- // the brush file name needs to be cleared.
- if (!m_brushFilename.isEmpty() && QScatterSeries::brush().textureImage() != m_brushImage) {
- m_brushFilename.clear();
- emit brushFilenameChanged(QString(""));
- }
-}
-
-#include "moc_declarativescatterseries.cpp"
-
-QTCOMMERCIALCHART_END_NAMESPACE