diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-04 12:14:13 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-04 12:55:05 +0300 |
| commit | 1b311517f8889e6faa8a1ae51af582c1cd07e739 (patch) | |
| tree | d1b023e36b5c7ddd67368007bb64c4b8551c480b /src/datavisualizationqml2 | |
| parent | 9c3b9fb2d8f07b2b3f2e5bc84653711043c9936c (diff) | |
Exposed default input handlers to QML
Also added properties to control rotation, zoom, and selection
individually.
Also added missing documentation about surface texture.
Task-number: QTRD-3202
Change-Id: I981edb7f336aea499440559f4a2098711200206d
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.cpp | 5 | ||||
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 6e6d9b1c..c824afec 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -93,6 +93,7 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) QLatin1String("Trying to create uncreatable: Abstract3DSeries.")); qmlRegisterUncreatableType<AbstractDeclarative, 1>(uri, 1, 1, "AbstractGraph3D", QLatin1String("Trying to create uncreatable: AbstractGraph3D.")); + qmlRegisterType<QValue3DAxis, 1>(uri, 1, 1, "ValueAxis3D"); qmlRegisterType<QItemModelBarDataProxy, 1>(uri, 1, 1, "ItemModelBarDataProxy"); qmlRegisterType<QItemModelSurfaceDataProxy, 1>(uri, 1, 1, "ItemModelSurfaceDataProxy"); @@ -113,6 +114,10 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) qmlRegisterUncreatableType<AbstractDeclarative, 2>(uri, 1, 2, "AbstractGraph3D", QLatin1String("Trying to create uncreatable: AbstractGraph3D.")); qmlRegisterType<DeclarativeSurface, 1>(uri, 1, 2, "Surface3D"); + + // New types + qmlRegisterType<Q3DInputHandler>(uri, 1, 2, "InputHandler3D"); + qmlRegisterType<QTouch3DInputHandler>(uri, 1, 2, "TouchInputHandler3D"); } QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index 21ef85b8..8d2be659 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -42,7 +42,8 @@ #include "declarativeseries_p.h" #include "q3dtheme.h" #include "declarativetheme_p.h" -#include "qabstract3dinputhandler.h" +#include "q3dinputhandler.h" +#include "qtouch3dinputhandler.h" #include "declarativecolor_p.h" #include "declarativescene_p.h" #include "qcustom3ditem.h" @@ -97,6 +98,8 @@ QML_DECLARE_TYPE(Q3DTheme) QML_DECLARE_TYPE(DeclarativeTheme3D) QML_DECLARE_TYPE(QAbstract3DInputHandler) +QML_DECLARE_TYPE(Q3DInputHandler) +QML_DECLARE_TYPE(QTouch3DInputHandler) QML_DECLARE_TYPE(QCustom3DItem) QML_DECLARE_TYPE(QCustom3DLabel) |