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

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

Fix checking for labels out of axis grid....
Fix checking for labels out of axis grid. Change-Id: Ib55312f9e7cb58e6d1f47912d54f3bf56b8871cc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Miikka Heikkinen - - Load All Authors

File last commit:

r2520:73d53b3b614a
r2570:ac7068d4fd37
Show More
qxylegendmarker.cpp
137 lines | 3.5 KiB | text/x-c | CppLexer
/ src / legend / qxylegendmarker.cpp
History | Source | Raw |Copy content |Copy permalink
sauimone
added QXYLegendMarker
 r2175 /****************************************************************************
**
Miikka Heikkinen
Fixed the copyright year 2012 -> 2013
 r2432 ** Copyright (C) 2013 Digia Plc
sauimone
added QXYLegendMarker
 r2175 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
** This file is part of the Qt Commercial Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial 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
sauimone
documentation of legendmarkers
 r2216 /*!
\class QXYLegendMarker
Miikka Heikkinen
Fix some documentation issues...
 r2520 \brief QXYLegendMarker object.
sauimone
documentation of legendmarkers
 r2216 \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
*/
/*!
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"
QTCOMMERCIALCHART_END_NAMESPACE