##// END OF EJS Templates
Added dist file for 2.1.0 and changed version numbers...
Added dist file for 2.1.0 and changed version numbers Added placeholder dist file for 2.1.0. Updated version numbers to 2.1.0. Change-Id: Ia2fc30c38c2467d613158b7af4392aa5298d2171 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2805:42870bd3de5c
r2808:336e6534e2dc
Show More
declarativescatterseries.cpp
113 lines | 3.8 KiB | text/x-c | CppLexer
/ src / chartsqml2 / declarativescatterseries.cpp
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd
** All rights reserved.
** For any questions to The Qt Company, please use contact form at http://qt.io
**
** This file is part of the Qt Charts module.
**
** 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
** agreement between you and The Qt Company.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.io
**
****************************************************************************/
#include "declarativescatterseries.h"
QT_CHARTS_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(pointsRemoved(int, 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);
}
}
QQmlListProperty<QObject> DeclarativeScatterSeries::declarativeChildren()
{
return QQmlListProperty<QObject>(this, 0, &appendDeclarativeChildren ,0,0,0);
}
void DeclarativeScatterSeries::appendDeclarativeChildren(QQmlListProperty<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"
QT_CHARTS_END_NAMESPACE