From 2dc1b3809943e3d294e2363a2b0d185607b8854f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 12 Sep 2013 07:58:26 +0300 Subject: QML documentation Task-number: QTRD-2133 Change-Id: I2568b3cd6e83ee933536d7fec2e48f9f121b213e Reviewed-by: Miikka Heikkinen --- src/datavisualizationqml2/declarativebars.cpp | 8 ++++---- src/datavisualizationqml2/declarativebars_p.h | 6 +++--- src/datavisualizationqml2/declarativescatter.cpp | 8 ++++---- src/datavisualizationqml2/declarativescatter_p.h | 6 +++--- src/datavisualizationqml2/declarativesurface.cpp | 12 ++++++------ src/datavisualizationqml2/declarativesurface_p.h | 12 ++++++------ 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/datavisualizationqml2') diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 29d138e2..3da8e416 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -183,16 +183,16 @@ QDataVis::MeshStyle DeclarativeBars::barType() return QDataVis::Dots; } -void DeclarativeBars::setBarSmooth(bool smooth) +void DeclarativeBars::setBarSmoothingEnabled(bool enabled) { QString objFile = m_shared->meshFileName(); if (objFile.endsWith(smoothString)) { - if (smooth) + if (enabled) return; // Already smooth; do nothing else // Rip Smooth off the end objFile.resize(objFile.indexOf(smoothString)); } else { - if (!smooth) // Already flat; do nothing + if (!enabled) // Already flat; do nothing return; else // Append Smooth to the end objFile.append(smoothString); @@ -200,7 +200,7 @@ void DeclarativeBars::setBarSmooth(bool smooth) m_shared->setMeshFileName(objFile); } -bool DeclarativeBars::barSmooth() +bool DeclarativeBars::isBarSmoothingEnabled() { QString objFile = m_shared->meshFileName(); return objFile.endsWith(smoothString); diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 79ad7884..f86efe79 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -59,7 +59,7 @@ class DeclarativeBars : public QQuickItem Q_PROPERTY(qreal barThickness READ barThickness WRITE setBarThickness) Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing) Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative) - Q_PROPERTY(bool barSmooth READ barSmooth WRITE setBarSmooth) + Q_PROPERTY(bool barSmoothingEnabled READ isBarSmoothingEnabled WRITE setBarSmoothingEnabled) Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) @@ -120,8 +120,8 @@ public: QDataVis::MeshStyle barType(); // Bar smoothing - void setBarSmooth(bool smooth); - bool barSmooth(); + void setBarSmoothingEnabled(bool enabled); + bool isBarSmoothingEnabled(); // override object type with own mesh void setMeshFileName(const QString &objFileName); diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index dc9ac209..64bd324f 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -146,16 +146,16 @@ QDataVis::MeshStyle DeclarativeScatter::objectType() return QDataVis::Dots; } -void DeclarativeScatter::setObjectSmooth(bool smooth) +void DeclarativeScatter::setObjectSmoothingEnabled(bool enabled) { QString objFile = m_shared->meshFileName(); if (objFile.endsWith(smoothString)) { - if (smooth) + if (enabled) return; // Already smooth; do nothing else // Rip Smooth off the end objFile.resize(objFile.indexOf(smoothString)); } else { - if (!smooth) // Already flat; do nothing + if (!enabled) // Already flat; do nothing return; else // Append Smooth to the end objFile.append(smoothString); @@ -163,7 +163,7 @@ void DeclarativeScatter::setObjectSmooth(bool smooth) m_shared->setMeshFileName(objFile); } -bool DeclarativeScatter::objectSmooth() +bool DeclarativeScatter::isObjectSmoothingEnabled() { QString objFile = m_shared->meshFileName(); return objFile.endsWith(smoothString); diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index ad6ccb2a..80137507 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -54,7 +54,7 @@ class DeclarativeScatter : public QQuickItem Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme) - Q_PROPERTY(bool objectSmooth READ objectSmooth WRITE setObjectSmooth) + Q_PROPERTY(bool objectSmoothingEnabled READ isObjectSmoothingEnabled WRITE setObjectSmoothingEnabled) Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) @@ -95,8 +95,8 @@ public: QDataVis::MeshStyle objectType(); // Object smoothing - void setObjectSmooth(bool smooth); - bool objectSmooth(); + void setObjectSmoothingEnabled(bool enabled); + bool isObjectSmoothingEnabled(); // override object type with own mesh void setMeshFileName(const QString &objFileName); diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 7597bef0..c3c5dd09 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -190,22 +190,22 @@ bool DeclarativeSurface::isBackgroundVisible() return m_shared->backgroundEnabled(); } -void DeclarativeSurface::setSmoothSurface(bool enable) +void DeclarativeSurface::setSmoothSurfaceEnabled(bool enabled) { - m_shared->setSmoothSurface(enable); + m_shared->setSmoothSurface(enabled); } -bool DeclarativeSurface::smoothSurface() const +bool DeclarativeSurface::isSmoothSurfaceEnabled() const { return m_shared->smoothSurface(); } -void DeclarativeSurface::setSurfaceGrid(bool enable) +void DeclarativeSurface::setSurfaceGridEnabled(bool enabled) { - m_shared->setSurfaceGrid(enable); + m_shared->setSurfaceGrid(enabled); } -bool DeclarativeSurface::surfaceGrid() const +bool DeclarativeSurface::isSurfaceGridEnabled() const { return m_shared->surfaceGrid(); } diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index c6aae7c0..180e1cc4 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -57,8 +57,8 @@ class DeclarativeSurface : public QQuickItem Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible) - Q_PROPERTY(bool smoothSurface READ smoothSurface WRITE setSmoothSurface) - Q_PROPERTY(bool surfaceGrid READ surfaceGrid WRITE setSurfaceGrid) + Q_PROPERTY(bool smoothSurfaceEnabled READ isSmoothSurfaceEnabled WRITE setSmoothSurfaceEnabled) + Q_PROPERTY(bool surfaceGridEnabled READ isSurfaceGridEnabled WRITE setSurfaceGridEnabled) Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat) Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode) Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) @@ -112,12 +112,12 @@ public: bool isBackgroundVisible(); // Enable or disable the smoothes of the surface - void setSmoothSurface(bool enable); - bool smoothSurface() const; + void setSmoothSurfaceEnabled(bool enabled); + bool isSmoothSurfaceEnabled() const; // Enable or disable the grid on the surface - void setSurfaceGrid(bool enable); - bool surfaceGrid() const; + void setSurfaceGridEnabled(bool enabled); + bool isSurfaceGridEnabled() const; // Adjust shadow quality void setShadowQuality(QDataVis::ShadowQuality quality); -- cgit v1.2.3