diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-28 08:33:27 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-28 08:33:27 +0200 |
commit | cd9c1b415743523edacfad522d940381075dac68 (patch) | |
tree | dc955869268dd5ce23148d8db521b6cdb907a6eb | |
parent | 7d8fad0d52f86805c39b6c7c98d6345c3f3fc4f1 (diff) | |
parent | 05aa17dcd472042f8f66dc8952a63faee5cd98bf (diff) |
Merge remote-tracking branch 'origin/develop'
Change-Id: Ic43e1bea15c9aefaf9e4010c3c8d07ae22b7c53f
-rw-r--r-- | examples/scatter/doc/images/scatter-example.png | bin | 166371 -> 134698 bytes | |||
-rw-r--r-- | examples/scatter/scatterdatamodifier.cpp | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/scatter/doc/images/scatter-example.png b/examples/scatter/doc/images/scatter-example.png Binary files differindex 1403705c..d1a3c7d9 100644 --- a/examples/scatter/doc/images/scatter-example.png +++ b/examples/scatter/doc/images/scatter-example.png diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp index 1fb08c93..ce5a1bd7 100644 --- a/examples/scatter/scatterdatamodifier.cpp +++ b/examples/scatter/scatterdatamodifier.cpp @@ -26,7 +26,7 @@ using namespace QtDataVisualization; //#define RANDOM_SCATTER // Uncomment this to switch to random scatter -const int numberOfItems = 10000; +const int numberOfItems = 3600; ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) : m_graph(scatter), @@ -40,7 +40,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_graph->setFont(font); m_graph->setObjectType(QDataVis::MeshStyleSpheres, true); m_graph->setTheme(QDataVis::ThemeEbony); - m_graph->setShadowQuality(QDataVis::ShadowQualityHigh); + m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow); m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront); //! [0] @@ -78,9 +78,9 @@ void ScatterDataModifier::addData() m_graph->axisX()->setTitle("X"); m_graph->axisY()->setTitle("Y"); m_graph->axisZ()->setTitle("Z"); - m_graph->axisX()->setRange(-50.0, 50.0); + m_graph->axisX()->setRange(-30.0, 30.0); m_graph->axisY()->setRange(-1.0, 1.0); - m_graph->axisZ()->setRange(-50.0, 50.0); + m_graph->axisZ()->setRange(-30.0, 30.0); //! [4] //! [5] @@ -99,7 +99,7 @@ void ScatterDataModifier::addData() float limit = qSqrt(numberOfItems) / 2.0f; for (float i = -limit; i < limit; i++) { for (float j = -limit; j < limit; j++) { - ptrToDataArray->setPosition(QVector3D(i, qCos(qDegreesToRadians((i * j) / 7.5)), j)); + ptrToDataArray->setPosition(QVector3D(i, qCos(qDegreesToRadians((i * j) / 3.0)), j)); ptrToDataArray++; } } |