diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-06-25 13:17:44 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-06-25 13:45:48 +0300 |
commit | bb1c0b074db0cf6dbf4815f310b349e64e5422df (patch) | |
tree | e07fd7d4cb23ff0e5863a872449478b52eaf64e9 /src/datavis3d/axis | |
parent | a2d8a5ae5a4b0f50ac420f713cce4cd7d9e1a024 (diff) |
Axis abstraction
Axis related data is now stored in separate axis classes, but
have not yet been exposed beyond QDataSet.
Also contains unrelated gitignore change
Change-Id: I130ee6557accfab672d5014f47bb74be08e6feef
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/axis')
-rw-r--r-- | src/datavis3d/axis/axis.pri | 12 | ||||
-rw-r--r-- | src/datavis3d/axis/qabstractaxis.cpp | 115 | ||||
-rw-r--r-- | src/datavis3d/axis/qabstractaxis.h | 84 | ||||
-rw-r--r-- | src/datavis3d/axis/qabstractaxis_p.h | 94 | ||||
-rw-r--r-- | src/datavis3d/axis/qcategoryaxis.cpp | 91 | ||||
-rw-r--r-- | src/datavis3d/axis/qcategoryaxis.h | 64 | ||||
-rw-r--r-- | src/datavis3d/axis/qcategoryaxis_p.h | 74 | ||||
-rw-r--r-- | src/datavis3d/axis/qvalueaxis.cpp | 70 | ||||
-rw-r--r-- | src/datavis3d/axis/qvalueaxis.h | 62 | ||||
-rw-r--r-- | src/datavis3d/axis/qvalueaxis_p.h | 74 |
10 files changed, 740 insertions, 0 deletions
diff --git a/src/datavis3d/axis/axis.pri b/src/datavis3d/axis/axis.pri new file mode 100644 index 00000000..7d5a1c6f --- /dev/null +++ b/src/datavis3d/axis/axis.pri @@ -0,0 +1,12 @@ +HEADERS += \ + $$PWD/qabstractaxis.h \ + $$PWD/qabstractaxis_p.h \ + $$PWD/qvalueaxis.h \ + $$PWD/qvalueaxis_p.h \ + $$PWD/qcategoryaxis.h \ + $$PWD/qcategoryaxis_p.h + +SOURCES += \ + $$PWD/qabstractaxis.cpp \ + $$PWD/qvalueaxis.cpp \ + $$PWD/qcategoryaxis.cpp diff --git a/src/datavis3d/axis/qabstractaxis.cpp b/src/datavis3d/axis/qabstractaxis.cpp new file mode 100644 index 00000000..31382bc6 --- /dev/null +++ b/src/datavis3d/axis/qabstractaxis.cpp @@ -0,0 +1,115 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qabstractaxis.h" +#include "qabstractaxis_p.h" + +QT_DATAVIS3D_BEGIN_NAMESPACE + +QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent) : + QObject(parent), + d_ptr(d) +{ +} + +QAbstractAxis::~QAbstractAxis() +{ +} + +QString QAbstractAxis::title() const +{ + return d_ptr->m_title; +} + +QVector<QString> QAbstractAxis::labels() const +{ + return d_ptr->m_labels; +} + +void QAbstractAxis::setTitle(QString title) +{ + if (d_ptr->m_title != title) { + d_ptr->m_title = title; + // Generate axis label texture + if (d_ptr->m_drawer) + d_ptr->m_drawer->generateLabelItem(&d_ptr->m_titleItem, title); + emit titleChanged(title); + } +} + +// QAbstractAxisPrivate + +QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q) + : q_ptr(q), + m_drawer(0) +{ +} + +QAbstractAxisPrivate::~QAbstractAxisPrivate() +{ + m_titleItem.clear(); + for (int i = 0; i < m_labelItems.size(); i++) + m_labelItems[i].clear(); +} + +void QAbstractAxisPrivate::setDrawer(Drawer *drawer) +{ + m_drawer = drawer; + connect(m_drawer, SIGNAL(drawerChanged()), this, SLOT(updateTextures())); + updateTextures(); +} + +void QAbstractAxisPrivate::updateTextures() +{ + if (m_title.isEmpty()) + m_titleItem.clear(); + else + m_drawer->generateLabelItem(&m_titleItem, m_title); + + updateLabels(); +} + +void QAbstractAxisPrivate::updateLabels() +{ + // Default implementation does nothing. +} + +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/qabstractaxis.h new file mode 100644 index 00000000..f64a4f35 --- /dev/null +++ b/src/datavis3d/axis/qabstractaxis.h @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QABSTRACTAXIS_H +#define QABSTRACTAXIS_H + +#include "qdatavis3dnamespace.h" +#include <QObject> +#include <QScopedPointer> +#include <QVector> + +QT_DATAVIS3D_BEGIN_NAMESPACE + +class QAbstractAxisPrivate; + +class QT_DATAVIS3D_EXPORT QAbstractAxis : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged) + +protected: + explicit QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent = 0); +public: + virtual ~QAbstractAxis(); + + QString title() const; + QVector<QString> labels() const; + +public slots: + void setTitle(QString title); + +signals: + void titleChanged(QString newTitle); + +protected: + QScopedPointer<QAbstractAxisPrivate> d_ptr; + +private: + Q_DISABLE_COPY(QAbstractAxis) + + friend class QDataSetPrivate; +}; + +QT_DATAVIS3D_END_NAMESPACE + +#endif // QABSTRACTAXIS_H diff --git a/src/datavis3d/axis/qabstractaxis_p.h b/src/datavis3d/axis/qabstractaxis_p.h new file mode 100644 index 00000000..82e0adbb --- /dev/null +++ b/src/datavis3d/axis/qabstractaxis_p.h @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QtDataVis3D API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#include "qabstractaxis.h" +#include "drawer_p.h" +#include "labelitem_p.h" + +#ifndef QABSTRACTAXIS_P_H +#define QABSTRACTAXIS_P_H + +QT_DATAVIS3D_BEGIN_NAMESPACE + +class QT_DATAVIS3D_EXPORT QAbstractAxisPrivate : public QObject +{ + Q_OBJECT +public: + QAbstractAxisPrivate(QAbstractAxis *q); + virtual ~QAbstractAxisPrivate(); + + void setDrawer(Drawer *drawer); + QVector<LabelItem> labelItems() { return m_labelItems; } + LabelItem titleItem() { return m_titleItem; } + +public slots: + void updateTextures(); + +protected: + virtual void updateLabels(); + + QAbstractAxis *q_ptr; + + QString m_title; + LabelItem m_titleItem; + Drawer *m_drawer; // not owned + QVector<QString> m_labels; + QVector<LabelItem> m_labelItems; + + friend class QAbstractAxis; + friend class QValueAxis; + friend class QCategoryAxis; + friend class QDataSetPrivate; +}; + +QT_DATAVIS3D_END_NAMESPACE + +#endif // QABSTRACTAXIS_P_H diff --git a/src/datavis3d/axis/qcategoryaxis.cpp b/src/datavis3d/axis/qcategoryaxis.cpp new file mode 100644 index 00000000..30e466fc --- /dev/null +++ b/src/datavis3d/axis/qcategoryaxis.cpp @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qcategoryaxis.h" +#include "qcategoryaxis_p.h" + +QT_DATAVIS3D_BEGIN_NAMESPACE + +QCategoryAxis::QCategoryAxis(QObject *parent) : + QAbstractAxis(new QCategoryAxisPrivate(this), parent) +{ +} + +QCategoryAxis::~QCategoryAxis() +{ +} + +void QCategoryAxis::setLabels(const QVector<QString> &labels) +{ + int newSize(labels.size()); + int oldSize(d_ptr->m_labels.size()); + + for (int i = oldSize - 1; i >= newSize; i--) + d_ptr->m_labelItems[i].clear(); + + d_ptr->m_labelItems.resize(newSize); + + if (d_ptr->m_drawer) { + for (int i = 0; i < newSize; i++) { + if (i >= oldSize || labels.at(i) != d_ptr->m_labels.at(i)) + d_ptr->m_drawer->generateLabelItem(&d_ptr->m_labelItems[i], labels.at(i)); + } + } + + d_ptr->m_labels = labels; +} + +QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis *q) + : QAbstractAxisPrivate(q) +{ +} + +QCategoryAxisPrivate::~QCategoryAxisPrivate() +{ +} + +void QCategoryAxisPrivate::updateLabels() +{ + for (int i = 0; i < m_labels.size(); i++) + m_drawer->generateLabelItem(&m_labelItems[i], m_labels.at(i)); +} + +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qcategoryaxis.h b/src/datavis3d/axis/qcategoryaxis.h new file mode 100644 index 00000000..e66b397f --- /dev/null +++ b/src/datavis3d/axis/qcategoryaxis.h @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCATEGORYAXIS_H +#define QCATEGORYAXIS_H + +#include "qabstractaxis.h" + +QT_DATAVIS3D_BEGIN_NAMESPACE + +class QT_DATAVIS3D_EXPORT QCategoryAxis : public QAbstractAxis +{ + Q_OBJECT +public: + explicit QCategoryAxis(QObject *parent = 0); + ~QCategoryAxis(); + + void setLabels(const QVector<QString> &labels); + +private: + Q_DISABLE_COPY(QCategoryAxis) +}; + +QT_DATAVIS3D_END_NAMESPACE + +#endif // QCATEGORYAXIS_H diff --git a/src/datavis3d/axis/qcategoryaxis_p.h b/src/datavis3d/axis/qcategoryaxis_p.h new file mode 100644 index 00000000..174a2934 --- /dev/null +++ b/src/datavis3d/axis/qcategoryaxis_p.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QtDataVis3D API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#include "qcategoryaxis.h" +#include "qabstractaxis_p.h" + +#ifndef QCATEGORYAXIS_P_H +#define QCATEGORYAXIS_P_H + +QT_DATAVIS3D_BEGIN_NAMESPACE + +class QT_DATAVIS3D_EXPORT QCategoryAxisPrivate : public QAbstractAxisPrivate +{ + Q_OBJECT + +public: + QCategoryAxisPrivate(QCategoryAxis *q); + ~QCategoryAxisPrivate(); + +protected: + void updateLabels(); +}; + +QT_DATAVIS3D_END_NAMESPACE + +#endif // QCATEGORYAXIS_P_H diff --git a/src/datavis3d/axis/qvalueaxis.cpp b/src/datavis3d/axis/qvalueaxis.cpp new file mode 100644 index 00000000..757f8762 --- /dev/null +++ b/src/datavis3d/axis/qvalueaxis.cpp @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qvalueaxis.h" +#include "qvalueaxis_p.h" + +QT_DATAVIS3D_BEGIN_NAMESPACE + +QValueAxis::QValueAxis(QObject *parent) : + QAbstractAxis(new QValueAxisPrivate(this), parent) +{ +} + +QValueAxis::~QValueAxis() +{ +} + +QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q) + : QAbstractAxisPrivate(q) +{ +} + +QValueAxisPrivate::~QValueAxisPrivate() +{ +} + +void QValueAxisPrivate::updateLabels() +{ + // TODO +} + +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qvalueaxis.h b/src/datavis3d/axis/qvalueaxis.h new file mode 100644 index 00000000..bb496653 --- /dev/null +++ b/src/datavis3d/axis/qvalueaxis.h @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QVALUEAXIS_H +#define QVALUEAXIS_H + +#include "qabstractaxis.h" + +QT_DATAVIS3D_BEGIN_NAMESPACE + +class QT_DATAVIS3D_EXPORT QValueAxis : public QAbstractAxis +{ + Q_OBJECT +public: + explicit QValueAxis(QObject *parent = 0); + ~QValueAxis(); + +private: + Q_DISABLE_COPY(QValueAxis) +}; + +QT_DATAVIS3D_END_NAMESPACE + +#endif // QVALUEAXIS_H diff --git a/src/datavis3d/axis/qvalueaxis_p.h b/src/datavis3d/axis/qvalueaxis_p.h new file mode 100644 index 00000000..50091e43 --- /dev/null +++ b/src/datavis3d/axis/qvalueaxis_p.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDataVis3D module. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QtDataVis3D API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#include "qvalueaxis.h" +#include "qabstractaxis_p.h" + +#ifndef QVALUEAXIS_P_H +#define QVALUEAXIS_P_H + +QT_DATAVIS3D_BEGIN_NAMESPACE + +class QT_DATAVIS3D_EXPORT QValueAxisPrivate : public QAbstractAxisPrivate +{ + Q_OBJECT + +public: + QValueAxisPrivate(QValueAxis *q); + ~QValueAxisPrivate(); + +protected: + void updateLabels(); +}; + +QT_DATAVIS3D_END_NAMESPACE + +#endif // QVALUEAXIS_P_H |