diff options
Diffstat (limited to 'tests/qmlchartproperties/qml/qmlchartproperties')
27 files changed, 51 insertions, 82 deletions
diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml index 46959f7d..069e17de 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "area series" diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml index 69b2761a..168dc957 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Flow { id: flow diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml index d0e34326..ad088646 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "Bar series" diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml index 439d7f9e..cdd847a5 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Button.qml b/tests/qmlchartproperties/qml/qmlchartproperties/Button.qml index 0c8b2017..61df081d 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/Button.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/Button.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: button diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml index 57d7407e..3f30ea44 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.3 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { id: chartView @@ -78,7 +78,7 @@ ChartView { onMinChanged: console.log("axisX.onMinChanged: " + min); onMaxChanged: console.log("axisX.onMaxChanged: " + max); } - + ValueAxis{ onColorChanged: console.log("axisY.onColorChanged: " + color); onLabelsVisibleChanged: console.log("axisY.onLabelsVisibleChanged: " + visible); diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml index f31b6a4c..87139f35 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Item { id: chartEditor @@ -84,7 +84,7 @@ Item { onClicked: { selectButton(axisXButton); loader.source = "ChartEditorAxis.qml"; - loader.item.axis = chart.axisX; + loader.item.axis = chart.axisX(); } } Button { @@ -94,7 +94,7 @@ Item { onClicked: { selectButton(axisYButton); loader.source = "ChartEditorAxis.qml"; - loader.item.axis = chart.axisY; + loader.item.axis = chart.axisY(); } } Button { diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml index ecd8d0a7..0c6d8dce 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml index 0c5ecd5b..24ffd9ef 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml index 5c8db45f..d172e4d8 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Flow { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml index 32c88a49..e7efc222 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.1 +import QtQuick 2.0 +import QtCharts 2.0 Flow { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml index 42babc29..61b4365f 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Flow { property variant chart diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml index 0ce70d95..3531597f 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Flow { flow: Flow.TopToBottom diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml index 7d24d2e6..aedb26cb 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "Bar series" diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml index 70324888..c0d1b443 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "Percent bar series" @@ -33,6 +33,7 @@ ChartView { HorizontalPercentBarSeries { id: mySeries name: "bar" + labelsFormat: "@value"; axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] onClicked: console.log("barset.onClicked: " + index); diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml index 0367037b..3b94e89d 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "Stacked bar series" diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml index dedeebcb..de3134a8 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { property variant series: lineSeries @@ -73,5 +73,6 @@ ChartView { XYPoint { x: 3.4; y: 2.0 } XYPoint { x: 4.1; y: 2.3 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); + onHovered: console.log(name + ".onHovered: " + point.x + ", " + point.y); } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml index f49dddcc..7960b4a1 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Flow { diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml index a9879c59..74c9b88f 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "Percent bar series" diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml index 37da01ce..37a321ae 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.1 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { id: chart diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml index 60f3a659..91eb0343 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.1 +import QtQuick 2.0 +import QtCharts 2.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml index cd898914..d531ac32 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "scatter series" @@ -43,6 +43,7 @@ ChartView { onVisibleChanged: console.log("scatterSeries.onVisibleChanged: " + visible); onOpacityChanged: console.log(name + ".onOpacityChanged: " + opacity); onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); + onHovered: console.log(name + ".onHovered: " + point.x + ", " + point.y); onPointReplaced: console.log("scatterSeries.onPointReplaced: " + index); onPointRemoved: console.log("scatterSeries.onPointRemoved: " + index); onPointAdded: console.log("scatterSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y); @@ -69,5 +70,6 @@ ChartView { XYPoint { x: 2.4; y: 2.7 } XYPoint { x: 2.67; y: 2.65 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); + onHovered: console.log(name + ".onHovered: " + point.x + ", " + point.y); } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml index 753ab197..23afdb75 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml @@ -18,7 +18,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Flow { id: flow diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml index 5f534b97..3a182d19 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "spline series" @@ -44,6 +44,7 @@ ChartView { onVisibleChanged: console.log("splineSeries.onVisibleChanged: " + visible); onOpacityChanged: console.log(name + ".onOpacityChanged: " + opacity); onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); + onHovered: console.log(name + ".onHovered: " + point.x + ", " + point.y); onPointReplaced: console.log("splineSeries.onPointReplaced: " + index); onPointRemoved: console.log("splineSeries.onPointRemoved: " + index); onPointAdded: console.log("splineSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y); @@ -71,5 +72,6 @@ ChartView { XYPoint { x: 3.4; y: 2.0 } XYPoint { x: 4.1; y: 2.3 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); + onHovered: console.log(name + ".onHovered: " + point.x + ", " + point.y); } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml index 5757a95c..a59f0e12 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml @@ -18,8 +18,8 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtCommercial.Chart 1.4 +import QtQuick 2.0 +import QtCharts 2.0 ChartView { title: "Stacked bar series" diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/loader.qml b/tests/qmlchartproperties/qml/qmlchartproperties/loader.qml deleted file mode 100644 index c04db7ff..00000000 --- a/tests/qmlchartproperties/qml/qmlchartproperties/loader.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 - -Item { - id: container - width: 640 - height: 500 - Component.onCompleted: { - var co = Qt.createComponent("main.qml") - if (co.status == Component.Ready) { - var o = co.createObject(container) - } else { - console.log(co.errorString()) - console.log("QtCommercial.Chart 1.1 not available") - console.log("Please use correct QML_IMPORT_PATH export") - } - } -} diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml b/tests/qmlchartproperties/qml/qmlchartproperties/main.qml index 9d5334f6..8265e1ae 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/main.qml @@ -18,12 +18,12 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: main - width: parent.width - height: parent.height + width: 800 + height: 600 property int viewCount: 9 property variant colors: ["#637D74", "#403D3A", "#8C3B3B", "#AB6937", "#D4A960"] property int colorIndex: 0 |