##// 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:

r2717:85d2c314748b
r2728:2e341eff31af
Show More
declarativescatterseries.h
116 lines | 5.3 KiB | text/x-c | CLexer
/ src / chartsqml2 / declarativescatterseries.h
/****************************************************************************
**
** 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$
**
****************************************************************************/
#ifndef DECLARATIVESCATTERSERIES_H
#define DECLARATIVESCATTERSERIES_H
#include <QtCharts/QScatterSeries>
#include "declarativexyseries.h"
#include "declarativeaxes.h"
#include <QtQml/QQmlListProperty>
#include <QtQml/QQmlParserStatus>
QT_CHARTS_BEGIN_NAMESPACE
class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(int count READ count NOTIFY countChanged)
Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)
Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4)
Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4)
Q_CLASSINFO("DefaultProperty", "declarativeChildren")
public:
explicit DeclarativeScatterSeries(QObject *parent = 0);
QXYSeries *xySeries() { return this; }
QAbstractAxis *axisX() { return m_axes->axisX(); }
void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
QAbstractAxis *axisY() { return m_axes->axisY(); }
void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
QAbstractAxis *axisAngular() { return m_axes->axisX(); }
void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
QAbstractAxis *axisRadial() { return m_axes->axisY(); }
void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
qreal borderWidth() const;
void setBorderWidth(qreal borderWidth);
QQmlListProperty<QObject> declarativeChildren();
QString brushFilename() const;
void setBrushFilename(const QString &brushFilename);
void setBrush(const QBrush &brush);
QBrush brush() const;
public: // from QDeclarativeParserStatus
void classBegin() { DeclarativeXySeries::classBegin(); }
void componentComplete() { DeclarativeXySeries::componentComplete(); }
public:
Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
Q_SIGNALS:
void countChanged(int count);
Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
Q_REVISION(1) void borderWidthChanged(qreal width);
Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);
Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);
Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);
Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);
Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename);
Q_REVISION(4) void brushChanged();
public Q_SLOTS:
static void appendDeclarativeChildren(QQmlListProperty<QObject> *list, QObject *element);
void handleCountChanged(int index);
private Q_SLOTS:
void handleBrushChanged();
public:
DeclarativeAxes *m_axes;
private:
QString m_brushFilename;
QImage m_brushImage;
};
QT_CHARTS_END_NAMESPACE
#endif // DECLARATIVESCATTERSERIES_H