diff options
Diffstat (limited to 'src/charts/xychart/glxyseriesdata_p.h')
-rw-r--r-- | src/charts/xychart/glxyseriesdata_p.h | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h index 689640fa..578ab217 100644 --- a/src/charts/xychart/glxyseriesdata_p.h +++ b/src/charts/xychart/glxyseriesdata_p.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Charts module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Charts module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ // W A R N I N G // ------------- @@ -36,6 +44,7 @@ #include <QtCharts/QXYSeries> #include <QtGui/QVector3D> #include <QtGui/QVector2D> +#include <QtGui/QMatrix4x4> QT_CHARTS_BEGIN_NAMESPACE @@ -49,6 +58,19 @@ struct GLXYSeriesData { QAbstractSeries::SeriesType type; QVector2D min; QVector2D delta; + QMatrix4x4 matrix; +public: + GLXYSeriesData &operator=(const GLXYSeriesData &data) { + array = data.array; + dirty = data.dirty; + color = data.color; + width = data.width; + type = data.type; + min = data.min; + delta = data.delta; + matrix = data.matrix; + return *this; + } }; typedef QMap<const QXYSeries *, GLXYSeriesData *> GLXYDataMap; @@ -75,6 +97,7 @@ public: foreach (GLXYSeriesData *data, m_seriesDataMap.values()) data->dirty = false; } + void handleAxisReverseChanged(const QList<QAbstractSeries *> &seriesList); public Q_SLOTS: void cleanup(); |