diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 12:19:18 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 14:22:32 +0200 |
| commit | e029d0ea1d486dd3dbbfa4519a2125da202f22e4 (patch) | |
| tree | fc9f87f637a9adcca5a555355d96717d43eddc77 /src/datavisualizationqml2 | |
| parent | e7e01ec065d3874d28e9e28d213783c4275d8813 (diff) | |
Change qreals to floats
+ Fix default axes to sensible
+ Fix some rounding errors in surface creation
Task-number: QTRD-2622
Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/declarativebars.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualizationqml2/declarativebars_p.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index f229cfed..e7bb2683 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -107,7 +107,7 @@ void DeclarativeBars::setColumnAxis(Q3DCategoryAxis *axis) m_shared->setAxisZ(axis); } -void DeclarativeBars::setBarThickness(qreal thicknessRatio) +void DeclarativeBars::setBarThickness(float thicknessRatio) { if (thicknessRatio != barThickness()) { m_shared->setBarSpecs(GLfloat(thicknessRatio), barSpacing(), isBarSpacingRelative()); @@ -115,7 +115,7 @@ void DeclarativeBars::setBarThickness(qreal thicknessRatio) } } -qreal DeclarativeBars::barThickness() const +float DeclarativeBars::barThickness() const { return m_shared->barThickness(); } diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 86cd993e..041be418 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -52,7 +52,7 @@ class DeclarativeBars : public AbstractDeclarative Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis) Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis) Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle barType READ barType WRITE setBarType NOTIFY meshFileNameChanged) - Q_PROPERTY(qreal barThickness READ barThickness WRITE setBarThickness NOTIFY barThicknessChanged) + Q_PROPERTY(float barThickness READ barThickness WRITE setBarThickness NOTIFY barThicknessChanged) Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing NOTIFY barSpacingChanged) Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative NOTIFY barSpacingRelativeChanged) Q_PROPERTY(bool barSmoothingEnabled READ isBarSmoothingEnabled WRITE setBarSmoothingEnabled NOTIFY meshFileNameChanged) @@ -73,8 +73,8 @@ public: Q3DCategoryAxis *columnAxis() const; void setColumnAxis(Q3DCategoryAxis *axis); - void setBarThickness(qreal thicknessRatio); - qreal barThickness() const; + void setBarThickness(float thicknessRatio); + float barThickness() const; void setBarSpacing(QSizeF spacing); QSizeF barSpacing() const; @@ -100,7 +100,7 @@ public: Q_INVOKABLE void removeSeries(QBar3DSeries *series); signals: - void barThicknessChanged(qreal thicknessRatio); + void barThicknessChanged(float thicknessRatio); void barSpacingChanged(QSizeF spacing); void barSpacingRelativeChanged(bool relative); void meshFileNameChanged(QString filename); |