summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/global
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-09-10 11:42:13 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-09-10 12:04:24 +0300
commita28cdb72a4ea768a898ca07f0df0fa3c17c073a8 (patch)
tree0bafdcfa99fc783e9f5204539a8242bf6128d795 /src/datavis3d/global
parentf3e38983d77c72f3121c33a149a58fdf9c64158c (diff)
Module renamed
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/global')
-rw-r--r--src/datavis3d/global/datavis3dglobal_p.h52
-rw-r--r--src/datavis3d/global/global.pri4
-rw-r--r--src/datavis3d/global/qdatavis3denums.h126
-rw-r--r--src/datavis3d/global/qdatavis3dglobal.h67
-rw-r--r--src/datavis3d/global/qtdatavis3denums.qdoc176
5 files changed, 0 insertions, 425 deletions
diff --git a/src/datavis3d/global/datavis3dglobal_p.h b/src/datavis3d/global/datavis3dglobal_p.h
deleted file mode 100644
index d556c5e1..00000000
--- a/src/datavis3d/global/datavis3dglobal_p.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVis3D module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-//
-// 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.
-
-#ifndef DATAVIS3DGLOBAL_P_H
-#define DATAVIS3DGLOBAL_P_H
-
-#include "qdatavis3dglobal.h"
-#include "qdatavis3denums.h"
-#include <QOpenGLFunctions>
-#include <QVector3D>
-#include <QDebug>
-
-//#define ROTATE_ZOOM_SELECTION
-
-QT_DATAVIS3D_BEGIN_NAMESPACE
-
-// Constants used in several files
-// Compensation for z position; move all objects to positive z, as shader can't handle negative values correctly
-const GLfloat zComp = 10.0f;
-// Default light position. To have shadows working correctly, light should be as far as camera, or a bit further
-// y position is added to the minimum height (or can be thought to be that much above or below the camera)
-const QVector3D defaultLightPos = QVector3D(0.0f, 0.5f, zComp);
-const GLfloat defaultRatio = 1.0f / 1.6f; // default aspect ratio 16:10
-
-QT_DATAVIS3D_END_NAMESPACE
-
-#endif // DATAVIS3DGLOBAL_P_H
diff --git a/src/datavis3d/global/global.pri b/src/datavis3d/global/global.pri
deleted file mode 100644
index 7292bbd6..00000000
--- a/src/datavis3d/global/global.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS += \
- $$PWD/qdatavis3dglobal.h \
- $$PWD/qdatavis3denums.h \
- $$PWD/datavis3dglobal_p.h
diff --git a/src/datavis3d/global/qdatavis3denums.h b/src/datavis3d/global/qdatavis3denums.h
deleted file mode 100644
index a8f6d6a2..00000000
--- a/src/datavis3d/global/qdatavis3denums.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVis3D module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-#ifndef QDATAVIS3DENUMS_H
-#define QDATAVIS3DENUMS_H
-
-#include <QtDataVis3D/qdatavis3dglobal.h>
-#include <QObject>
-
-// namespace must be declared without using macros for qdoc
-namespace QtDataVis3D {
-
-class QT_DATAVIS3D_EXPORT QDataVis : public QObject
-{
- Q_OBJECT
- Q_ENUMS(MeshStyle)
- Q_ENUMS(CameraPreset)
- Q_ENUMS(ColorTheme)
- Q_ENUMS(SelectionMode)
- Q_ENUMS(ShadowQuality)
- Q_ENUMS(LabelTransparency)
-
-public:
- enum InputState {
- InputNone = 0,
- InputOnScene,
- InputOnOverview,
- InputOnSlice,
- InputRotating,
- InputOnPinch
- };
-
- enum MeshStyle {
- Bars = 0,
- Pyramids,
- Cones,
- Cylinders,
- BevelBars,
- Spheres,
- Dots
- };
-
- enum CameraPreset {
- NoPreset = -1,
- PresetFrontLow = 0,
- PresetFront,
- PresetFrontHigh,
- PresetLeftLow,
- PresetLeft,
- PresetLeftHigh,
- PresetRightLow,
- PresetRight,
- PresetRightHigh,
- PresetBehindLow,
- PresetBehind,
- PresetBehindHigh,
- PresetIsometricLeft,
- PresetIsometricLeftHigh,
- PresetIsometricRight,
- PresetIsometricRightHigh,
- PresetDirectlyAbove,
- PresetDirectlyAboveCW45,
- PresetDirectlyAboveCCW45,
- PresetFrontBelow, // These work only for graphs including negative values.
- PresetLeftBelow, // They act as Preset...Low for positive-only values.
- PresetRightBelow,
- PresetBehindBelow,
- PresetDirectlyBelow
- };
-
- enum ColorTheme {
- ThemeDefault = -1,
- ThemeSystem = 0,
- ThemeBlueCerulean,
- ThemeBlueIcy,
- ThemeBlueNcs,
- ThemeBrownSand,
- ThemeDark,
- ThemeHighContrast,
- ThemeLight
- };
-
- enum SelectionMode {
- ModeNone = 0,
- ModeItem,
- ModeItemAndRow, // From here onwards used for Q3DBars only
- ModeItemAndColumn,
- ModeItemRowAndColumn,
- ModeSliceRow,
- ModeSliceColumn
- };
-
- enum ShadowQuality {
- ShadowNone = 0,
- ShadowLow,
- ShadowMedium,
- ShadowHigh,
- ShadowSoftLow,
- ShadowSoftMedium,
- ShadowSoftHigh
- };
-
- enum LabelTransparency {
- TransparencyNone = 0, // Full solid, using colors from theme
- TransparencyFromTheme, // Use colors and transparencies from theme
- TransparencyNoBackground // Draw just text on transparent background
- };
-};
-}
-
-#endif
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h
deleted file mode 100644
index 5e2e88b1..00000000
--- a/src/datavis3d/global/qdatavis3dglobal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVis3D module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-#ifndef QDATAVIS3DGLOBAL_H
-#define QDATAVIS3DGLOBAL_H
-
-#include <qglobal.h>
-
-#define QT_DATAVIS3D_VERSION_STR "0.0.1"
-/*
- QT_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch.
-*/
-#define QT_DATAVIS3D_VERSION 0x000001
-/*
- can be used like #if (QT_DATAVIS3D_VERSION >= QT_DATAVIS3D_VERSION_CHECK(1, 1, 0))
-*/
-#define QT_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-
-#if defined(QT_DATAVIS3D_LIBRARY)
-# define QT_DATAVIS3D_EXPORT Q_DECL_EXPORT
-#else
-# define QT_DATAVIS3D_EXPORT Q_DECL_IMPORT
-#endif
-
-#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVIS3D_LIBRARY)
-# define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT
-#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVIS3D_LIBRARY)
-# define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT
-#else
-# define QT_DATAVIS3D_AUTOTEST_EXPORT
-#endif
-
-#ifdef QT_DATAVIS3D_STATICLIB
-# undef QT_DATAVIS3D_EXPORT
-# undef QT_DATAVIS3D_AUTOTEST_EXPORT
-# define QT_DATAVIS3D_EXPORT
-# define QT_DATAVIS3D_AUTOTEST_EXPORT
-#endif
-
-#define QT_DATAVIS3D_NAMESPACE QtDataVis3D
-
-#ifdef QT_DATAVIS3D_NAMESPACE
-# define QT_DATAVIS3D_BEGIN_NAMESPACE namespace QT_DATAVIS3D_NAMESPACE {
-# define QT_DATAVIS3D_END_NAMESPACE }
-# define QT_DATAVIS3D_USE_NAMESPACE using namespace QT_DATAVIS3D_NAMESPACE;
-#else
-# define QT_DATAVIS3D_BEGIN_NAMESPACE
-# define QT_DATAVIS3D_END_NAMESPACE
-# define QT_DATAVIS3D_USE_NAMESPACE
-#endif
-
-#endif // QVIS3DGLOBAL_H
diff --git a/src/datavis3d/global/qtdatavis3denums.qdoc b/src/datavis3d/global/qtdatavis3denums.qdoc
deleted file mode 100644
index 015b1803..00000000
--- a/src/datavis3d/global/qtdatavis3denums.qdoc
+++ /dev/null
@@ -1,176 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVis3D module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-/*!
- \namespace QtDataVis3D
- \inmodule QtDataVis3D
- \target QtDataVis3D Enums
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::InputState
-
- Predefined input states for mouse and touch based input handlers. All states are not valid with all input handlers.
-
- \value InputNone
- Default "no input received" state.
- \value InputOnScene
- Mouse or touch input received on the 3D scene.
- \value InputOnOverview
- Mouse or touch input received on the overview area.
- \value InputOnSlice
- Mouse or touch input received on the slice view area.
- \value InputRotating
- Rotation of the 3D geometry ongoing.
- \value InputOnPinch
- Pinch/punch multitouch input received.
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::MeshStyle
-
- Predefined mesh types. All styles are not usable with all visualization types.
-
- \value Bars
- Basic cubic bar.
- \value Pyramids
- Four-sided pyramid.
- \value Cones
- Basic cone.
- \value Cylinders
- Basic cylinder.
- \value BevelBars
- Slightly beveled (rounded) cubic bar.
- \value Spheres
- Sphere. Not usable in Q3DBars.
- \value Dots
- Triangular pyramid. Usable only with Q3DScatter.
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::CameraPreset
-
- Predefined positions for camera.
-
- \value NoPreset
- Used only in QML to indicate a preset has not been set.
- \value PresetFrontLow
- \value PresetFront
- \value PresetFrontHigh
- \value PresetLeftLow
- \value PresetLeft
- \value PresetLeftHigh
- \value PresetRightLow
- \value PresetRight
- \value PresetRightHigh
- \value PresetBehindLow
- \value PresetBehind
- \value PresetBehindHigh
- \value PresetIsometricLeft
- \value PresetIsometricLeftHigh
- \value PresetIsometricRight
- \value PresetIsometricRightHigh
- \value PresetDirectlyAbove
- \value PresetDirectlyAboveCW45
- \value PresetDirectlyAboveCCW45
- \value PresetFrontBelow
- In Q3DBars from PresetFrontBelow onward these only work for graphs including negative
- values. They act as Preset...Low for positive-only values.
- \value PresetLeftBelow
- \value PresetRightBelow
- \value PresetBehindBelow
- \value PresetDirectlyBelow
- Acts as PresetFrontLow for positive -only bars.
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::ColorTheme
-
- Predefined color themes.
-
- \value ThemeDefault
- Used only in QML to indicate a theme has not been set.
- \value ThemeSystem
- \value ThemeBlueCerulean
- \value ThemeBlueIcy
- \value ThemeBlueNcs
- \value ThemeBrownSand
- \value ThemeDark
- \value ThemeHighContrast
- \value ThemeLight
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::SelectionMode
-
- Item selection modes.
-
- \value ModeNone
- Selection mode disabled.
- \value ModeItem
- Selection selects a single item.
- \value ModeItemAndRow
- Selection selects a single item and highlights the row it is on. In Q3DBars only.
- \value ModeItemAndColumn
- Selection selects a single item and highlights the column it is on. In Q3DBars only.
- \value ModeItemRowAndColumn
- Selection selects a single item and highlights the row and the column it is on. In
- Q3DBars only.
- \value ModeSliceRow
- Selection selects a single item and displays the row it is on in a separate view. The
- original view is shrunk into upper left corner. Original view is restored by clicking
- on it. In Q3DBars only.
- \value ModeSliceColumn
- Selection selects a single item and displays the column it is on in a separate view. The
- original view is shrunk into upper left corner. Original view is restored by clicking
- on it. In Q3DBars only.
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::ShadowQuality
-
- Quality of shadows.
-
- \value ShadowNone
- Shadows are disabled.
- \value ShadowLow
- Shadows are rendered in low quality.
- \value ShadowMedium
- Shadows are rendered in medium quality.
- \value ShadowHigh
- Shadows are rendered in high quality.
- \value ShadowSoftLow
- Shadows are rendered in low quality with softened edges.
- \value ShadowSoftMedium
- Shadows are rendered in medium quality with softened edges.
- \value ShadowSoftHigh
- Shadows are rendered in high quality with softened edges.
-*/
-
-/*!
- \enum QtDataVis3D::QDataVis::LabelTransparency
-
- Label transparencies.
-
- \value TransparencyNone
- Full solid, using colors from theme.
- \value TransparencyFromTheme
- Use colors and transparencies from theme.
- \value TransparencyNoBackground
- Draw just text on transparent background.
-*/