diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-14 13:50:52 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-14 13:52:21 +0300 |
| commit | 3b7fb533df9212df76c7c90a067ae3a3219b003a (patch) | |
| tree | eef561dcf6cdf9319a74e78d615bb210620383f3 /src/datavis3d/engine/drawer.cpp | |
| parent | 31714127f9ad60bd3f0fc4ea29531f759503241d (diff) | |
Enums moved to a class to be usable from QML and C++
Task-number: QTRD-2126
Change-Id: I280047cc7101292d17111babb7735c03436a40f4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/drawer.cpp')
| -rw-r--r-- | src/datavis3d/engine/drawer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index a0bc65fc..5d524963 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "qdatavis3dnamespace.h" +#include "qdatavis3denums.h" #include "drawer_p.h" #include "shaderhelper_p.h" #include "objecthelper_p.h" @@ -41,7 +41,7 @@ StaticLibInitializer staticLibInitializer; QT_DATAVIS3D_BEGIN_NAMESPACE -Drawer::Drawer(const Theme &theme, const QFont &font, LabelTransparency transparency) +Drawer::Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparency transparency) : m_theme(theme), m_font(font), m_transparency(transparency), @@ -73,7 +73,7 @@ void Drawer::setFont(const QFont &font) emit drawerChanged(); } -void Drawer::setTransparency(LabelTransparency transparency) +void Drawer::setTransparency(QDataVis::LabelTransparency transparency) { m_transparency = transparency; emit drawerChanged(); @@ -173,7 +173,7 @@ void Drawer::drawSurfaceGrid(ShaderHelper *shader, SurfaceObject *object) void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem, const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix, const QVector3D &positionComp, const QVector3D &rotation, - GLfloat itemHeight, SelectionMode mode, + GLfloat itemHeight, QDataVis::SelectionMode mode, ShaderHelper *shader, ObjectHelper *object, CameraHelper *camera, bool useDepth, bool rotateAlong, @@ -270,7 +270,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte xPosition = item.translation().x(); if (useDepth) zPosition = item.translation().z(); - else if (ModeZoomColumn == mode) + else if (QDataVis::ModeZoomColumn == mode) xPosition = -(item.translation().z()) + positionComp.z(); // flip first to left } |