##// END OF EJS Templates
Fix zooming...
Fix zooming If chart is zoomed only horizontally or vertically then the range for the other direction should not change. This is now checked by comparing the minimum and maximum values to the axis span. Change-Id: Icb5e14fc41afcedd7f75e60ca3ad6f699b053ae7 Task-number: QTRD-3399 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2712:c544258484ff
r2728:2e341eff31af
Show More
declarativescatterseries.cpp
114 lines | 3.8 KiB | text/x-c | CppLexer
/ src / chartsqml2 / declarativescatterseries.cpp
/****************************************************************************
**
** 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 "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(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