diff options
23 files changed, 88 insertions, 88 deletions
diff --git a/src/datavisualization/axis/q3dcategoryaxis.cpp b/src/datavisualization/axis/q3dcategoryaxis.cpp index 43a3d911..866399f5 100644 --- a/src/datavisualization/axis/q3dcategoryaxis.cpp +++ b/src/datavisualization/axis/q3dcategoryaxis.cpp @@ -51,7 +51,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmlproperty list CategoryAxis3D::categoryLabels * Defines labels for axis applied to categories. If there are fewer labels than categories, the - * remaining ones do not have a label. If category labels are not explicitly defined, labels are + * remaining ones do not have a label. If category labels are not defined explicitly, labels are * generated from the data row and column labels. */ @@ -74,7 +74,7 @@ Q3DCategoryAxis::~Q3DCategoryAxis() * \property Q3DCategoryAxis::categoryLabels * * Defines labels for axis applied to categories. If there are fewer labels than categories, the - * remaining ones do not have a label. If category labels are not explicitly defined, labels are + * remaining ones do not have a label. If category labels are not defined explicitly, labels are * generated from the data row and column labels. * * \note CategoryLabels actually reads/writes the Q3DAbstractAxis::labels property, @@ -134,7 +134,7 @@ Q3DCategoryAxisPrivate::~Q3DCategoryAxisPrivate() /*! * \internal * Controller uses this function to set labels from data proxy as category labels. - * If the labels have been explicitly set by user, data proxy labels are not used. + * If the labels have been set explicitly by the user, data proxy labels are not used. */ void Q3DCategoryAxisPrivate::setDataLabels(const QStringList &labels) { diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp index 15cb02de..2e4556fd 100644 --- a/src/datavisualization/data/qabstractdataproxy.cpp +++ b/src/datavisualization/data/qabstractdataproxy.cpp @@ -52,7 +52,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \qmlproperty string AbstractDataProxy::itemLabelFormat * * Label format for data items in this proxy. This format is used for single item labels, - * e.g. when an item is selected. How the format is interpreted depends on proxy type. See + * for example, when an item is selected. How the format is interpreted depends on proxy type. See * each proxy class documentation for more information. */ @@ -101,7 +101,7 @@ QAbstractDataProxy::DataType QAbstractDataProxy::type() const * \property QAbstractDataProxy::itemLabelFormat * * Sets label \a format for data items in this proxy. This format is used for single item labels, - * e.g. when an item is selected. How the format is interpreted depends on proxy type. See + * for example, when an item is selected. How the format is interpreted depends on proxy type. See * each proxy class documentation for more information. * * \sa QBarDataProxy, QScatterDataProxy, QSurfaceDataProxy diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 066351f1..08d8151b 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -81,7 +81,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \inherits AbstractDataProxy * \brief Base proxy type for Bars3D. * - * This type handles adding, inserting, changing and removing rows of data with Qt Quick 2. + * This type handles adding, inserting, changing, and removing rows of data with Qt Quick 2. * * This type is uncreatable, but contains properties that are exposed via subtypes. * @@ -141,8 +141,8 @@ void QBarDataProxy::resetArray() } /*! - * Takes ownership of the \a newArray. Clears the existing array and if the \a newArray is - * different than the existing array. If it's the same array, this just triggers arrayReset() + * Takes ownership of the \a newArray. Clears the existing array if the \a newArray is + * different from the existing array. If it's the same array, this just triggers arrayReset() * signal. * Passing null array deletes the old array and creates a new empty array. * Row and column labels are not affected. @@ -154,10 +154,10 @@ void QBarDataProxy::resetArray(QBarDataArray *newArray) } /*! - * Takes ownership of the \a newArray. Clears the existing array and if the \a newArray is - * different than the existing array. If it's the same array, this just triggers arrayReset() + * Takes ownership of the \a newArray. Clears the existing array if the \a newArray is + * different from the existing array. If it's the same array, this just triggers arrayReset() * signal. - * Passing null array deletes the old array and creates a new empty array. + * Passing a null array deletes the old array and creates a new empty array. * The \a rowLabels and \a columnLabels lists specify the new labels for rows and columns. */ void QBarDataProxy::resetArray(QBarDataArray *newArray, const QStringList &rowLabels, @@ -388,7 +388,7 @@ const QBarDataArray *QBarDataProxy::array() const } /*! - * \return pointer to the row at \a rowIndex. It is guaranteed to be valid only until next call + * \return pointer to the row at \a rowIndex. It is guaranteed to be valid only until the next call * that modifies data. */ const QBarDataRow *QBarDataProxy::rowAt(int rowIndex) const @@ -400,7 +400,7 @@ const QBarDataRow *QBarDataProxy::rowAt(int rowIndex) const /*! * \return pointer to the item at \a rowIndex, \a columnIndex. It is guaranteed to be valid only - * until next call that modifies data. + * until the next call that modifies data. */ const QBarDataItem *QBarDataProxy::itemAt(int rowIndex, int columnIndex) const { diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp index 2c9d4d5e..cd63e603 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp @@ -168,7 +168,7 @@ QHeightMapSurfaceDataProxy::~QHeightMapSurfaceDataProxy() * QImage::Format_RGB32 in grayscale. * * The height of the image is read from the red component of the pixels if the image is in grayscale, - * otherwise it is an average calculated from red, green and blue components of the pixels. Using + * otherwise it is an average calculated from red, green, and blue components of the pixels. Using * grayscale images may improve data conversion speed for large images. * * Not recommended formats: all mono formats (for example QImage::Format_Mono). diff --git a/src/datavisualization/data/qitemmodelbardatamapping.cpp b/src/datavisualization/data/qitemmodelbardatamapping.cpp index dd35173f..37bd7bf1 100644 --- a/src/datavisualization/data/qitemmodelbardatamapping.cpp +++ b/src/datavisualization/data/qitemmodelbardatamapping.cpp @@ -45,7 +45,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * For example, assume that you have a custom QAbstractItemModel for storing various monthly values * related to a business. - * Each item in the model has roles "year", "month", "income", and "expenses". + * Each item in the model has the roles "year", "month", "income", and "expenses". * You could do the following to display the data in a bar graph: * * \snippet doc_src_qtdatavisualization.cpp 3 @@ -62,7 +62,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \brief Item model mapping for Bars3D. * * This type is used to map roles of AbstractItemModel to rows, columns, and values of Bars3D. For - * more complete description, see QItemModelBarDataMapping. + * a more complete description, see QItemModelBarDataMapping. * * Usage example: * @@ -89,13 +89,13 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmlproperty list BarDataMapping::rowCategories * The row categories of the mapping. Only items with row roles that are found in this list are - * included when data is resolved. The rows are ordered in the same order as they are in this list. + * included when the data is resolved. The rows are ordered in the same order as they are in this list. */ /*! * \qmlproperty list BarDataMapping::columnCategories * The column categories of the mapping. Only items with column roles that are found in this list are - * included when data is resolved. The columns are ordered in the same order as they are in this list. + * included when the data is resolved. The columns are ordered in the same order as they are in this list. */ /*! @@ -108,7 +108,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \qmlproperty list BarDataMapping::autoRowCategories * When set to true, the mapping ignores any explicitly set row categories * and overwrites them with automatically generated ones whenever the - * data from model is resolved. Defaults to true. + * data from the model is resolved. Defaults to true. */ /*! @@ -354,7 +354,7 @@ void QItemModelBarDataMapping::remap(const QString &rowRole, * /return index of the specified \a category in row categories list. * If the row categories list is empty, -1 is returned. * \note If the automatic row categories generation is in use, this method will - * not return valid index before the data in the model is resolved for the first time. + * not return a valid index before the data in the model is resolved for the first time. */ int QItemModelBarDataMapping::rowCategoryIndex(const QString &category) { @@ -365,7 +365,7 @@ int QItemModelBarDataMapping::rowCategoryIndex(const QString &category) * /return index of the specified \a category in column categories list. * If the category is not found, -1 is returned. * \note If the automatic column categories generation is in use, this method will - * not return valid index before the data in the model is resolved for the first time. + * not return a valid index before the data in the model is resolved for the first time. */ int QItemModelBarDataMapping::columnCategoryIndex(const QString &category) { diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index c066f6ac..bee87606 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -32,7 +32,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * for Q3DBars. It uses QItemModelBarDataMapping instance to map data from the model to Q3DBars * graph. * - * Data is resolved asynchronously whenever the mapping or the model changes. + * The data is resolved asynchronously whenever the mapping or the model changes. * QBarDataProxy::arrayReset() is emitted when the data has been resolved. * * \sa QItemModelBarDataMapping, {Qt Data Visualization Data Handling} diff --git a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp index c4eab20e..6705588d 100644 --- a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp +++ b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp @@ -34,7 +34,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * that can be mapped to X, Y, and Z-values for the scatter points. * * For example, assume that you have a custom QAbstractItemModel for storing various measurements - * done on material samples, providing data for roles such as "density", "hardness" and + * done on material samples, providing data for roles such as "density", "hardness", and * "conductivity". You could visualize these properties on a scatter graph: * * \snippet doc_src_qtdatavisualization.cpp 4 @@ -51,7 +51,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \brief Item model mapping for Scatter3D. * * This type is used to map roles of AbstractItemModel to the XYZ-values of Scatter3D points. For - * more complete description, see QItemModelScatterDataMapping. + * a more complete description, see QItemModelScatterDataMapping. * * Usage example: * diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index cf605593..147b16da 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -31,7 +31,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * QItemModelScatterDataProxy allows you to use QAbstractItemModel derived models as a data source * for Q3DScatter. It maps roles defined in QItemModelScatterDataMapping to roles in the model. * - * Data is resolved asynchronously whenever the mapping or the model changes. + * The data is resolved asynchronously whenever the mapping or the model changes. * QScatterDataProxy::arrayReset() is emitted when the data has been resolved. * * /sa {Qt Data Visualization Data Handling} @@ -48,7 +48,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * This type allows you to use AbstractItemModel derived models as a data source for Scatter3D. * - * Data is resolved asynchronously whenever the mapping or the model changes. + * The data is resolved asynchronously whenever the mapping or the model changes. * QScatterDataProxy::arrayReset() is emitted when the data has been resolved. * * Usage example: @@ -99,7 +99,7 @@ QItemModelScatterDataProxy::~QItemModelScatterDataProxy() /*! * \property QItemModelScatterDataProxy::itemModel * - * Defines item model. Does not take ownership of the model, but does connect to it to listen for + * Defines the item model. Does not take ownership of the model, but does connect to it to listen for * changes. */ void QItemModelScatterDataProxy::setItemModel(const QAbstractItemModel *itemModel) @@ -115,7 +115,7 @@ const QAbstractItemModel *QItemModelScatterDataProxy::itemModel() const /*! * \property QItemModelScatterDataProxy::activeMapping * - * Defines data mapping. Proxy takes ownership of the \a mapping. + * Defines the data mapping. The proxy takes ownership of the \a mapping. * Modifying a mapping that is set to the proxy will trigger data set re-resolving. */ void QItemModelScatterDataProxy::setActiveMapping(QItemModelScatterDataMapping *mapping) diff --git a/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp b/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp index 928b8170..eead9a8e 100644 --- a/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp @@ -44,7 +44,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * columns. * * For example, assume that you have a custom QAbstractItemModel storing surface topography data. - * Each item in the model has roles "longitude", "latitude" and "height". The item model already + * Each item in the model has the roles "longitude", "latitude", and "height". The item model already * contains the data properly sorted so that longitudes and latitudes are first encountered in * correct order, which enables us to utilize the row and column category autogeneration. * You could do the following to display the data in a surface graph: @@ -63,7 +63,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \brief Item model mapping for Surface3D. * * This type is used to map roles of AbstractItemModel to rows, columns, and values of Surface3D. - * For more complete description, see QItemModelSurfaceDataMapping. + * For a more complete description, see QItemModelSurfaceDataMapping. * * Usage example: * @@ -142,7 +142,7 @@ QItemModelSurfaceDataMapping::QItemModelSurfaceDataMapping(const QString &valueR } /*! - * Constructs QItemModelSurfaceDataMapping with \a rowRole, \a columnRole, \a valueRole + * Constructs QItemModelSurfaceDataMapping with \a rowRole, \a columnRole, \a valueRole, * and the given \a parent. */ QItemModelSurfaceDataMapping::QItemModelSurfaceDataMapping(const QString &rowRole, @@ -158,7 +158,7 @@ QItemModelSurfaceDataMapping::QItemModelSurfaceDataMapping(const QString &rowRol /*! * Constructs QItemModelSurfaceDataMapping with \a rowRole, \a columnRole, \a valueRole, - * \a rowCategories, \a columnCategories and the given \a parent. This constructor + * \a rowCategories, \a columnCategories, and the given \a parent. This constructor * also sets autoRowCategories and autoColumnCategories to false. */ QItemModelSurfaceDataMapping::QItemModelSurfaceDataMapping(const QString &rowRole, @@ -359,7 +359,7 @@ void QItemModelSurfaceDataMapping::remap(const QString &rowRole, * /return index of the specified \a category in row categories list. * If the row categories list is empty, -1 is returned. * \note If the automatic row categories generation is in use, this method will - * not return valid index before the data in the model is resolved for the first time. + * not return a valid index before the data in the model is resolved for the first time. */ int QItemModelSurfaceDataMapping::rowCategoryIndex(const QString &category) { @@ -369,7 +369,7 @@ int QItemModelSurfaceDataMapping::rowCategoryIndex(const QString &category) /*! * /return index of the specified \a category in column categories list. * \note If the automatic column categories generation is in use, this method will - * not return valid index before the data in the model is resolved for the first time. + * not return a valid index before the data in the model is resolved for the first time. */ int QItemModelSurfaceDataMapping::columnCategoryIndex(const QString &category) { diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index af237799..479fdd75 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -27,7 +27,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \brief Base proxy class for Q3DScatter. * \since Qt Data Visualization 1.0 * - * QScatterDataProxy handles adding, inserting, changing and removing data items. + * QScatterDataProxy handles adding, inserting, changing, and removing data items. * * QScatterDataProxy takes ownership of all QScatterDataArrays and QScatterDataItems passed to it. * @@ -65,7 +65,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \inherits AbstractDataProxy * \brief Base proxy class for Scatter3D. * - * This type handles adding, inserting, changing and removing data items. + * This type handles adding, inserting, changing, and removing data items. * * This type is uncreatable, but contains properties that are exposed via subtypes. * @@ -103,10 +103,10 @@ QScatterDataProxy::~QScatterDataProxy() } /*! - * Takes ownership of the \a newArray. Clears the existing array and if the \a newArray is - * different than the existing array. If it's the same array, this just triggers arrayReset() + * Takes ownership of the \a newArray. Clears the existing array if the \a newArray is + * different from the existing array. If it's the same array, this just triggers arrayReset() * signal. - * Passing null array deletes the old array and creates a new empty array. + * Passing a null array deletes the old array and creates a new empty array. */ void QScatterDataProxy::resetArray(QScatterDataArray *newArray) { diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index c09213bd..1f152978 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -33,7 +33,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * objects. See Q3DSurface documentation and basic sample code there how to feed the data for the * QSurfaceDataProxy. * - * All rows must have same number of items. + * All rows must have the same number of items. * * When determining what rows and columns are visible, the first item in each row and the first item in * each column determine if the whole row or column is visible, even if other items in the row or column @@ -78,7 +78,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * This type is uncreatable, but contains properties that are exposed via subtypes. * - * For more complete description, see QSurfaceDataProxy. + * For a more complete description, see QSurfaceDataProxy. * * \sa ItemModelSurfaceDataProxy, {Qt Data Visualization Data Handling} */ @@ -117,10 +117,10 @@ QSurfaceDataProxy::~QSurfaceDataProxy() } /*! - * Takes ownership of the \a newArray. Clears the existing array and if the \a newArray is - * different than the existing array. If it's the same array, this just triggers arrayReset() + * Takes ownership of the \a newArray. Clears the existing array if the \a newArray is + * different from the existing array. If it's the same array, this just triggers arrayReset() * signal. - * Passing null array deletes the old array and creates a new empty array. + * Passing a null array deletes the old array and creates a new empty array. * All rows in \a newArray must be of same length. */ void QSurfaceDataProxy::resetArray(QSurfaceDataArray *newArray) @@ -163,7 +163,7 @@ int QSurfaceDataProxy::columnCount() const } /*! - * \return pointer to the item at \a index. It is guaranteed to be valid only until next call that + * \return pointer to the item at \a index. It is guaranteed to be valid only until the next call that * modifies data. */ const QSurfaceDataItem *QSurfaceDataProxy::itemAt(int index) const @@ -190,7 +190,7 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const /*! * \fn void QSurfaceDataProxy::arrayReset() * - * Emitted when data array is reset. + * Emitted when the data array is reset. * If you change the whole array contents without calling resetArray(), you need to * emit this signal yourself or the graph won't get updated. */ diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index 50d8d030..2eea6c74 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -43,7 +43,7 @@ Bars3DController::Bars3DController(QRect boundRect) setActiveDataProxy(0); // Setting a null axis creates a new default axis according to orientation and graph type. - // Note: These cannot be set in Abstract3DController constructor, as they will call virtual + // Note: these cannot be set in the Abstract3DController constructor, as they will call virtual // functions implemented by subclasses. setAxisX(0); setAxisY(0); diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index bc2ffeba..d6b48e03 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -42,11 +42,11 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * reset to default camera view by clicking mouse wheel. In touch devices rotation is done * by tap-and-move, selection by tap-and-hold and zoom by pinch. * - * If no axes are explicitly set to Q3DBars, temporary default axes with no labels are created. - * These default axes can be modified via axis accessors, but as soon any axis is explicitly - * set for the orientation, the default axis for that orientation is destroyed. + * If no axes are set explicitly to Q3DBars, temporary default axes with no labels are created. + * These default axes can be modified via axis accessors, but as soon any axis is set explicitly + * for the orientation, the default axis for that orientation is destroyed. * - * Data proxies work similarly: If no data proxy is explicitly set, Q3DBars creates a default + * Data proxies work similarly: If no data proxy is set explicitly, Q3DBars creates a default * proxy. If any other proxy is set as active data proxy later, the default proxy and all data * added to it is destroyed. * @@ -209,7 +209,7 @@ qreal Q3DBars::barThickness() /*! * \property Q3DBars::barSpacing * - * Bar spacing, ie. the empty space between bars, in X and Z dimensions. It is preset to + * Bar spacing, which is the empty space between bars, in X and Z dimensions. It is preset to * \c {(1.0, 1.0)} by default. Spacing is affected by barSpacingRelative -property. * * \sa barSpacingRelative @@ -439,7 +439,7 @@ QDataVis::ShadowQuality Q3DBars::shadowQuality() const * the \a axis to this graph. * * If the \a axis is null, a temporary default axis with no labels is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -461,7 +461,7 @@ Q3DCategoryAxis *Q3DBars::rowAxis() const * the \a axis to this graph. * * If the \a axis is null, a temporary default axis with no labels is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -484,7 +484,7 @@ Q3DCategoryAxis *Q3DBars::columnAxis() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -541,7 +541,7 @@ QList<Q3DAbstractAxis *> Q3DBars::axes() const * the \a proxy to this graph. * * If the \a proxy is null, a temporary default proxy is created and activated. - * This temporary proxy is destroyed if another \a proxy is explicitly set active via this method. + * This temporary proxy is destroyed if another \a proxy is set explicitly active via this method. * * \sa addDataProxy(), releaseDataProxy() */ diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 86505ccb..fe452739 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -153,7 +153,7 @@ void Q3DCamera::setYRotation(qreal rotation) * * This property contains the current minimum X-rotation for the camera. * The full circle range is [-180,180] and the minimum value is limited to -180. - * Also the value can't be higher than maximum, and is adjusted if necessary. + * Also the value can't be higher than the maximum, and is adjusted if necessary. * * \sa wrapXRotation, maxXRotation */ @@ -185,7 +185,7 @@ void Q3DCamera::setMinXRotation(qreal minRotation) * * This property contains the current minimum Y-rotation for the camera. * The full Y angle range is [-90,90] and the minimum value is limited to -90. - * Also the value can't be higher than maximum, and is adjusted if necessary. + * Also the value can't be higher than the maximum, and is adjusted if necessary. * * \sa wrapYRotation, maxYRotation */ @@ -217,7 +217,7 @@ void Q3DCamera::setMinYRotation(qreal minRotation) * * This property contains the current maximum X-rotation for the camera. * The full circle range is [-180,180] and the maximum value is limited to 180. - * Also the value can't be lower than minimum, and is adjusted if necessary. + * Also the value can't be lower than the minimum, and is adjusted if necessary. * * \sa wrapXRotation, minXRotation */ @@ -250,7 +250,7 @@ void Q3DCamera::setMaxXRotation(qreal maxRotation) * * This property contains the current maximum Y-rotation for the camera. * The full Y angle range is [-90,90] and the maximum value is limited to 90. - * Also the value can't be lower than minimum, and is adjusted if necessary. + * Also the value can't be lower than the minimum, and is adjusted if necessary. * * \sa wrapYRotation, minYRotation */ @@ -301,8 +301,8 @@ void Q3DCamera::setBaseOrientation(const QVector3D &basePosition, /*! * \property Q3DCamera::viewMatrix * - * This property contains the view matrix used in the 3D calculations. When the default orbiting camera behavior is sufficient - * there is no need to touch this property. But if the default behavior is insufficient the view matrix can be set directly. + * This property contains the view matrix used in the 3D calculations. When the default orbiting camera behavior is sufficient, + * there is no need to touch this property. But if the default behavior is insufficient, the view matrix can be set directly. * When setting the view matrix directly remember to set Q3DCamera::viewMatrixAutoUpdateEnabled to false. */ QMatrix4x4 Q3DCamera::viewMatrix() const diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 68470407..fc95842a 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -40,11 +40,11 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * reset to default camera view by clicking mouse wheel. In touch devices rotation is done * by tap-and-move, selection by tap-and-hold and zoom by pinch. * - * If no axes are explicitly set to Q3DScatter, temporary default axes with no labels are created. - * These default axes can be modified via axis accessors, but as soon any axis is explicitly - * set for the orientation, the default axis for that orientation is destroyed. + * If no axes are set explicitly to Q3DScatter, temporary default axes with no labels are created. + * These default axes can be modified via axis accessors, but as soon any axis is set explicitly + * for the orientation, the default axis for that orientation is destroyed. * - * Data proxies work similarly: If no data proxy is explicitly set, Q3DScatter creates a default + * Data proxies work similarly: if no data proxy is set explicitly, Q3DScatter creates a default * proxy. If any other proxy is set as active data proxy later, the default proxy and all data * added to it is destroyed. * @@ -374,7 +374,7 @@ QDataVis::ShadowQuality Q3DScatter::shadowQuality() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -397,7 +397,7 @@ Q3DValueAxis *Q3DScatter::axisX() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -420,7 +420,7 @@ Q3DValueAxis *Q3DScatter::axisY() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -482,7 +482,7 @@ QList<Q3DValueAxis *> Q3DScatter::axes() const * the \a proxy to this graph. * * If the \a proxy is null, a temporary default proxy is created and activated. - * This temporary proxy is destroyed if another \a proxy is explicitly set active via this method. + * This temporary proxy is destroyed if another \a proxy is set explicitly active via this method. * * \sa addDataProxy(), releaseDataProxy() */ diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 72fd50c0..42260e8b 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -48,11 +48,11 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * To rotate the graph, hold down the right mouse button and move the mouse. Zooming is done using mouse * wheel. Both assume the default input handler is in use. * - * If no axes are explicitly set to Q3DSurface, temporary default axes with no labels are created. - * These default axes can be modified via axis accessors, but as soon any axis is explicitly - * set for the orientation, the default axis for that orientation is destroyed. + * If no axes are set explicitly to Q3DSurface, temporary default axes with no labels are created. + * These default axes can be modified via axis accessors, but as soon any axis is set explicitly + * for the orientation, the default axis for that orientation is destroyed. * - * Data proxies work similarly: If no data proxy is explicitly set, Q3DSurface creates a default + * Data proxies work similarly: if no data proxy is set explicitly, Q3DSurface creates a default * proxy. If any other proxy is set as active data proxy later, the default proxy and all data * added to it is destroyed. * @@ -323,7 +323,7 @@ QFont Q3DSurface::font() const /*! * \property Q3DSurface::scene * - * This property contains the read only Q3DScene that can be used to access e.g. camera object. + * This property contains the read only Q3DScene that can be used to access, for example, a camera object. */ Q3DScene *Q3DSurface::scene() const { @@ -352,7 +352,7 @@ QDataVis::LabelStyle Q3DSurface::labelStyle() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -375,7 +375,7 @@ Q3DValueAxis *Q3DSurface::axisX() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -398,7 +398,7 @@ Q3DValueAxis *Q3DSurface::axisY() const * * If the \a axis is null, a temporary default axis with no labels and automatically adjusting * range is created. - * This temporary axis is destroyed if another \a axis is explicitly set to same orientation. + * This temporary axis is destroyed if another \a axis is set explicitly to the same orientation. * * \sa addAxis(), releaseAxis() */ @@ -460,7 +460,7 @@ QList<Q3DValueAxis *> Q3DSurface::axes() const * the \a proxy to this graph. * * If the \a proxy is null, a temporary default proxy is created and activated. - * This temporary proxy is destroyed if another \a proxy is explicitly set active via this method. + * This temporary proxy is destroyed if another \a proxy is set explicitly active via this method. * * \sa addDataProxy(), releaseDataProxy() */ diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 688747bb..8d1bcf85 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -39,7 +39,7 @@ Surface3DController::Surface3DController(QRect rect) setActiveDataProxy(0); // Setting a null axis creates a new default axis according to orientation and graph type. - // Note: These cannot be set in Abstract3DController constructor, as they will call virtual + // Note: these cannot be set in the Abstract3DController constructor, as they will call virtual // functions implemented by subclasses. setAxisX(0); setAxisY(0); diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 22ad3c7f..a989ed3f 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -235,7 +235,7 @@ void Surface3DRenderer::updateDataModel(QSurfaceDataProxy *dataProxy) if (!m_surfaceObj) loadSurfaceObj(); - // Note: Data setup can change samplespace (as min width/height is 1) + // Note: Data setup can change sample space (as min width/height is 1) if (m_cachedSmoothSurface) { m_surfaceObj->setUpSmoothData(m_dataArray, m_sampleSpace, m_heightNormalizer, m_axisCacheY.min(), dimensionChanged); diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index bbfbc482..b84711a4 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -163,7 +163,7 @@ void QAbstract3DInputHandler::setPrevDistance(int distance) * \property QAbstract3DInputHandler::scene * * The 3D scene this abstract input handler is controlling. Only one scene can - * be controlled by one input handler. Setting a \a scene to a input handler doesn't + * be controlled by one input handler. Setting a \a scene to an input handler doesn't * transfer the ownership of the \a scene. */ Q3DScene *QAbstract3DInputHandler::scene() const diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index f78fcec3..d9a32ec6 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -58,7 +58,7 @@ void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, const QR m_surfaceType = SurfaceSmooth; - // Create/populate vertice table + // Create/populate vertix table if (changeGeometry) m_vertices.resize(totalSize); @@ -174,7 +174,7 @@ void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, const QRect &s m_surfaceType = SurfaceFlat; - // Create vertice table + // Create vertix table if (changeGeometry) m_vertices.resize(totalSize); diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index 63b9faaf..dafe5dbc 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -33,7 +33,7 @@ bool VertexIndexer::is_near(float v1, float v2) return qAbs(v1 - v2) < 0.01f; } -// Searches through all already-exported vertices +// Searches through all already exported vertices // for a similar one. // Similar = same position + same UVs + same normal bool VertexIndexer::getSimilarVertexIndex(const QVector3D &in_vertex, diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index af3e059b..9ace6c55 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -75,7 +75,7 @@ QSGNode *DeclarativeSurface::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa if (oldNode) delete oldNode; - // Create a new one and set it's bounding rectangle + // Create a new one and set its bounding rectangle DeclarativeSurfaceRenderer *node = new DeclarativeSurfaceRenderer(window(), m_shared); node->setRect(boundingRect()); m_shared->setBoundingRect(boundingRect().toRect()); diff --git a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp b/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp index 3ebe930d..5de4a8a6 100644 --- a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp +++ b/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp @@ -86,7 +86,7 @@ QImage QKinectWrapper::getDepth() /** \brief Returns if running - Runing comprises initializing and reading data (i.e. not running is idle or error) + Runing comprises initializing and reading data (not running is idle or error) We query the thread state to get this. **/ bool QKinectWrapper::isRunning() @@ -99,7 +99,7 @@ bool QKinectWrapper::isRunning() /** \brief Returns if stopped - Runing comprises initializing and reading data (i.e. not running is idle or error) + Runing comprises initializing and reading data (not running is idle or error) We query the thread state to get this. **/ bool QKinectWrapper::isStopped() |