diff options
Diffstat (limited to 'src/datavisualization/engine/bars3dcontroller_p.h')
-rw-r--r-- | src/datavisualization/engine/bars3dcontroller_p.h | 49 |
1 files changed, 15 insertions, 34 deletions
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index dc50f773..a92db468 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_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 @@ -40,10 +14,10 @@ #ifndef Q3DBARSCONTROLLER_p_H #define Q3DBARSCONTROLLER_p_H -#include "datavisualizationglobal_p.h" -#include "abstract3dcontroller_p.h" +#include <private/datavisualizationglobal_p.h> +#include <private/abstract3dcontroller_p.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Bars3DRenderer; class QBar3DSeries; @@ -55,6 +29,7 @@ struct Bars3DChangeBitField { bool rowsChanged : 1; bool itemChanged : 1; bool floorLevelChanged : 1; + bool barSeriesMarginChanged : 1; Bars3DChangeBitField() : multiSeriesScalingChanged(true), @@ -62,12 +37,13 @@ struct Bars3DChangeBitField { selectedBarChanged(true), rowsChanged(false), itemChanged(false), - floorLevelChanged(false) + floorLevelChanged(false), + barSeriesMarginChanged(false) { } }; -class QT_DATAVISUALIZATION_EXPORT Bars3DController : public Abstract3DController +class Q_DATAVISUALIZATION_EXPORT Bars3DController : public Abstract3DController { Q_OBJECT @@ -98,6 +74,7 @@ private: GLfloat m_barThicknessRatio; QSizeF m_barSpacing; float m_floorLevel; + QSizeF m_barSeriesMargin; // Rendering Bars3DRenderer *m_renderer; @@ -118,6 +95,9 @@ public: void setBarSpecs(GLfloat thicknessRatio = 1.0f, const QSizeF &spacing = QSizeF(1.0, 1.0), bool relative = true); + void setBarSeriesMargin(const QSizeF &margin); + QSizeF barSeriesMargin(); + GLfloat barThickness(); QSizeF barSpacing(); bool isBarSpecRelative(); @@ -159,6 +139,7 @@ public Q_SLOTS: void handleItemChanged(int rowIndex, int columnIndex); void handleDataRowLabelsChanged(); void handleDataColumnLabelsChanged(); + void handleRowColorsChanged(); Q_SIGNALS: void primarySeriesChanged(QBar3DSeries *series); @@ -173,6 +154,6 @@ private: Q_DISABLE_COPY(Bars3DController) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |