diff options
Diffstat (limited to 'src/datavisualization/data/qsurface3dseries.cpp')
-rw-r--r-- | src/datavisualization/data/qsurface3dseries.cpp | 52 |
1 files changed, 13 insertions, 39 deletions
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp index f3e8e1fa..9ac4a1de 100644 --- a/src/datavisualization/data/qsurface3dseries.cpp +++ b/src/datavisualization/data/qsurface3dseries.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qsurface3dseries_p.h" #include "surface3dcontroller_p.h" @@ -166,7 +140,7 @@ QT_BEGIN_NAMESPACE */ /*! - * \qmlproperty color Surface3DSeries::wireFrameColor + * \qmlproperty color Surface3DSeries::wireframeColor * \since 6.3 * * The color used to draw the gridlines of the surface wireframe. @@ -405,22 +379,22 @@ QString QSurface3DSeries::textureFile() const } /*! - * \property QSurface3DSeries::wireFrameColor + * \property QSurface3DSeries::wireframeColor * \since 6.3 * * \brief The color for the surface wireframe. */ -void QSurface3DSeries::setWireFrameColor(const QColor &color) +void QSurface3DSeries::setWireframeColor(const QColor &color) { - if (dptr()->m_wireFrameColor != color) { - dptr()->setWireFrameColor(color); - emit wireFrameColorChanged(color); + if (dptr()->m_wireframeColor != color) { + dptr()->setWireframeColor(color); + emit wireframeColorChanged(color); } } -QColor QSurface3DSeries::wireFrameColor() const +QColor QSurface3DSeries::wireframeColor() const { - return dptrc()->m_wireFrameColor; + return dptrc()->m_wireframeColor; } /*! * \internal @@ -445,7 +419,7 @@ QSurface3DSeriesPrivate::QSurface3DSeriesPrivate(QSurface3DSeries *q) m_selectedPoint(Surface3DController::invalidSelectionPosition()), m_flatShadingEnabled(true), m_drawMode(QSurface3DSeries::DrawSurfaceAndWireframe), - m_wireFrameColor(Qt::black) + m_wireframeColor(Qt::black) { m_itemLabelFormat = QStringLiteral("@xLabel, @yLabel, @zLabel"); m_mesh = QAbstract3DSeries::MeshSphere; @@ -578,9 +552,9 @@ void QSurface3DSeriesPrivate::setTexture(const QImage &texture) static_cast<Surface3DController *>(m_controller)->updateSurfaceTexture(qptr()); } -void QSurface3DSeriesPrivate::setWireFrameColor(const QColor &color) +void QSurface3DSeriesPrivate::setWireframeColor(const QColor &color) { - m_wireFrameColor = color; + m_wireframeColor = color; if (m_controller) m_controller->markSeriesVisualsDirty(); } |