diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:16 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:35 +0300 |
commit | 50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch) | |
tree | ba5b78cc2187709f33ccc6da9d7581c7f63729f6 /src/datavisualization/global | |
parent | 0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff) |
Refactored MeshStyle and InputState
Task-number: QTRD-2362
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/global')
-rw-r--r-- | src/datavisualization/global/qdatavisualizationenums.h | 26 | ||||
-rw-r--r-- | src/datavisualization/global/qtdatavisualizationenums.qdoc | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h index d76e54e1..3d765ff2 100644 --- a/src/datavisualization/global/qdatavisualizationenums.h +++ b/src/datavisualization/global/qdatavisualizationenums.h @@ -37,22 +37,22 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject public: enum InputState { - InputNone = 0, - InputOnScene, - InputOnOverview, - InputOnSlice, - InputRotating, - InputOnPinch + InputStateNone = 0, + InputStateOnScene, + InputStateOnOverview, + InputStateOnSlice, + InputStateRotating, + InputStateOnPinch }; enum MeshStyle { - Bars = 0, - Pyramids, - Cones, - Cylinders, - BevelBars, - Spheres, - Dots + MeshStyleBars = 0, + MeshStylePyramids, + MeshStyleCones, + MeshStyleCylinders, + MeshStyleBevelBars, + MeshStyleSpheres, + MeshStyleDots }; enum CameraPreset { diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc index 4d6d651a..fde6a258 100644 --- a/src/datavisualization/global/qtdatavisualizationenums.qdoc +++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc @@ -27,17 +27,17 @@ Predefined input states for mouse and touch based input handlers. All states are not valid with all input handlers. - \value InputNone + \value InputStateNone Default "no input received" state. - \value InputOnScene + \value InputStateOnScene Mouse or touch input received on the 3D scene. - \value InputOnOverview + \value InputStateOnOverview Mouse or touch input received on the overview area. - \value InputOnSlice + \value InputStateOnSlice Mouse or touch input received on the slice view area. - \value InputRotating + \value InputStateRotating Rotation of the 3D geometry ongoing. - \value InputOnPinch + \value InputStateOnPinch Pinch/punch multitouch input received. */ @@ -46,19 +46,19 @@ Predefined mesh types. All styles are not usable with all visualization types. - \value Bars + \value MeshStyleBars Basic cubic bar. - \value Pyramids + \value MeshStylePyramids Four-sided pyramid. - \value Cones + \value MeshStyleCones Basic cone. - \value Cylinders + \value MeshStyleCylinders Basic cylinder. - \value BevelBars + \value MeshStyleBevelBars Slightly beveled (rounded) cubic bar. - \value Spheres + \value MeshStyleSpheres Sphere. Not usable in Q3DBars. - \value Dots + \value MeshStyleDots Triangular pyramid. Usable only with Q3DScatter. */ |