diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-19 13:40:06 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-19 13:59:57 +0300 |
| commit | d8bbb6623b1e03f1e7fb611f6897887849083c1c (patch) | |
| tree | 213c6d48357df80d977485025225f398ee8a1552 /src/datavis3dqml2/declarativebars.cpp | |
| parent | 085a978a78af76a43d107d13a8b119423d37742b (diff) | |
Doc update; q3dbars, q3dwindow
+ api updates
Change-Id: I8da49e3cb45025eaa5713ae563bf8475f15cc298
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3dqml2/declarativebars.cpp')
| -rw-r--r-- | src/datavis3dqml2/declarativebars.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp index 2e4dbf04..2adcd870 100644 --- a/src/datavis3dqml2/declarativebars.cpp +++ b/src/datavis3dqml2/declarativebars.cpp @@ -90,9 +90,9 @@ QSGNode *DeclarativeBars::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData return node; } -void DeclarativeBars::setupSampleSpace(int rowCount, int columnCount) +void DeclarativeBars::setDataWindow(int rowCount, int columnCount) { - m_shared->setupSampleSpace(rowCount, columnCount); + m_shared->setDataWindow(rowCount, columnCount); } void DeclarativeBars::setBarColor(QColor baseColor, QColor heightColor, QColor depthColor, @@ -156,19 +156,19 @@ QItemModelBarDataMapping *DeclarativeBars::mapping() const return static_cast<QItemModelBarDataProxy *>(m_shared->dataProxy())->mapping(); } -void DeclarativeBars::setBarThickness(QSizeF thickness) +void DeclarativeBars::setBarThickness(qreal thicknessRatio) { - m_shared->setBarSpecs(thickness, barSpacing(), isBarSpacingRelative()); + m_shared->setBarSpecs(GLfloat(thicknessRatio), barSpacing(), isBarSpacingRelative()); } -QSizeF DeclarativeBars::barThickness() +qreal DeclarativeBars::barThickness() { return m_shared->barThickness(); } void DeclarativeBars::setBarSpacing(QSizeF spacing) { - m_shared->setBarSpecs(barThickness(), spacing, isBarSpacingRelative()); + m_shared->setBarSpecs(GLfloat(barThickness()), spacing, isBarSpacingRelative()); } QSizeF DeclarativeBars::barSpacing() @@ -178,7 +178,7 @@ QSizeF DeclarativeBars::barSpacing() void DeclarativeBars::setBarSpacingRelative(bool relative) { - m_shared->setBarSpecs(barThickness(), barSpacing(), relative); + m_shared->setBarSpecs(GLfloat(barThickness()), barSpacing(), relative); } bool DeclarativeBars::isBarSpacingRelative() @@ -338,7 +338,7 @@ int DeclarativeBars::rows() const void DeclarativeBars::setRows(int rows) { - setupSampleSpace(rows, columns()); + setDataWindow(rows, columns()); } int DeclarativeBars::columns() const @@ -348,7 +348,7 @@ int DeclarativeBars::columns() const void DeclarativeBars::setColumns(int columns) { - setupSampleSpace(rows(), columns); + setDataWindow(rows(), columns); } void DeclarativeBars::mousePressEvent(QMouseEvent *event) |