summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/global/qdatavis3namespace.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-06-20 13:50:20 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-06-24 08:05:53 +0300
commit08997a9afdd8681d3bb28e99f1c8be4c4b47282c (patch)
treeb05ba0cf8a201e3b1f51488ced4aa95fa5568651 /src/datavis3d/global/qdatavis3namespace.h
parente404fa6a329858520f19b4aa14be9bac2917b5fb (diff)
Doc fixes and some cleanup
- Now generates enum documentation (not all values documented, though) - Renamed the qdatavis3namespace.h as it was missing a 'd' - Fixes a couple of warnings about deprecated QString constructor Change-Id: Ib8698d8f6d9f5dd37682b71150dbc5731b6dedb4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/global/qdatavis3namespace.h')
-rw-r--r--src/datavis3d/global/qdatavis3namespace.h146
1 files changed, 0 insertions, 146 deletions
diff --git a/src/datavis3d/global/qdatavis3namespace.h b/src/datavis3d/global/qdatavis3namespace.h
deleted file mode 100644
index 5aeb9464..00000000
--- a/src/datavis3d/global/qdatavis3namespace.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of 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 QVIS3DNAMESPACE_H
-#define QVIS3DNAMESPACE_H
-
-#include "qdatavis3dglobal.h"
-#include <QOpenGLFunctions>
-#include <QVector3D>
-
-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
-
-// Enums used in several files
-enum BarStyle {
- Bars = 0,
- Pyramids,
- Cones,
- Cylinders,
- BevelBars,
- Spheres
-};
-
-enum CameraPreset {
- 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 {
- ThemeSystem = 0,
- ThemeBlueCerulean,
- ThemeBlueIcy,
- ThemeBlueNcs,
- ThemeBrownSand,
- ThemeDark,
- ThemeHighContrast,
- ThemeLight
-};
-
-// TODO: Should this be moved to Q3DBarsPrivate? Not for use via API directly?
-enum LabelPosition {
- LabelBelow = 0,
- LabelLow,
- LabelMid,
- LabelHigh,
- LabelOver,
- LabelBottom, // Absolute positions from here onward, used for axes (QDataItem is ignored)
- LabelTop,
- LabelLeft,
- LabelRight
-};
-
-// TODO: Will these be used from other vis types than Q3DBars?
-enum SelectionMode {
- ModeNone = 0,
- ModeBar,
- ModeBarAndRow,
- ModeBarAndColumn,
- ModeBarRowAndColumn,
- ModeZoomRow,
- ModeZoomColumn
-};
-
-enum ShadowQuality {
- ShadowNone = 0,
- ShadowLow = 1,
- ShadowMedium = 3,
- ShadowHigh = 5
-};
-
-enum LabelTransparency {
- TransparencyNone = 0, // Full solid, using colors from theme
- TransparencyFromTheme, // Use colors and transparencies from theme
- TransparencyNoBackground // Draw just text on transparent background
-};
-
-QT_DATAVIS3D_END_NAMESPACE
-
-#endif