HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1606:ebf4c2a781ad

Fixes qmlchartproperties

Michal Klocek -

r1606:ebf4c2a781ad

parent child

Context file:

r1606:ebf4c2a781ad

Collapse all files

tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +5 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 title: "area series"
                 anchors.fill: parent
                 property variant series: areaSeries
                 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 }
                         XYPoint { x: 2; y: 3 }
                         XYPoint { x: 3; y: 3 }
                         XYPoint { x: 4; y: 2 }
                         XYPoint { x: 5; y: 0 }
                         XYPoint { x: 6; y: 2 }
                         XYPoint { x: 7; y: 1 }
                         XYPoint { x: 8; y: 2 }
                         XYPoint { x: 9; y: 1 }
                         XYPoint { x: 10; y: 3 }
                         XYPoint { x: 11; y: 3 }
                     }
                     lowerSeries: LineSeries {
                         XYPoint { x: 0; y: 0 }
                         XYPoint { x: 1; y: 0 }
                         XYPoint { x: 2; y: 0 }
                         XYPoint { x: 3; y: 0 }
                         XYPoint { x: 4; y: 0 }
                         XYPoint { x: 5; y: 0 }
                         XYPoint { x: 6; y: 0 }
                         XYPoint { x: 7; y: 0 }
                         XYPoint { x: 8; y: 0 }
                         XYPoint { x: 9; y: 0 }
                         XYPoint { x: 10; y: 0 }
                         XYPoint { x: 11; y: 0 }
                     }
                     onNameChanged:              console.log("areaSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("areaSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onSelected:                 console.log("areaSeries.onSelected");
                     onColorChanged:             console.log("areaSeries.onColorChanged: " + color);
                     onBorderColorChanged:       console.log("areaSeries.onBorderColorChanged: " + borderColor);
             //        onCountChanged:             console.log("areaSeries.onCountChanged: " + count);
+                    Component.onCompleted: {
+                    createDefaultAxes();
+                    }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +24 -18

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             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);
                         onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
                         onLabelChanged:             console.log("barset.onLabelChanged: " + label);
                         onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
                         onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
                         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: "Susan"; values: [5, 1, 2, 4, 1, 7] }
