From 6880277f23b47117f7788f08f855ed99b5120f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 12 May 2014 10:06:27 +0300 Subject: CustomDataItem made into a public class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-3055 Change-Id: I1e449df7c1bcb48fc639dbae579e2e1499c9ef2b Reviewed-by: Tomi Korpipää --- ...tdatavisualization-qml-abstractdeclarative.qdoc | 33 ++++++++++------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'src/datavisualization/doc/src') diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 36c812f1..4d0b8212 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -150,30 +150,30 @@ */ /*! - * \qmlmethod int AbstractGraph3D::addCustomItem(string meshFile, vector3d position, vector3d scaling, quaternion rotation, string textureFile) + * \qmlmethod int AbstractGraph3D::addCustomItem(Custom3DItem item) * - * 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. + * Adds a Custom3DItem \a item to the graph. Graph takes ownership of the added item. * - * \return index to the added item. + * \return index to the added item if add was successful, -1 if trying to add a null item, and + * index of the item if trying to add an already 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() + * \sa removeCustomItems(), removeCustomItem(), removeCustomItemAt() * * \since Qt Data Visualization 1.1 */ /*! - * \qmlmethod void AbstractGraph3D::removeCustomItemAt(int index) + * \qmlmethod void AbstractGraph3D::removeCustomItems() * - * Removes the custom item at \a {index}. Deletes the resources allocated to it. + * Removes all custom items. Deletes the resources allocated to them. * - * \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::removeCustomItem(Custom3DItem item) + * + * Removes the custom \a {item}. Deletes the resources allocated to it. * * \since Qt Data Visualization 1.1 */ @@ -181,10 +181,7 @@ /*! * \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. + * Removes all custom items at \a {position}. Deletes the resources allocated to them. * * \since Qt Data Visualization 1.1 */ -- cgit v1.2.3