diff options
author | Mika Salmela <mika.salmela@theqtcompany.com> | 2014-11-03 11:22:23 +0200 |
---|---|---|
committer | Mika Salmela <mika.salmela@theqtcompany.com> | 2014-11-03 11:23:13 +0200 |
commit | a1feedcf46975a65970fb946282c742b091b508e (patch) | |
tree | 990cf6ee09700ebac84fb4cbe333ab91fde37aee /tests/qmlperf/qml/qmlperf/main.qml | |
parent | 0090db160242374d7ab6e3bedf064b366716f770 (diff) |
Qml perf data generation on cpp
Change-Id: If770c96ff84e49a747c4355e56bff002556cd659
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
Diffstat (limited to 'tests/qmlperf/qml/qmlperf/main.qml')
-rw-r--r-- | tests/qmlperf/qml/qmlperf/main.qml | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/qmlperf/qml/qmlperf/main.qml b/tests/qmlperf/qml/qmlperf/main.qml index 35f8df5d..bb3f1b82 100644 --- a/tests/qmlperf/qml/qmlperf/main.qml +++ b/tests/qmlperf/qml/qmlperf/main.qml @@ -20,7 +20,6 @@ import QtQuick 2.1 import QtQuick.Layouts 1.0 import QtQuick.Controls 1.0 import QtDataVisualization 1.1 -import "script.js" as Script import "." Rectangle { @@ -29,7 +28,7 @@ Rectangle { height: 1024 property var itemCount: 1000.0 - property var addItems: 1000.0 + property var addItems: 500.0 Button { id: changeButton @@ -90,7 +89,7 @@ Rectangle { text: "Add" onClicked: { itemCount = itemCount + addItems; - Script.createData(addItems); + dataGenerator.add(scatterSeries, addItems); } } @@ -102,11 +101,6 @@ Rectangle { anchors.left: mainview.left state: "meshsphere" - ListModel { - id: dataModel - Component.onCompleted: Script.createData(itemCount) - } - Scatter3D { id: scatterPlot width: graphView.width @@ -134,13 +128,9 @@ Rectangle { Scatter3DSeries { id: scatterSeries mesh: Abstract3DSeries.MeshSphere - ItemModelScatterDataProxy { - itemModel: dataModel - xPosRole: "x" - yPosRole: "y" - zPosRole: "z" - } } + + Component.onCompleted: dataGenerator.generateData(scatterSeries, itemCount); } states: [ |