##// END OF EJS Templates
Updated private header warning...
Updated private header warning Removed 'Enterprise' from the Chart API name. Change-Id: Id6c7f3896bfcd72da2deebee430826b9c25793f6 Task-number: QTRD-3511 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2782:5fbd172ba15f
r2807:a9a78a1d08bc
Show More
qxylegendmarker.cpp
135 lines | 3.5 KiB | text/x-c | CppLexer
/ src / charts / legend / qxylegendmarker.cpp
sauimone
added QXYLegendMarker
r2175 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
r2776 ** Copyright (C) 2015 The Qt Company Ltd
sauimone
added QXYLegendMarker
r2175 ** All rights reserved.
Titta Heikkala
Copyright header changes...
r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
sauimone
added QXYLegendMarker
r2175 **
Titta Heikkala
Updated license headers...
r2740 ** This file is part of the Qt Charts module.
sauimone
added QXYLegendMarker
r2175 **
Titta Heikkala
Updated license headers...
r2740 ** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala
Copyright header changes...
r2776 ** agreement between you and The Qt Company.
sauimone
added QXYLegendMarker
r2175 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
r2740 ** contact form at http://qt.io
sauimone
added QXYLegendMarker
r2175 **
****************************************************************************/
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QXYLegendMarker>
#include <private/qxylegendmarker_p.h>
#include <private/qxyseries_p.h>
#include <QtCharts/QXYSeries>
sauimone
added QXYLegendMarker
r2175
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
sauimone
added QXYLegendMarker
r2175
sauimone
documentation of legendmarkers
r2216 /*!
\class QXYLegendMarker
Titta Heikkala
Fix Charts documentation...
r2639 \inmodule Qt Charts
Titta Heikkala
Qt Charts project file structure change...
r2712 \brief QLegendMarker subclass for QXYSeries.
sauimone
documentation of legendmarkers
r2216
QXYLegendMarker is related to QXYSeries derived classes. Each marker is related to one series.
Titta Heikkala
Fix Charts documentation...
r2639 \sa QLegend, QXYSeries, QSplineSeries, QScatterSeries, QLineSeries
sauimone
documentation of legendmarkers
r2216 */
/*!
\fn virtual LegendMarkerType QXYLegendMarker::type()
Returns QLegendMarker::LegendMarkerTypeXY
*/
/*!
Tero Ahola
Fixed several documentation issues
r2265 \internal
sauimone
documentation of legendmarkers
r2216 */
sauimone
optional series parameter to markers function. code style fixes
r2193 QXYLegendMarker::QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent) :
sauimone
added QXYLegendMarker
r2175 QLegendMarker(*new QXYLegendMarkerPrivate(this,series,legend), parent)
{
sauimone
fixed crash in legendmarker when calling update from private constructor
r2227 d_ptr->updated();
sauimone
added QXYLegendMarker
r2175 }
sauimone
documentation of legendmarkers
r2216 /*!
Destructor
*/
sauimone
added QXYLegendMarker
r2175 QXYLegendMarker::~QXYLegendMarker()
{
}
/*!
\internal
*/
QXYLegendMarker::QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent) :
QLegendMarker(d, parent)
{
}
sauimone
documentation of legendmarkers
r2216 /*!
Returns the related series
*/
sauimone
added QXYLegendMarker
r2175 QXYSeries* QXYLegendMarker::series()
{
Q_D(QXYLegendMarker);
return d->m_series;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QXYLegendMarkerPrivate::QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend) :
QLegendMarkerPrivate(q,legend),
sauimone
fixed crash in legendmarker when calling update from private constructor
r2227 q_ptr(q),
sauimone
added QXYLegendMarker
r2175 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()
{
}
sauimone
Better handling for new or removed markers
r2182 QAbstractSeries* QXYLegendMarkerPrivate::series()
{
return m_series;
}
QObject* QXYLegendMarkerPrivate::relatedObject()
{
return m_series;
}
sauimone
added QXYLegendMarker
r2175 void QXYLegendMarkerPrivate::updated()
{
sauimone
signals for properties in legendmarker
r2225 bool labelChanged = false;
bool brushChanged = false;
Mika Salmela
Fix for not overriding user settings for legend markers....
r2429 if (!m_customLabel && (m_item->label() != m_series->name())) {
sauimone
signals for properties in legendmarker
r2225 m_item->setLabel(m_series->name());
labelChanged = true;
}
sauimone
added QXYLegendMarker
r2175
if (m_series->type()== QAbstractSeries::SeriesTypeScatter) {
Mika Salmela
Fix for not overriding user settings for legend markers....
r2429 if (!m_customBrush && (m_item->brush() != m_series->brush())) {
sauimone
signals for properties in legendmarker
r2225 m_item->setBrush(m_series->brush());
brushChanged = true;
}
sauimone
added QXYLegendMarker
r2175 } else {
Miikka Heikkinen
Fix legend marker brush for series with black pen....
r2515 QBrush emptyBrush;
if (!m_customBrush
&& (m_item->brush() == emptyBrush
|| m_item->brush().color() != m_series->pen().color())) {
sauimone
fixed crash in legendmarker when calling update from private constructor
r2227 m_item->setBrush(QBrush(m_series->pen().color()));
sauimone
signals for properties in legendmarker
r2225 brushChanged = true;
}
sauimone
added QXYLegendMarker
r2175 }
sauimone
fix to QTRD-1674: layout is not calculated correctly after the change in the text of legend marker
r2194 invalidateLegend();
sauimone
signals for properties in legendmarker
r2225
if (labelChanged)
emit q_ptr->labelChanged();
if (brushChanged)
emit q_ptr->brushChanged();
sauimone
added QXYLegendMarker
r2175 }
#include "moc_qxylegendmarker.cpp"
#include "moc_qxylegendmarker_p.cpp"
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
sauimone
added QXYLegendMarker
r2175