-                    BarSet { label: "James"; values: [3, 5, 8, 5, 4, 7] }
+                    BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
-                    onNameChanged:              console.log("barSeries.onNameChanged: " + series.name);
+                    onNameChanged:              console.log("groupedBarSeries.onNameChanged: " + series.name);
-                    onVisibleChanged:           console.log("barSeries.onVisibleChanged: " + series.visible);
+                    onVisibleChanged:           console.log("groupedBarSeries.onVisibleChanged: " + series.visible);
-                    onClicked:                  console.log("barSeries.onClicked: " + barset + " " + index);
+                    onClicked:                  console.log("groupedBarSeries.onClicked: " + barset + " " + index);
-                    onHovered:                  console.log("barSeries.onHovered: " + barset + " " + status);
+                    onHovered:                  console.log("groupedBarSeries.onHovered: " + barset + " " + status);
-                    onLabelsVisibleChanged:     console.log("barSeries.onLabelsVisibleChanged: " + series.labelsVisible);
+                    onLabelsVisibleChanged:     console.log("groupedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
-                    onCountChanged:             console.log("barSeries.onCountChanged: " + count);
+                    onCountChanged:             console.log("groupedBarSeries.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
+                Component.onCompleted: {
-                    onRemoved:                  console.log("barSeries.onBarsetRemoved: " + barset);
+                    createDefaultAxes();
+                    setAxisX(myAxis,mySeries);
                 }
+            }
  No newline at end of file

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +29 -21

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 id: chartView
                 title: "Chart Title"
                 anchors.fill: parent
                 property variant series: chartView
                 LineSeries {
                     name: "line"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 onVisibleChanged:                  console.log("chart.onVisibleChanged: " + visible);
                 onTitleColorChanged:               console.log("chart.onTitleColorChanged: " + color);
                 onBackgroundColorChanged:          console.log("chart.onBackgroundColorChanged: " + series.backgroundColor);
                 onDropShadowEnabledChanged:        console.log("chart.onDropShadowEnabledChanged: " + enabled);
                 onTopMarginChanged: {
                     console.log("chart.onTopMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 onBottomMarginChanged: {
                     console.log("chart.onBottomMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 onLeftMarginChanged: {
                     console.log("chart.onLeftMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 onRightMarginChanged: {
                     console.log("chart.onRightMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 legend.onVisibleChanged:           console.log("legend.onVisibleChanged: " + series.legend.visible);
                 legend.onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible);
                 legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                 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
                     color: "transparent"
                     border.color: "red"
                     anchors.fill: parent
                     anchors.topMargin: parent.topMargin
                     anchors.bottomMargin: parent.bottomMargin
                     anchors.leftMargin: parent.leftMargin
                     anchors.rightMargin: parent.rightMargin
                     opacity: 0.0
                     onOpacityChanged: if (opacity > 0.9) opacity = 0.0;
                     Behavior on opacity {
                         NumberAnimation { duration: 800 }
                     }
                 }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                }
             }

tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 property variant series: lineSeries
                 title: "line series"
                 anchors.fill: parent
                 LineSeries {
                     id: lineSeries
                     name: "line 1"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                     onNameChanged:              console.log("lineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("lineSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onPointReplaced:            console.log("lineSeries.onPointReplaced: " + index);
                     onPointRemoved:             console.log("lineSeries.onPointRemoved: " + index);
                     onPointAdded:               console.log("lineSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("lineSeries.onColorChanged: " + color);
                     onCountChanged:             console.log("lineSeries.onCountChanged: " + count);
                 }
                 LineSeries {
                     name: "line 2"
                     XYPoint { x: 1.1; y: 1.1 }
                     XYPoint { x: 1.9; y: 2.3 }
                     XYPoint { x: 2.1; y: 1.1 }
                     XYPoint { x: 2.9; y: 3.9 }
                     XYPoint { x: 3.4; y: 2.0 }
                     XYPoint { x: 4.1; y: 2.3 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                }
             }

tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +12 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 title: "Percent 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" ]
+                }
                 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);
                         onPenChanged:               console.log("barset.onPenChanged: " + pen);
                         onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
                         onLabelChanged:             console.log("barset.onLabelChanged: " + label);
                         onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
                         onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
                         onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
                         onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("percentBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("percentBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("percentBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("percentBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("percentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("percentBarSeries.onCountChanged: " + count);
                 }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                    setAxisX(myAxis,mySeries);
+                }
             }

tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 title: "scatter series"
                 property variant series: scatterSeries
                 ScatterSeries {
                     id: scatterSeries
                     name: "scatter 1"
                     XYPoint { x: 1.5; y: 1.5 }
                     XYPoint { x: 1.5; y: 1.6 }
                     XYPoint { x: 1.57; y: 1.55 }
                     XYPoint { x: 1.8; y: 1.8 }
                     XYPoint { x: 1.9; y: 1.6 }
                     XYPoint { x: 2.1; y: 1.3 }
                     XYPoint { x: 2.5; y: 2.1 }
                     onNameChanged:              console.log("scatterSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("scatterSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + 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);
                     onColorChanged:             console.log("scatterSeries.onColorChanged: " + color);
                     onBorderColorChanged:       console.log("scatterSeries.onBorderColorChanged: " + borderColor);
                     onCountChanged:             console.log("scatterSeries.onCountChanged: " + count);
                 }
                 ScatterSeries {
                     name: "scatter2"
                     XYPoint { x: 2.0; y: 2.0 }
                     XYPoint { x: 2.0; y: 2.1 }
                     XYPoint { x: 2.07; y: 2.05 }
                     XYPoint { x: 2.2; y: 2.9 }
                     XYPoint { x: 2.4; y: 2.7 }
                     XYPoint { x: 2.67; y: 2.65 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                }
             }

tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 title: "spline series"
                 anchors.fill: parent
                 property variant series: splineSeries
                 SplineSeries {
                     id: splineSeries
                     name: "spline 1"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                     onNameChanged:              console.log("splineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("splineSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + 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);
                     onColorChanged:             console.log("splineSeries.onColorChanged: " + color);
                     onCountChanged:             console.log("splineSeries.onCountChanged: " + count);
                 }
                 SplineSeries {
                     name: "spline 2"
                     XYPoint { x: 1.1; y: 1.1 }
                     XYPoint { x: 1.9; y: 2.3 }
                     XYPoint { x: 2.1; y: 1.1 }
                     XYPoint { x: 2.9; y: 3.9 }
                     XYPoint { x: 3.4; y: 2.0 }
                     XYPoint { x: 4.1; y: 2.3 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                }
             }

tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +12 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             ChartView {
                 title: "Stacked 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" ]
+                }
                 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);
                         onPenChanged:               console.log("barset.onPenChanged: " + pen);
                         onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
                         onLabelChanged:             console.log("barset.onLabelChanged: " + label);
                         onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
                         onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
                         onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
                         onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("stackedBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("stackedBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("stackedBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("stackedBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("stackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("stackedBarSeries.onCountChanged: " + count);
                 }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                    setAxisX(myAxis,mySeries);
+                }
             }

tests/qmlchartproperties/qml/qmlchartproperties/main.qml +3 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             import QtCommercial.Chart 1.0
             Rectangle {
                 id: main
                 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
                 function nextColor() {
                     colorIndex++;
                     return colors[colorIndex % colors.length];
                 }
                 onViewNumberChanged: {
                     if (viewNumber == 0) {
                         chartLoader.source = "Chart.qml";
                         editorLoader.source = "ChartEditor.qml";
                     } else if (viewNumber == 1) {
                         chartLoader.source = "PieChart.qml";
                         editorLoader.source = "PieEditor.qml";
                     } else if (viewNumber == 2) {
                         chartLoader.source = "LineChart.qml";
                         editorLoader.source = "LineEditor.qml";
                     } else if (viewNumber == 3) {
                         chartLoader.source = "SplineChart.qml";
                         editorLoader.source = "LineEditor.qml";
                     } else if (viewNumber == 4) {
                         chartLoader.source = "ScatterChart.qml";
                         editorLoader.source = "ScatterEditor.qml";
                     } else if (viewNumber == 5) {
                         chartLoader.source = "AreaChart.qml";
                         editorLoader.source = "AreaEditor.qml";
                     } else if (viewNumber == 6) {
                         chartLoader.source = "BarChart.qml";
                         editorLoader.source = "BarEditor.qml";
-                    } else if (viewNumber == 7) {
+                    }  else if (viewNumber == 7) {
-                        chartLoader.source = "GroupedBarChart.qml";
-                        editorLoader.source = "BarEditor.qml";
-                    } else if (viewNumber == 8) {
                         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 {
                         console.log("Illegal view number");
                     }
                 }
                 Row {
                     anchors.top: parent.top
                     anchors.bottom: buttonRow.top
                     anchors.bottomMargin: 10
                     anchors.left: parent.left
                     anchors.right: parent.right
                     Loader {
                         id: chartLoader
                         width: main.width - editorLoader.width
                         height: parent.height
                         source: "Chart.qml"
                         onStatusChanged: {
                             if (status == Loader.Ready && editorLoader.status == Loader.Ready && chartLoader.item)
                                 editorLoader.item.series = chartLoader.item.series;
                         }
                     }
                     Loader {
                         id: editorLoader
                         width: 280
                         height: parent.height
                         source: "ChartEditor.qml"
                         onStatusChanged: {
                             if (status == Loader.Ready && chartLoader.status == Loader.Ready && chartLoader.item)
                                 editorLoader.item.series = chartLoader.item.series;
                         }
                     }
                 }
                 Row {
                     id: buttonRow
                     height: 40
                     anchors.bottom: parent.bottom
                     anchors.horizontalCenter: parent.horizontalCenter
                     spacing: 10
                     Button {
                         text: "previous"
                         onClicked: {
                             viewNumber = (viewNumber + viewCount - 1) % viewCount;
                         }
                     }
                     Button {
                         text: "next"
                         onClicked: {
                             viewNumber = (viewNumber + 1) % viewCount;
                         }
                     }
                 }
             }

tests/qmlchartproperties/resources.qrc 0 -1

             <RCC>
                 <qresource prefix="/">
                     <file>qml/qmlchartproperties/loader.qml</file>
                     <file>qml/qmlchartproperties/main.qml</file>
                     <file>qml/qmlchartproperties/Button.qml</file>
                     <file>qml/qmlchartproperties/PieChart.qml</file>
                     <file>qml/qmlchartproperties/PieEditor.qml</file>
                     <file>qml/qmlchartproperties/LineChart.qml</file>
                     <file>qml/qmlchartproperties/LineEditor.qml</file>
                     <file>qml/qmlchartproperties/SplineChart.qml</file>
                     <file>qml/qmlchartproperties/ScatterChart.qml</file>
                     <file>qml/qmlchartproperties/AreaChart.qml</file>
                     <file>qml/qmlchartproperties/BarChart.qml</file>
                     <file>qml/qmlchartproperties/BarEditor.qml</file>
                     <file>qml/qmlchartproperties/ScatterEditor.qml</file>
                     <file>qml/qmlchartproperties/AreaEditor.qml</file>
-                    <file>qml/qmlchartproperties/GroupedBarChart.qml</file>
                     <file>qml/qmlchartproperties/StackedBarChart.qml</file>
                     <file>qml/qmlchartproperties/PercentBarChart.qml</file>
                     <file>qml/qmlchartproperties/Chart.qml</file>
                     <file>qml/qmlchartproperties/ChartEditor.qml</file>
                     <file>qml/qmlchartproperties/ChartEditor1.qml</file>
                     <file>qml/qmlchartproperties/ChartEditor2.qml</file>
                     <file>qml/qmlchartproperties/ChartEditor3.qml</file>
                     <file>qml/qmlchartproperties/FontEditor.qml</file>
                 </qresource>
             </RCC>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages