From ebf4c2a781ada634d87dd53f485ed3521be6ba67 2012-07-03 17:39:40 From: Michal Klocek Date: 2012-07-03 17:39:40 Subject: [PATCH] Fixes qmlchartproperties --- diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml index b4c5732..b507fa9 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml @@ -30,11 +30,7 @@ ChartView { AreaSeries { id: areaSeries name: "area 1" - axisX: CategoriesAxis { - id: categoriesAxis - categories: ["2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", - "2008", "2009", "2010", "2011" ] - } + upperSeries: LineSeries { XYPoint { x: 0; y: 1 } XYPoint { x: 1; y: 1 } @@ -71,5 +67,9 @@ ChartView { onColorChanged: console.log("areaSeries.onColorChanged: " + color); onBorderColorChanged: console.log("areaSeries.onBorderColorChanged: " + borderColor); // onCountChanged: console.log("areaSeries.onCountChanged: " + count); + + Component.onCompleted: { + createDefaultAxes(); + } } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml index 25355c8..f9d5402 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml @@ -22,18 +22,22 @@ import QtQuick 1.0 import QtCommercial.Chart 1.0 ChartView { - title: "Bar series" + title: "Grouped bar series" anchors.fill: parent theme: ChartView.ChartThemeLight legend.alignment: Qt.AlignBottom - property variant series: barSeries + property variant series: mySeries + + CategoriesAxis { + id:myAxis; + categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } BarSeries { - id: barSeries + id: mySeries name: "bar" - axisX: CategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; values: [4, 7, 3, 10, 5, 6] + + BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] onClicked: console.log("barset.onClicked: " + index); onHovered: console.log("barset.onHovered: " + status); onPenChanged: console.log("barset.onPenChanged: " + pen); @@ -49,18 +53,20 @@ ChartView { onValuesRemoved: console.log("barset.onValuesRemoved: " + index + ", " + count); onValueChanged: console.log("barset.onValuesChanged: " + index); } - BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 8] } - BarSet { label: "James"; values: [3, 5, 8, 5, 4, 7] } + BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] } + BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] } - onNameChanged: console.log("barSeries.onNameChanged: " + series.name); - onVisibleChanged: console.log("barSeries.onVisibleChanged: " + series.visible); - onClicked: console.log("barSeries.onClicked: " + barset + " " + index); - onHovered: console.log("barSeries.onHovered: " + barset + " " + status); - onLabelsVisibleChanged: console.log("barSeries.onLabelsVisibleChanged: " + series.labelsVisible); - onCountChanged: console.log("barSeries.onCountChanged: " + count); - onBarsetsAdded: console.log("barSeries.onBarsetsAdded: " + sets); // There is no point in this signal on QML side - onAdded: console.log("barSeries.onBarsetAdded: " + barset); - onBarsetsRemoved: console.log("barSeries.onBarsetsRemoved: " + sets); // There is no point in this signal on QML side - onRemoved: console.log("barSeries.onBarsetRemoved: " + barset); + onNameChanged: console.log("groupedBarSeries.onNameChanged: " + series.name); + onVisibleChanged: console.log("groupedBarSeries.onVisibleChanged: " + series.visible); + onClicked: console.log("groupedBarSeries.onClicked: " + barset + " " + index); + onHovered: console.log("groupedBarSeries.onHovered: " + barset + " " + status); + onLabelsVisibleChanged: console.log("groupedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible); + onCountChanged: console.log("groupedBarSeries.onCountChanged: " + count); + } + + Component.onCompleted: { + createDefaultAxes(); + setAxisX(myAxis,mySeries); } -} + +} \ No newline at end of file diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml index 7c02b74..bedfc7a 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml @@ -65,28 +65,32 @@ ChartView { legend.onBorderColorChanged: console.log("legend.onBorderColorChanged: " + color); legend.onLabelColorChanged: console.log("legend.onLabelColorChanged: " + color); - axisX.onColorChanged: console.log("axisX.onColorChanged: " + color); - axisX.onLabelsVisibleChanged: console.log("axisX.onLabelsVisibleChanged: " + visible); - axisX.onLabelsColorChanged: console.log("axisX.onLabelsColorChanged: " + color); - axisX.onVisibleChanged: console.log("axisX.onVisibleChanged: " + visible); - axisX.onGridVisibleChanged: console.log("axisX.onGridVisibleChanged: " + visible); - axisX.onShadesVisibleChanged: console.log("axisX.onShadesVisibleChanged: " + visible); - axisX.onShadesColorChanged: console.log("axisX.onShadesColorChanged: " + color); - axisX.onShadesBorderColorChanged: console.log("axisX.onShadesBorderColorChanged: " + color); - axisX.onMinChanged: console.log("axisX.onMinChanged: " + min); - axisX.onMaxChanged: console.log("axisX.onMaxChanged: " + max); - - axisY.onColorChanged: console.log("axisY.onColorChanged: " + color); - axisY.onLabelsVisibleChanged: console.log("axisY.onLabelsVisibleChanged: " + visible); - axisY.onLabelsColorChanged: console.log("axisY.onLabelsColorChanged: " + color); - axisY.onVisibleChanged: console.log("axisY.onVisibleChanged: " + visible); - axisY.onGridVisibleChanged: console.log("axisY.onGridVisibleChanged: " + visible); - axisY.onShadesVisibleChanged: console.log("axisY.onShadesVisibleChanged: " + visible); - axisY.onShadesColorChanged: console.log("axisY.onShadesColorChanged: " + color); - axisY.onShadesBorderColorChanged: console.log("axisY.onShadesBorderColorChanged: " + color); - axisY.onMinChanged: console.log("axisY.onMinChanged: " + min); - axisY.onMaxChanged: console.log("axisY.onMaxChanged: " + max); + ValuesAxis{ + onColorChanged: console.log("axisX.onColorChanged: " + color); + onLabelsVisibleChanged: console.log("axisX.onLabelsVisibleChanged: " + visible); + onLabelsColorChanged: console.log("axisX.onLabelsColorChanged: " + color); + onVisibleChanged: console.log("axisX.onVisibleChanged: " + visible); + onGridVisibleChanged: console.log("axisX.onGridVisibleChanged: " + visible); + onShadesVisibleChanged: console.log("axisX.onShadesVisibleChanged: " + visible); + onShadesColorChanged: console.log("axisX.onShadesColorChanged: " + color); + onShadesBorderColorChanged: console.log("axisX.onShadesBorderColorChanged: " + color); + onMinChanged: console.log("axisX.onMinChanged: " + min); + onMaxChanged: console.log("axisX.onMaxChanged: " + max); + } + + ValuesAxis{ + onColorChanged: console.log("axisY.onColorChanged: " + color); + onLabelsVisibleChanged: console.log("axisY.onLabelsVisibleChanged: " + visible); + onLabelsColorChanged: console.log("axisY.onLabelsColorChanged: " + color); + onVisibleChanged: console.log("axisY.onVisibleChanged: " + visible); + onGridVisibleChanged: console.log("axisY.onGridVisibleChanged: " + visible); + onShadesVisibleChanged: console.log("axisY.onShadesVisibleChanged: " + visible); + onShadesColorChanged: console.log("axisY.onShadesColorChanged: " + color); + onShadesBorderColorChanged: console.log("axisY.onShadesBorderColorChanged: " + color); + onMinChanged: console.log("axisY.onMinChanged: " + min); + onMaxChanged: console.log("axisY.onMaxChanged: " + max); + } Rectangle { id: marginVisualizer @@ -103,4 +107,8 @@ ChartView { NumberAnimation { duration: 800 } } } + + Component.onCompleted: { + createDefaultAxes(); + } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml index 359faac..00c10e2 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml @@ -58,4 +58,8 @@ ChartView { XYPoint { x: 4.1; y: 2.3 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); } + + Component.onCompleted: { + createDefaultAxes(); + } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml index 086553b..94d3e4c 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml @@ -27,12 +27,16 @@ ChartView { theme: ChartView.ChartThemeLight legend.alignment: Qt.AlignBottom - property variant series: barSeries + property variant series: mySeries + + CategoriesAxis { + id: myAxis + categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] + } PercentBarSeries { - id: barSeries + id: mySeries name: "bar" - axisX: CategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] onClicked: console.log("barset.onClicked: " + index); onHovered: console.log("barset.onHovered: " + status); @@ -59,4 +63,9 @@ ChartView { onLabelsVisibleChanged: console.log("percentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible); onCountChanged: console.log("percentBarSeries.onCountChanged: " + count); } + + Component.onCompleted: { + createDefaultAxes(); + setAxisX(myAxis,mySeries); + } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml index 16e4cd4..8a84775 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml @@ -57,4 +57,8 @@ ChartView { XYPoint { x: 2.67; y: 2.65 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); } + + Component.onCompleted: { + createDefaultAxes(); + } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml index feca5a4..c634d3b 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml @@ -57,4 +57,8 @@ ChartView { XYPoint { x: 4.1; y: 2.3 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); } + + Component.onCompleted: { + createDefaultAxes(); + } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml index 9bac080..b793f91 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml @@ -27,12 +27,16 @@ ChartView { theme: ChartView.ChartThemeLight legend.alignment: Qt.AlignBottom - property variant series: barSeries + property variant series: mySeries + CategoriesAxis { + id: myAxis + categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] + } + StackedBarSeries { - id: barSeries + id: mySeries name: "bar" - axisX: CategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] onClicked: console.log("barset.onClicked: " + index); onHovered: console.log("barset.onHovered: " + status); @@ -59,4 +63,9 @@ ChartView { onLabelsVisibleChanged: console.log("stackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible); onCountChanged: console.log("stackedBarSeries.onCountChanged: " + count); } + + Component.onCompleted: { + createDefaultAxes(); + setAxisX(myAxis,mySeries); + } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml b/tests/qmlchartproperties/qml/qmlchartproperties/main.qml index 43d1d66..d0e3b86 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/main.qml @@ -26,7 +26,7 @@ Rectangle { width: parent.width height: parent.height property int viewNumber: 0 - property int viewCount: 10 + property int viewCount: 9 property variant colors: ["#637D74", "#403D3A", "#8C3B3B", "#AB6937", "#D4A960"] property int colorIndex: 0 @@ -57,13 +57,10 @@ Rectangle { } else if (viewNumber == 6) { chartLoader.source = "BarChart.qml"; editorLoader.source = "BarEditor.qml"; - } else if (viewNumber == 7) { - chartLoader.source = "GroupedBarChart.qml"; - editorLoader.source = "BarEditor.qml"; - } else if (viewNumber == 8) { + } else if (viewNumber == 7) { chartLoader.source = "StackedBarChart.qml"; editorLoader.source = "BarEditor.qml"; - } else if (viewNumber == 9) { + } else if (viewNumber == 8) { chartLoader.source = "PercentBarChart.qml"; editorLoader.source = "BarEditor.qml"; } else { diff --git a/tests/qmlchartproperties/resources.qrc b/tests/qmlchartproperties/resources.qrc index 457f08a..56e0f35 100644 --- a/tests/qmlchartproperties/resources.qrc +++ b/tests/qmlchartproperties/resources.qrc @@ -14,7 +14,6 @@ qml/qmlchartproperties/BarEditor.qml qml/qmlchartproperties/ScatterEditor.qml qml/qmlchartproperties/AreaEditor.qml - qml/qmlchartproperties/GroupedBarChart.qml qml/qmlchartproperties/StackedBarChart.qml qml/qmlchartproperties/PercentBarChart.qml qml/qmlchartproperties/Chart.qml