diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-23 09:58:15 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-23 11:43:41 +0300 |
commit | 555acef736a72cdc92113a268826a6bba77fbe40 (patch) | |
tree | 83200c64836afbfcbbbd73bbeba2dbf8765dae98 /src/datavisualization | |
parent | a11dcce773b9ad2a913a32efe0c51b1221694659 (diff) |
Added QML support for custom items
Task-number: QTRD-3048
Change-Id: I90e6fbee38bae858c2e0910178684e28eacc6472
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization')
-rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc | 40 | ||||
-rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.cpp | 4 |
2 files changed, 42 insertions, 2 deletions
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index e6e3e881..36c812f1 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -149,3 +149,43 @@ * Clears selection from all attached series. */ +/*! + * \qmlmethod int AbstractGraph3D::addCustomItem(string meshFile, vector3d position, vector3d scaling, quaternion rotation, string textureFile) + * + * Adds a custom mesh item located in \a meshFile to a graph at \a position with \a {scaling}, + * \a rotation and optional image for a texture located at \a textureFile. Item must be in + * Wavefront obj format and include vertices, normals and UVs. It also needs to be in triangles. + * Item position is given in data coordinates. + * + * \return index to the added item. + * + * \note No validity checks are made for the position of the item, so it is up to the user to + * provide a valid position. Items positioned outside axis ranges are still rendered. + * + * \sa removeCustomItemAt() + * + * \since Qt Data Visualization 1.1 + */ + +/*! + * \qmlmethod void AbstractGraph3D::removeCustomItemAt(int index) + * + * Removes the custom item at \a {index}. Deletes the resources allocated to it. + * + * \note The index of the remaining items will change if the item removed is other than + * the last. + * + * \since Qt Data Visualization 1.1 + */ + +/*! + * \qmlmethod void AbstractGraph3D::removeCustomItemAt(vector3d position) + * + * Removes the custom item at \a {position}. Deletes the resources allocated to it. + * + * \note The index of the remaining items will change if an item is removed from a position that + * is not at the last index. + * + * \since Qt Data Visualization 1.1 + */ + diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 1c46427d..e143e756 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -405,7 +405,7 @@ int QAbstract3DGraph::addCustomItem(const QString &meshFile, const QVector3D &po } /*! - * Removes the custom item at \a {index}. Deletes the resource allocated to it. + * Removes the custom item at \a {index}. Deletes the resources allocated to it. * * \note The index of the remaining items will change if the item removed is other than * the last. @@ -418,7 +418,7 @@ void QAbstract3DGraph::removeCustomItemAt(int index) } /*! - * Removes the custom item at \a {position}. Deletes the resource allocated to it. + * Removes the custom item at \a {position}. Deletes the resources allocated to it. * * \note The index of the remaining items will change if an item is removed from a position that * is not at the last index. |