diff options
Diffstat (limited to 'src/datavisualization/data/qheightmapsurfacedataproxy_p.h')
| -rw-r--r-- | src/datavisualization/data/qheightmapsurfacedataproxy_p.h | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h index 12219dd3..a6bd613c 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h @@ -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 // // W A R N I N G @@ -44,7 +18,7 @@ #include "qsurfacedataproxy_p.h" #include <QtCore/QTimer> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QHeightMapSurfaceDataProxyPrivate : public QSurfaceDataProxyPrivate { @@ -59,6 +33,9 @@ public: void setMaxXValue(float max); void setMinZValue(float min); void setMaxZValue(float max); + void setMinYValue(float min); + void setMaxYValue(float max); + void setAutoScaleY(bool enabled); private: QHeightMapSurfaceDataProxy *qptr(); void handlePendingResolve(); @@ -71,10 +48,13 @@ private: float m_maxXValue; float m_minZValue; float m_maxZValue; + float m_minYValue; + float m_maxYValue; + bool m_autoScaleY; friend class QHeightMapSurfaceDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |