diff options
Diffstat (limited to 'tests/directional/scatterdatamodifier.cpp')
| -rw-r--r-- | tests/directional/scatterdatamodifier.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp index 3735e14c..1422cebb 100644 --- a/tests/directional/scatterdatamodifier.cpp +++ b/tests/directional/scatterdatamodifier.cpp @@ -111,8 +111,7 @@ void ScatterDataModifier::addData() #endif ptrToDataArray->setPosition(QVector3D(x, y, z)); - ptrToDataArray->setRotationAxis(rotation.vector()); - ptrToDataArray->setRotationAngle(qAcos(rotation.scalar()) * 360.0f / M_PI); + ptrToDataArray->setRotation(rotation); ptrToDataArray++; } } @@ -173,13 +172,15 @@ void ScatterDataModifier::triggerRotation() if (m_graph->seriesList().size()) { int selectedIndex = m_graph->seriesList().at(0)->selectedItem(); if (selectedIndex != QScatter3DSeries::invalidSelectionIndex()) { + static float itemAngle = 0.0f; QScatterDataItem item(*(m_graph->seriesList().at(0)->dataProxy()->itemAt(selectedIndex))); - item.setRotationAngle(item.rotationAngle() + 1); + QQuaternion itemRotation = QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, itemAngle++); + item.setRotation(itemRotation); m_graph->seriesList().at(0)->dataProxy()->setItem(selectedIndex, item); } else { static float seriesAngle = 0.0f; - m_graph->seriesList().at(0)->setMeshRotationAxis(QVector3D(1.0f, 1.0f, 1.0f)); - m_graph->seriesList().at(0)->setMeshRotationAngle(seriesAngle++); + QQuaternion rotation = QQuaternion::fromAxisAndAngle(1.0f, 1.0f, 1.0f, seriesAngle++); + m_graph->seriesList().at(0)->setMeshRotation(rotation); } } } |