diff options
Diffstat (limited to 'src/datavisualization/engine/q3dscatter.cpp')
| -rw-r--r-- | src/datavisualization/engine/q3dscatter.cpp | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index a4d371d5..26325b33 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -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 Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Data Visualization 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$ ** -******************************************************************************/ +****************************************************************************/ #include "q3dscatter.h" #include "q3dscatter_p.h" @@ -81,6 +89,9 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION Q3DScatter::Q3DScatter(const QSurfaceFormat *format, QWindow *parent) : QAbstract3DGraph(new Q3DScatterPrivate(this), format, parent) { + if (!dptr()->m_initialized) + return; + dptr()->m_shared = new Scatter3DController(geometry()); d_ptr->setVisualController(dptr()->m_shared); dptr()->m_shared->initializeOpenGL(); @@ -251,7 +262,8 @@ QList<QValue3DAxis *> Q3DScatter::axes() const } Q3DScatterPrivate::Q3DScatterPrivate(Q3DScatter *q) - : QAbstract3DGraphPrivate(q) + : QAbstract3DGraphPrivate(q), + m_shared(0) { } |