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

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

Fix crash when changing the values to empty model with logarithmic axis...
Fix crash when changing the values to empty model with logarithmic axis One zero or negative value invalidates the whole layout for logarithmic axes, but this wasn't taken into account when replacing the points. Task-number: QTRD-1914 Reviewed-by: Mika Salmela
Tero Ahola - - Load All Authors

File last commit:

r2265:b004c42eda51
r2427:b3d485323aa9
Show More
qarealegendmarker.cpp
125 lines | 3.1 KiB | text/x-c | CppLexer
/ src / legend / qarealegendmarker.cpp
History | Source | Raw |Copy content |Copy permalink
sauimone
added QAreaLegendMarker
 r2176 /****************************************************************************
**
** Copyright (C) 2012 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 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 "qarealegendmarker.h"
#include "qarealegendmarker_p.h"
#include "qareaseries_p.h"
#include <QAreaSeries>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
documentation of legendmarkers
 r2216 /*!
\class QAreaLegendMarker
\brief QAreaLegendMarker object
\mainclass
QAreaLegendMarker is related to QAreaSeries. One QAreaSeries results in one marker.
\sa QLegend QAreaSeries
*/
/*!
\fn virtual LegendMarkerType QAreaLegendMarker::type()
Returns QLegendMarker::LegendMarkerTypeArea
*/
/*!
Tero Ahola
Fixed several documentation issues
 r2265 \internal
sauimone
documentation of legendmarkers
 r2216 */
sauimone
optional series parameter to markers function. code style fixes
 r2193 QAreaLegendMarker::QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent) :
sauimone
added QAreaLegendMarker
 r2176 QLegendMarker(*new QAreaLegendMarkerPrivate(this,series,legend), parent)
{
sauimone
fixed crash in legendmarker when calling update from private constructor
 r2227 d_ptr->updated();
sauimone
added QAreaLegendMarker
 r2176 }
sauimone
documentation of legendmarkers
 r2216 /*!
Destructor
*/
sauimone
added QAreaLegendMarker
 r2176 QAreaLegendMarker::~QAreaLegendMarker()
{
}
/*!
\internal
*/
QAreaLegendMarker::QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent) :
QLegendMarker(d, parent)
{
}
sauimone
documentation of legendmarkers
 r2216 /*!
Returns related series of marker
*/
sauimone
added QAreaLegendMarker
 r2176 QAreaSeries* QAreaLegendMarker::series()
{
Q_D(QAreaLegendMarker);
return d->m_series;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QAreaLegendMarkerPrivate::QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSeries *series, QLegend *legend) :
QLegendMarkerPrivate(q,legend),
sauimone
fixed crash in legendmarker when calling update from private constructor
 r2227 q_ptr(q),
sauimone
added QAreaLegendMarker
 r2176 m_series(series)
{
QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
}
QAreaLegendMarkerPrivate::~QAreaLegendMarkerPrivate()
{
}
sauimone
Better handling for new or removed markers
 r2182 QAreaSeries* QAreaLegendMarkerPrivate::series()
{
return m_series;
}
QObject* QAreaLegendMarkerPrivate::relatedObject()
{
return m_series;
}
sauimone
added QAreaLegendMarker
 r2176 void QAreaLegendMarkerPrivate::updated()
{
sauimone
signals for properties in legendmarker
 r2225 bool labelChanged = false;
bool brushChanged = false;
if (m_item->brush() != m_series->brush()) {
m_item->setBrush(m_series->brush());
brushChanged = true;
}
if (m_item->label() != m_series->name()) {
m_item->setLabel(m_series->name());
labelChanged = true;
}
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 QAreaLegendMarker
 r2176 }
#include "moc_qarealegendmarker.cpp"
#include "moc_qarealegendmarker_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE