summaryrefslogtreecommitdiffstats
path: root/src/legend/qxylegendmarker.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 /src/legend/qxylegendmarker.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 'src/legend/qxylegendmarker.cpp')
-rw-r--r--src/legend/qxylegendmarker.cpp138
1 files changed, 0 insertions, 138 deletions
diff --git a/src/legend/qxylegendmarker.cpp b/src/legend/qxylegendmarker.cpp
deleted file mode 100644
index 4ebf8fdf..00000000
--- a/src/legend/qxylegendmarker.cpp
+++ /dev/null
@@ -1,138 +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 "qxylegendmarker.h"
-#include "qxylegendmarker_p.h"
-#include "qxyseries_p.h"
-#include <QXYSeries>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-
-/*!
- \class QXYLegendMarker
- \inmodule Qt Charts
- \brief QXYLegendMarker object.
- \mainclass
-
- QXYLegendMarker is related to QXYSeries derived classes. Each marker is related to one series.
-
- \sa QLegend, QXYSeries, QSplineSeries, QScatterSeries, QLineSeries
-*/
-
-/*!
- \fn virtual LegendMarkerType QXYLegendMarker::type()
- Returns QLegendMarker::LegendMarkerTypeXY
-*/
-
-/*!
- \internal
-*/
-QXYLegendMarker::QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent) :
- QLegendMarker(*new QXYLegendMarkerPrivate(this,series,legend), parent)
-{
- d_ptr->updated();
-}
-
-/*!
- Destructor
-*/
-QXYLegendMarker::~QXYLegendMarker()
-{
-}
-
-/*!
- \internal
-*/
-QXYLegendMarker::QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent) :
- QLegendMarker(d, parent)
-{
-}
-
-/*!
- Returns the related series
-*/
-QXYSeries* QXYLegendMarker::series()
-{
- Q_D(QXYLegendMarker);
- return d->m_series;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-QXYLegendMarkerPrivate::QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend) :
- QLegendMarkerPrivate(q,legend),
- q_ptr(q),
- m_series(series)
-{
- QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
- QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(updated()));
-}
-
-QXYLegendMarkerPrivate::~QXYLegendMarkerPrivate()
-{
-}
-
-QAbstractSeries* QXYLegendMarkerPrivate::series()
-{
- return m_series;
-}
-
-QObject* QXYLegendMarkerPrivate::relatedObject()
-{
- return m_series;
-}
-
-void QXYLegendMarkerPrivate::updated()
-{
- bool labelChanged = false;
- bool brushChanged = false;
-
- if (!m_customLabel && (m_item->label() != m_series->name())) {
- m_item->setLabel(m_series->name());
- labelChanged = true;
- }
-
- if (m_series->type()== QAbstractSeries::SeriesTypeScatter) {
- if (!m_customBrush && (m_item->brush() != m_series->brush())) {
- m_item->setBrush(m_series->brush());
- brushChanged = true;
- }
- } else {
- QBrush emptyBrush;
- if (!m_customBrush
- && (m_item->brush() == emptyBrush
- || m_item->brush().color() != m_series->pen().color())) {
- m_item->setBrush(QBrush(m_series->pen().color()));
- brushChanged = true;
- }
- }
- invalidateLegend();
-
- if (labelChanged)
- emit q_ptr->labelChanged();
- if (brushChanged)
- emit q_ptr->brushChanged();
-}
-
-#include "moc_qxylegendmarker.cpp"
-#include "moc_qxylegendmarker_p.cpp"
-
-QTCOMMERCIALCHART_END_NAMESPACE
-