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/bars3dcontroller_p.h | |
| 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/bars3dcontroller_p.h')
| -rw-r--r-- | src/datavis3d/engine/bars3dcontroller_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavis3d/engine/bars3dcontroller_p.h b/src/datavis3d/engine/bars3dcontroller_p.h index 5a533fc5..f87ab866 100644 --- a/src/datavis3d/engine/bars3dcontroller_p.h +++ b/src/datavis3d/engine/bars3dcontroller_p.h @@ -69,7 +69,7 @@ private: // Interaction MouseState m_mouseState; QPoint m_mousePos; - SelectionMode m_selectionMode; + QDataVis::SelectionMode m_selectionMode; bool m_isSlicingActivated; bool m_isBarSpecRelative; @@ -114,7 +114,7 @@ public: bool isBarSpecRelative(); // bar type; bars (=cubes), pyramids, cones, cylinders, etc. - void setBarType(MeshStyle style, bool smooth = false); + void setBarType(QDataVis::MeshStyle style, bool smooth = false); QString objFile(); // override bar type with own mesh @@ -126,8 +126,8 @@ public: // TODO: light placement API // Change selection mode; single bar, bar and row, bar and column, or all - void setSelectionMode(SelectionMode mode); - SelectionMode selectionMode(); + void setSelectionMode(QDataVis::SelectionMode mode); + QDataVis::SelectionMode selectionMode(); // Enable or disable background grid @@ -162,7 +162,7 @@ public slots: virtual void handleAxisAutoAdjustRangeChanged(bool autoAdjust); signals: - void selectionModeChanged(SelectionMode mode); + void selectionModeChanged(QDataVis::SelectionMode mode); void slicingActiveChanged(bool isSlicing); void sampleSpaceChanged(int samplesRow, int samplesColumn); void barSpecsChanged(QSizeF thickness, QSizeF spacing, bool relative); |