HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1532:d1f7bd98a717

Renamed XyPoint to XYPoint

Tero Ahola -

r1532:d1f7bd98a717

parent child

Context file:

r1532:d1f7bd98a717

Collapse all files

demos/qmlchart/qml/qmlchart/View2.qml +7 -7

             /****************************************************************************
             **
             ** 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 {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Line"
                     anchors.fill: parent
                     LineSeries {
                         name: "LineSeries"
-                        XyPoint { x: 0; y: 0 }
+                        XYPoint { x: 0; y: 0 }
-                        XyPoint { x: 1.1; y: 2.1 }
+                        XYPoint { x: 1.1; y: 2.1 }
-                        XyPoint { x: 1.9; y: 3.3 }
+                        XYPoint { x: 1.9; y: 3.3 }
-                        XyPoint { x: 2.1; y: 2.1 }
+                        XYPoint { x: 2.1; y: 2.1 }
-                        XyPoint { x: 2.9; y: 4.9 }
+                        XYPoint { x: 2.9; y: 4.9 }
-                        XyPoint { x: 3.4; y: 3.0 }
+                        XYPoint { x: 3.4; y: 3.0 }
-                        XyPoint { x: 4.1; y: 3.3 }
+                        XYPoint { x: 4.1; y: 3.3 }
                     }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/View3.qml +7 -7

             /****************************************************************************
             **
             ** 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 {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Spline"
                     anchors.fill: parent
                     SplineSeries {
                         name: "SplineSeries"
-                        XyPoint { x: 0; y: 0.3 }
+                        XYPoint { x: 0; y: 0.3 }
-                        XyPoint { x: 1.1; y: 3.2 }
+                        XYPoint { x: 1.1; y: 3.2 }
-                        XyPoint { x: 1.9; y: 2.4 }
+                        XYPoint { x: 1.9; y: 2.4 }
-                        XyPoint { x: 2.1; y: 2.1 }
+                        XYPoint { x: 2.1; y: 2.1 }
-                        XyPoint { x: 2.9; y: 2.6 }
+                        XYPoint { x: 2.9; y: 2.6 }
-                        XyPoint { x: 3.4; y: 2.3 }
+                        XYPoint { x: 3.4; y: 2.3 }
-                        XyPoint { x: 4.1; y: 3.1 }
+                        XYPoint { x: 4.1; y: 3.1 }
                     }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/View4.qml +72 -72

             /****************************************************************************
             **
             ** 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 {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "NHL All-Star Team Players"
                     anchors.fill: parent
                     axisXLabels: ["0", "2000", "1", "2001", "2", "2002", "3", "2003", "4", "2004", "5", "2005",
                         "6", "2006", "7", "2007", "8", "2008", "9", "2009", "10", "2010", "11", "2011"]
                     AreaSeries {
                         name: "Russian"
                         upperSeries: LineSeries {
-                            XyPoint { x: 0; y: 1 }
+                            XYPoint { x: 0; y: 1 }
-                            XyPoint { x: 1; y: 1 }
+                            XYPoint { x: 1; y: 1 }
-                            XyPoint { x: 2; y: 1 }
+                            XYPoint { x: 2; y: 1 }
-                            XyPoint { x: 3; y: 1 }
+                            XYPoint { x: 3; y: 1 }
-                            XyPoint { x: 4; y: 1 }
+                            XYPoint { x: 4; y: 1 }
-                            XyPoint { x: 5; y: 0 }
+                            XYPoint { x: 5; y: 0 }
-                            XyPoint { x: 6; y: 1 }
+                            XYPoint { x: 6; y: 1 }
-                            XyPoint { x: 7; y: 1 }
+                            XYPoint { x: 7; y: 1 }
-                            XyPoint { x: 8; y: 4 }
+                            XYPoint { x: 8; y: 4 }
-                            XyPoint { x: 9; y: 3 }
+                            XYPoint { x: 9; y: 3 }
-                            XyPoint { x: 10; y: 2 }
+                            XYPoint { x: 10; y: 2 }
-                            XyPoint { x: 11; y: 1 }
+                            XYPoint { x: 11; y: 1 }
                         }
                         lowerSeries: LineSeries {
-                            XyPoint { x: 0; y: 0 }
+                            XYPoint { x: 0; y: 0 }
-                            XyPoint { x: 1; y: 0 }
+                            XYPoint { x: 1; y: 0 }
-                            XyPoint { x: 2; y: 0 }
+                            XYPoint { x: 2; y: 0 }
-                            XyPoint { x: 3; y: 0 }
+                            XYPoint { x: 3; y: 0 }
-                            XyPoint { x: 4; y: 0 }
+                            XYPoint { x: 4; y: 0 }
-                            XyPoint { x: 5; y: 0 }
+                            XYPoint { x: 5; y: 0 }
-                            XyPoint { x: 6; y: 0 }
+                            XYPoint { x: 6; y: 0 }
-                            XyPoint { x: 7; y: 0 }
+                            XYPoint { x: 7; y: 0 }
-                            XyPoint { x: 8; y: 0 }
+                            XYPoint { x: 8; y: 0 }
-                            XyPoint { x: 9; y: 0 }
+                            XYPoint { x: 9; y: 0 }
-                            XyPoint { x: 10; y: 0 }
+                            XYPoint { x: 10; y: 0 }
-                            XyPoint { x: 11; y: 0 }
+                            XYPoint { x: 11; y: 0 }
                         }
                     }
                     // ...
                     //![1]
                     AreaSeries {
                         id: swedish
                         name: "Swedish"
                         upperSeries: LineSeries {
-                            XyPoint { x: 0; y: 1 }
+                            XYPoint { x: 0; y: 1 }
-                            XyPoint { x: 1; y: 1 }
+                            XYPoint { x: 1; y: 1 }
-                            XyPoint { x: 2; y: 3 }
+                            XYPoint { x: 2; y: 3 }
-                            XyPoint { x: 3; y: 3 }
+                            XYPoint { x: 3; y: 3 }
-                            XyPoint { x: 4; y: 2 }
+                            XYPoint { x: 4; y: 2 }
-                            XyPoint { x: 5; y: 0 }
+                            XYPoint { x: 5; y: 0 }
-                            XyPoint { x: 6; y: 2 }
+                            XYPoint { x: 6; y: 2 }
-                            XyPoint { x: 7; y: 1 }
+                            XYPoint { x: 7; y: 1 }
-                            XyPoint { x: 8; y: 2 }
+                            XYPoint { x: 8; y: 2 }
-                            XyPoint { x: 9; y: 1 }
+                            XYPoint { x: 9; y: 1 }
-                            XyPoint { x: 10; y: 3 }
+                            XYPoint { x: 10; y: 3 }
-                            XyPoint { x: 11; y: 3 }
+                            XYPoint { x: 11; y: 3 }
                         }
                         lowerSeries: LineSeries {
-                            XyPoint { x: 0; y: 0 }
+                            XYPoint { x: 0; y: 0 }
-                            XyPoint { x: 1; y: 0 }
+                            XYPoint { x: 1; y: 0 }
-                            XyPoint { x: 2; y: 0 }
+                            XYPoint { x: 2; y: 0 }
-                            XyPoint { x: 3; y: 0 }
+                            XYPoint { x: 3; y: 0 }
-                            XyPoint { x: 4; y: 0 }
+                            XYPoint { x: 4; y: 0 }
-                            XyPoint { x: 5; y: 0 }
+                            XYPoint { x: 5; y: 0 }
-                            XyPoint { x: 6; y: 0 }
+                            XYPoint { x: 6; y: 0 }
-                            XyPoint { x: 7; y: 0 }
+                            XYPoint { x: 7; y: 0 }
-                            XyPoint { x: 8; y: 0 }
+                            XYPoint { x: 8; y: 0 }
-                            XyPoint { x: 9; y: 0 }
+                            XYPoint { x: 9; y: 0 }
-                            XyPoint { x: 10; y: 0 }
+                            XYPoint { x: 10; y: 0 }
-                            XyPoint { x: 11; y: 0 }
+                            XYPoint { x: 11; y: 0 }
                         }
                         onClicked: {
                             color = "yellow";
                             borderColor = "blue";
                         }
                     }
                     AreaSeries {
                         name: "Finnish"
                         upperSeries: LineSeries {
-                            XyPoint { x: 0; y: 0 }
+                            XYPoint { x: 0; y: 0 }
-                            XyPoint { x: 1; y: 0 }
+                            XYPoint { x: 1; y: 0 }
-                            XyPoint { x: 2; y: 0 }
+                            XYPoint { x: 2; y: 0 }
-                            XyPoint { x: 3; y: 0 }
+                            XYPoint { x: 3; y: 0 }
-                            XyPoint { x: 4; y: 0 }
+                            XYPoint { x: 4; y: 0 }
-                            XyPoint { x: 5; y: 0 }
+                            XYPoint { x: 5; y: 0 }
-                            XyPoint { x: 6; y: 1 }
+                            XYPoint { x: 6; y: 1 }
-                            XyPoint { x: 7; y: 0 }
+                            XYPoint { x: 7; y: 0 }
-                            XyPoint { x: 8; y: 0 }
+                            XYPoint { x: 8; y: 0 }
-                            XyPoint { x: 9; y: 0 }
+                            XYPoint { x: 9; y: 0 }
-                            XyPoint { x: 10; y: 0 }
+                            XYPoint { x: 10; y: 0 }
-                            XyPoint { x: 11; y: 1 }
+                            XYPoint { x: 11; y: 1 }
                         }
                         lowerSeries: LineSeries {
-                            XyPoint { x: 0; y: 0 }
+                            XYPoint { x: 0; y: 0 }
-                            XyPoint { x: 1; y: 0 }
+                            XYPoint { x: 1; y: 0 }
-                            XyPoint { x: 2; y: 0 }
+                            XYPoint { x: 2; y: 0 }
-                            XyPoint { x: 3; y: 0 }
+                            XYPoint { x: 3; y: 0 }
-                            XyPoint { x: 4; y: 0 }
+                            XYPoint { x: 4; y: 0 }
-                            XyPoint { x: 5; y: 0 }
+                            XYPoint { x: 5; y: 0 }
-                            XyPoint { x: 6; y: 0 }
+                            XYPoint { x: 6; y: 0 }
-                            XyPoint { x: 7; y: 0 }
+                            XYPoint { x: 7; y: 0 }
-                            XyPoint { x: 8; y: 0 }
+                            XYPoint { x: 8; y: 0 }
-                            XyPoint { x: 9; y: 0 }
+                            XYPoint { x: 9; y: 0 }
-                            XyPoint { x: 10; y: 0 }
+                            XYPoint { x: 10; y: 0 }
-                            XyPoint { x: 11; y: 0 }
+                            XYPoint { x: 11; y: 0 }
                         }
                         onClicked: {
                             color = "white";
                             borderColor = "blue";
                         }
                     }
                 }
             }

demos/qmlchart/qml/qmlchart/View5.qml +13 -13

             /****************************************************************************
             **
             ** 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 {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Scatters"
                     anchors.fill: parent
                     ScatterSeries {
                         id: scatter1
                         name: "Scatter1"
-                        XyPoint { x: 1.5; y: 1.5 }
+                        XYPoint { x: 1.5; y: 1.5 }
-                        XyPoint { x: 1.5; y: 1.6 }
+                        XYPoint { x: 1.5; y: 1.6 }
-                        XyPoint { x: 1.57; y: 1.55 }
+                        XYPoint { x: 1.57; y: 1.55 }
-                        XyPoint { x: 1.8; y: 1.8 }
+                        XYPoint { x: 1.8; y: 1.8 }
-                        XyPoint { x: 1.9; y: 1.6 }
+                        XYPoint { x: 1.9; y: 1.6 }
-                        XyPoint { x: 2.1; y: 1.3 }
+                        XYPoint { x: 2.1; y: 1.3 }
-                        XyPoint { x: 2.5; y: 2.1 }
+                        XYPoint { x: 2.5; y: 2.1 }
                     }
                     ScatterSeries {
                         name: "Scatter2"
                         // ...
                         //![1]
-                        XyPoint { x: 2.0; y: 2.0 }
+                        XYPoint { x: 2.0; y: 2.0 }
-                        XyPoint { x: 2.0; y: 2.1 }
+                        XYPoint { x: 2.0; y: 2.1 }
-                        XyPoint { x: 2.07; y: 2.05 }
+                        XYPoint { x: 2.07; y: 2.05 }
-                        XyPoint { x: 2.2; y: 2.9 }
+                        XYPoint { x: 2.2; y: 2.9 }
-                        XyPoint { x: 2.4; y: 2.7 }
+                        XYPoint { x: 2.4; y: 2.7 }
-                        XyPoint { x: 2.67; y: 2.65 }
+                        XYPoint { x: 2.67; y: 2.65 }
                 //![2]
                     }
                 }
                 //![2]
             }

doc/src/qml.qdoc +1 -1

             /*!
                 \page qml.html
                 \title QtCommercial Charts QML API
                 \keyword Charts QML API
                 QtCommercial Charts QML API is an intuitive and simple way to show charts in your QML
                 applications. The following QML shows you to create a simple pie chart:
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
                 \raw HTML
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> ChartView and it's properties </th>
                         </tr>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-chartview.html">ChartView</a></li>
                                 <li><a href="qml-axis.html">Axis</a></li>
                                 <li><a href="qml-legend.html">Legend</a></li>
                                 <li><a href="qml-abstractseries.html">AbstractSeries</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> XY chart </th>
                         </tr>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-xyseries.html">XYSeries</a></li>
                                 <li><a href="qml-lineseries.html">LineSeries</a></li>
                                 <li><a href="qml-areaseries.html">AreaSeries</a></li>
                                 <li><a href="qml-scatterseries.html">ScatterSeries</a></li>
                                 <li><a href="qml-splineseries.html">SplineSeries</a></li>
-                                <li><a href="qml-xypoint.html">XyPoint</a></li>
+                                <li><a href="qml-xypoint.html">XYPoint</a></li>
                                 <li><a href="qml-hxymodelmapper.html">HXYModelMapper</a></li>
                                 <li><a href="qml-vxymodelmapper.html">VXYModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> Pie chart </th>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-pieseries.html">PieSeries</a></li>
                                 <li><a href="qml-pieslice.html">PieSlice</a></li>
                                 <li><a href="qml-hpiemodelmapper.html">HPieModelMapper</a></li>
                                 <li><a href="qml-vpiemodelmapper.html">VPieModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> Bar chart </th>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-barseries.html">BarSeries</a></li>
                                 <li><a href="qml-groupedbarseries.html">GroupedBarSeries</a></li>
                                 <li><a href="qml-stackedbarseries.html">StackedBarSeries</a></li>
                                 <li><a href="qml-percentbarseries.html">PercentBarSeries</a></li>
                                 <li><a href="qml-barset.html">BarSet</a></li>
                                 <li><a href="qml-hbarmodelmapper.html">HBarModelMapper</a></li>
                                 <li><a href="qml-vbarmodelmapper.html">VBarModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                 \endraw
             */

plugins/declarative/declarativexypoint.cpp +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$
             **
             ****************************************************************************/
             #include "declarativexypoint.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \qmlclass XyPoint QPointF
+                \qmlclass XYPoint QPointF
-                XyPoint is a convenience element for initializing XY-series with static coordinate data. To
+                XYPoint is a convenience element for initializing XY-series with static coordinate data. To
                 manipulate an XY-series dynamically, use it's data manipulation functions instead.
                 \sa LineSeries, AreaSeries, ScatterSeries, SplineSeries
             */
             /*!
-                \qmlproperty real XyPoint::x
+                \qmlproperty real XYPoint::x
                 The x-coordinate of the point.
             */
             /*!
-                \qmlproperty real XyPoint::y
+                \qmlproperty real XYPoint::y
                 The y-coordinate of the point.
             */
-            DeclarativeXyPoint::DeclarativeXyPoint(QObject *parent) :
+            DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) :
                 QObject(parent)
             {
                 setX(0.0);
                 setY(0.0);
             }
             #include "moc_declarativexypoint.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativexypoint.h +2 -2

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVE_XY_POINT_H
             #define DECLARATIVE_XY_POINT_H
             #include "qchartglobal.h"
             #include <QObject>
             #include <QPointF>
             #include <QDataStream>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class DeclarativeXyPoint : public QObject, public QPointF
+            class DeclarativeXYPoint : public QObject, public QPointF
             {
                 Q_OBJECT
                 // TODO: make the setters change the value, if parented by a series
                 Q_PROPERTY(qreal x READ x WRITE setX /*NOTIFY dataXChanged*/)
                 Q_PROPERTY(qreal y READ y WRITE setY /*NOTIFY dataYChanged*/)
             public:
-                explicit DeclarativeXyPoint(QObject *parent = 0);
+                explicit DeclarativeXYPoint(QObject *parent = 0);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVE_XY_POINT_H

plugins/declarative/declarativexyseries.cpp +2 -2

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             //#include "DeclarativeXySeries.h"
             #include "declarativexyseries.h"
             #include "declarativechart.h"
             #include <QXYSeries>
             #include <QVXYModelMapper>
             #include <QHXYModelMapper>
             #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeXySeries::DeclarativeXySeries()
             {
             }
             DeclarativeXySeries::~DeclarativeXySeries()
             {
             }
             void DeclarativeXySeries::classBegin()
             {
             }
             void DeclarativeXySeries::componentComplete()
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 foreach(QObject *child, series->children()) {
-                    if (qobject_cast<DeclarativeXyPoint *>(child)) {
+                    if (qobject_cast<DeclarativeXYPoint *>(child)) {
-                        DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(child);
+                        DeclarativeXYPoint *point = qobject_cast<DeclarativeXYPoint *>(child);
                         series->append(point->x(), point->y());
                     } else if(qobject_cast<QVXYModelMapper *>(child)) {
                         QVXYModelMapper *mapper = qobject_cast<QVXYModelMapper *>(child);
                         mapper->setSeries(series);
                     } else if(qobject_cast<QHXYModelMapper *>(child)) {
                         QHXYModelMapper *mapper = qobject_cast<QHXYModelMapper *>(child);
                         mapper->setSeries(series);
                     }
                 }
             }
             void DeclarativeXySeries::append(qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->append(x, y);
             }
             void DeclarativeXySeries::replace(qreal oldX, qreal oldY, qreal newX, qreal newY)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->replace(oldX, oldY, newX, newY);
             }
             void DeclarativeXySeries::remove(qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->remove(x, y);
             }
             void DeclarativeXySeries::insert(int index, qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->insert(index, QPointF(x, y));
             }
             void DeclarativeXySeries::clear()
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->clear();
             }
             QPointF DeclarativeXySeries::at(int index)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 if (index >= 0 || index < series->count())
                     return series->points().at(index);
                 return QPointF(0, 0);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/plugin.cpp +1 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "qchart.h"
             #include "qaxiscategories.h"
             #include "declarativechart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"
             #include "declarativesplineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include <QVXYModelMapper>
             #include <QHXYModelMapper>
             #include <QHPieModelMapper>
             #include <QVPieModelMapper>
             #include <QHBarModelMapper>
             #include <QVBarModelMapper>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartQmlPlugin : public QDeclarativeExtensionPlugin
             {
                 Q_OBJECT
             public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
-                    qmlRegisterType<DeclarativeXyPoint>(uri, 1, 0, "XyPoint");
+                    qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativeGroupedBarSeries>(uri, 1, 0, "GroupedBarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                       QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
                                                       QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
                                                       QLatin1String("Trying to create uncreatable: QScatterSeries."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
                                                       QLatin1String("Trying to create uncreatable: QPieSeries."));
                     qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "QBarSet",
                                                       QLatin1String("Trying to create uncreatable: QBarSet."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                       QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                       QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                       QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
                                                       QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                       QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAxis>(uri, 1, 0, "Axis",
                                                       QLatin1String("Trying to create uncreatable: Axis."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: XYModelMapper."));
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))

src/barchart/qbarseries.cpp +2 -2

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "qbarseries.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSeries
                 \brief Series for creating a bar chart
                 \mainclass
                 QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
                 the position defined by data. Single bar is defined by QPointF, where x value is the x-coordinate of the bar
                 and y-value is the height of the bar. The category names are ignored with this series and x-axis
                 shows the x-values.
                 See the \l {BarChart Example} {bar chart example} to learn how to create a simple bar chart.
                 \image examples_barchart.png
                 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \qmlclass BarSeries QBarSeries
                 \inherits AbstractSeries
                 The following QML shows how to create a simple bar chart:
                 \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
                 \beginfloatleft
                 \image demos_qmlchart6.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 \property QBarSeries::barWidth
                 The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar.
                 \sa QGroupedBarSeries
             */
             /*!
                 \qmlproperty real BarSeries::barWidth
                 The width of the bars of the series. The unit of width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar.
             */
             /*!
                 \property QBarSeries::count
                 Holds the number of sets in series.
             */
             /*!
                 \qmlproperty int BarSeries::count
                 Holds the number of sets in series.
             */
             /*!
                 \property QBarSeries::labelsVisible
                 Defines the visibility of the labels in series
             */
             /*!
                 \qmlproperty bool BarSeries::labelsVisible
                 Defines the visibility of the labels in series
             */
             /*!
                 \fn void QBarSeries::clicked(QBarSet *barset, int index)
                 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.
                 Clicked bar inside set is indexed by \a index
             */
             /*!
                 \qmlsignal BarSeries::onClicked(BarSet barset, int index)
                 The signal is emitted if the user clicks with a mouse on top of BarSet.
                 Clicked bar inside set is indexed by \a index
             */
             /*!
                 \fn void QBarSeries::hovered(QBarSet* barset, bool status)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 \qmlsignal BarSeries::onHovered(BarSet barset, bool status)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 \fn void QBarSeries::countChanged()
                 This signal is emitted when barset count has been changed, for example by append or remove.
             */
             /*!
                 \qmlsignal BarSeries::onCountChanged()
                 This signal is emitted when barset count has been changed, for example by append or remove.
             */
             /*!
                 \fn void QBarSeries::labelsVisibleChanged()
                 This signal is emitted when labels visibility have changed.
                 \sa isLabelsVisible(), setLabelsVisible()
             */
             /*!
                 \fn void QBarSeries::barsetsAdded(QList<QBarSet*> sets)
                 This signal is emitted when \a sets have been added to the series.
                 \sa append(), insert()
             */
             /*!
                 \qmlsignal BarSeries::onAdded(BarSet barset)
                 Emitted when \a barset has been added to the series.
             */
             /*!
                 \fn void QBarSeries::barsetsRemoved(QList<QBarSet*> sets)
                 This signal is emitted when \a sets have been removed from the series.
                 \sa remove()
             */
             /*!
                 \qmlsignal BarSeries::onRemoved(BarSet barset)
                 Emitted when \a barset has been removed from the series.
             */
             /*!
                 \qmlmethod BarSet BarSeries::at(int index)
                 Returns bar set at \a index. Returns null if the index is not valid.
             */
             /*!
                 \qmlmethod BarSet BarSeries::append(string label, VariantList values)
-                Adds a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XyPoints.
+                Adds a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints.
                 For example:
                 \code
                     myBarSeries.append("set 1", [0, 0.2, 0.2, 0.5, 0.4, 1.5, 0.9]);
                     myBarSeries.append("set 2", [Qt.point(0, 1), Qt.point(2, 2.5), Qt.point(3.5, 2.2)]);
                 \endcode
             */
             /*!
                 \qmlmethod BarSet BarSeries::insert(int index, string label, VariantList values)
-                Inserts a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XyPoints.
+                Inserts a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints.
                 If index is zero or smaller, the new barset is prepended. If the index is count or bigger, the new barset is
                 appended.
                 \sa BarSeries::append()
             */
             /*!
                 \qmlmethod bool BarSeries::remove(BarSet barset)
                 Removes the barset from the series. Returns true if successfull, false otherwise.
             */
             /*!
                 \qmlmethod BarSeries::clear()
                 Removes all barsets from the series.
             */
             /*!
                 Constructs empty QBarSeries.
                 QBarSeries is QObject which is a child of a \a parent.
             */
             QBarSeries::QBarSeries(QObject *parent) :
                 QAbstractSeries(*new QBarSeriesPrivate(this),parent)
             {
             }
             /*!
                 Destructs barseries and owned barsets.
             */
             QBarSeries::~QBarSeries()
             {
                 Q_D(QBarSeries);
                 if(d->m_dataset){
                     d->m_dataset->removeSeries(this);
                 }
             }
             /*!
                 \internal
             */
             QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) :
                 QAbstractSeries(d,parent)
             {
             }
             /*!
                 Returns the type of series. Derived classes override this.
             */
             QAbstractSeries::SeriesType QBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeBar;
             }
             /*!
                 Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with \link QGroupedBarSeries \endlink this value means the width of one group of bars instead of just one bar.
             */
             void QBarSeries::setBarWidth(qreal width)
             {
                 Q_D(QBarSeries);
                 d->setBarWidth(width);
             }
             /*!
                 Returns the width of the bars of the series.
                 \sa setBarWidth()
             */
             qreal QBarSeries::barWidth() const
             {
                 Q_D(const QBarSeries);
                 return d->barWidth();
             }
             /*!
                 Adds a set of bars to series. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
                 Returns true, if appending succeeded.
             */
             bool QBarSeries::append(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 bool success = d->append(set);
                 if (success) {
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
                 Returns true, if set was removed.
             */
             bool QBarSeries::remove(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 bool success = d->remove(set);
                 if (success) {
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsRemoved(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
                 Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series,
                 nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
                 and function returns false.
             */
             bool QBarSeries::append(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                 bool success = d->append(sets);
                 if (success) {
                     emit barsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Insert a set of bars to series at \a index postion. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
                 Returns true, if inserting succeeded.
             */
             bool QBarSeries::insert(int index, QBarSet *set)
             {
                 Q_D(QBarSeries);
                 bool success = d->insert(index, set);
                 if (success) {
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Removes all of the bar sets from the series
             */
             void QBarSeries::clear()
             {
                 Q_D(QBarSeries);
                 QList<QBarSet *> sets = barSets();
                 bool success = d->remove(sets);
                 if (success) {
                     emit barsetsRemoved(sets);
                     emit countChanged();
                 }
             }
             /*!
                 Returns number of sets in series.
             */
             int QBarSeries::count() const
             {
                 Q_D(const QBarSeries);
                 return d->m_barSets.count();
             }
             /*!
                 Returns a list of sets in series. Keeps ownership of sets.
              */
             QList<QBarSet*> QBarSeries::barSets() const
             {
                 Q_D(const QBarSeries);
                 return d->m_barSets;
             }
             /*!
                 Sets the visibility of labels in series to \a visible
             */
             void QBarSeries::setLabelsVisible(bool visible)
             {
                 Q_D(QBarSeries);
                 if (d->m_labelsVisible != visible) {
                     d->setLabelsVisible(visible);
                     emit labelsVisibleChanged();
                 }
             }
             /*!
                 Returns the visibility of labels
             */
             bool QBarSeries::isLabelsVisible() const
             {
                 Q_D(const QBarSeries);
                 return d->m_labelsVisible;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_barWidth(0.5),  // Default value is 50% of category width
                 m_labelsVisible(false),
                 m_visible(true)
             {
             }
             int QBarSeriesPrivate::categoryCount() const
             {
                 // No categories defined. return count of longest set.
                 int count = 0;
                 for (int i=0; i<m_barSets.count(); i++) {
                     if (m_barSets.at(i)->count() > count) {
                         count = m_barSets.at(i)->count();
                     }
                 }
                 return count;
             }
             void QBarSeriesPrivate::setBarWidth(qreal width)
             {
                 if (width < 0.0) {
                     width = 0.0;
                 }
                 m_barWidth = width;
                 emit updatedBars();
             }
             qreal QBarSeriesPrivate::barWidth() const
             {
                 return m_barWidth;
             }
             QBarSet* QBarSeriesPrivate::barsetAt(int index)
             {
                 return m_barSets.at(index);
             }
             void QBarSeriesPrivate::setVisible(bool visible)
             {
                 m_visible = visible;
                 emit updatedBars();
             }
             void QBarSeriesPrivate::setLabelsVisible(bool visible)
             {
                 m_labelsVisible = visible;
                 emit labelsVisibleChanged(visible);
             }
             qreal QBarSeriesPrivate::min()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal min = INT_MAX;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j).y();
                         if (temp < min)
                             min = temp;
                     }
                 }
                 return min;
             }
             qreal QBarSeriesPrivate::max()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal max = INT_MIN;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j).y();
                         if (temp > max)
                             max = temp;
                     }
                 }
                 return max;
             }
             qreal QBarSeriesPrivate::valueAt(int set, int category)
             {
                 if ((set < 0) || (set >= m_barSets.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 return m_barSets.at(set)->at(category).y();
             }
             qreal QBarSeriesPrivate::percentageAt(int set, int category)
             {
                 if ((set < 0) || (set >= m_barSets.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 qreal value = m_barSets.at(set)->at(category).y();
                 qreal sum = categorySum(category);
                 if ( qFuzzyIsNull(sum) ) {
                     return 0;
                 }
                 return value / sum;
             }
             qreal QBarSeriesPrivate::categorySum(int category)
             {
                 qreal sum(0);
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
                         sum += m_barSets.at(set)->at(category).y();
                 }
                 return sum;
             }
             qreal QBarSeriesPrivate::absoluteCategorySum(int category)
             {
                 qreal sum(0);
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
                         sum += qAbs(m_barSets.at(set)->at(category).y());
                 }
                 return sum;
             }
             qreal QBarSeriesPrivate::maxCategorySum()
             {
                 qreal max = INT_MIN;
                 int count = categoryCount();
                 for (int i = 0; i < count; i++) {
                     qreal sum = categorySum(i);
                     if (sum > max)
                         max = sum;
                 }
                 return max;
             }
             qreal QBarSeriesPrivate::minX()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal min = INT_MAX;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j).x();
                         if (temp < min)
                             min = temp;
                     }
                 }
                 return min;
             }
             qreal QBarSeriesPrivate::maxX()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal max = INT_MIN;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j).x();
                         if (temp > max)
                             max = temp;
                     }
                 }
                 return max;
             }
             void QBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal seriesMinX = this->minX();
                 qreal seriesMaxX = this->maxX();
                 qreal y = max();
                 minX = qMin(minX, seriesMinX - 0.5);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, seriesMaxX + 0.5);
                 maxY = qMax(maxY, y);
                 tickXCount = categoryCount()+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QBarSeries);
                 BarChartItem* bar = new BarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(bar);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             QList<LegendMarker*> QBarSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QBarSeries);
                 QList<LegendMarker*> markers;
                 foreach(QBarSet* set, q->barSets()) {
                     BarLegendMarker* marker = new BarLegendMarker(q,set,legend);
                     markers << marker;
                 }
                 return markers;
             }
             bool QBarSeriesPrivate::append(QBarSet *set)
             {
                 Q_Q(QBarSeries);
                 if ((m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 m_barSets.append(set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QBarSeriesPrivate::remove(QBarSet *set)
             {
                 Q_Q(QBarSeries);
                 if (!m_barSets.contains(set)) {
                     // Fail if set is not in list
                     return false;
                 }
                 m_barSets.removeOne(set);
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();        // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QBarSeriesPrivate::append(QList<QBarSet* > sets)
             {
                 Q_Q(QBarSeries);
                 foreach (QBarSet* set, sets) {
                     if ((set == 0) || (m_barSets.contains(set))) {
                         // Fail if any of the sets is null or is already appended.
                         return false;
                     }
                     if (sets.count(set) != 1) {
                         // Also fail if same set is more than once in given list.
                         return false;
                     }
                 }
                 foreach (QBarSet* set, sets) {
                     m_barSets.append(set);
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 emit restructuredBars();        // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QBarSeriesPrivate::remove(QList<QBarSet* > sets)
             {
                 Q_Q(QBarSeries);
                 if (sets.count() == 0) {
                     return false;
                 }
                 foreach (QBarSet* set, sets) {
                     if ((set == 0) || (!m_barSets.contains(set))) {
                         // Fail if any of the sets is null or is not in series
                         return false;
                     }
                     if (sets.count(set) != 1) {
                         // Also fail if same set is more than once in given list.
                         return false;
                     }
                 }
                 foreach (QBarSet* set, sets) {
                     m_barSets.removeOne(set);
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 emit restructuredBars();        // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QBarSeriesPrivate::insert(int index, QBarSet *set)
             {
                 Q_Q(QBarSeries);
                 if ((m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 m_barSets.insert(index, set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             #include "moc_qbarseries.cpp"
             #include "moc_qbarseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxyseries.cpp +2 -2

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QXYSeries
                 \brief The QXYSeries class is a base class for line, spline and scatter series.
             */
             /*!
                 \qmlclass XYSeries
                 \inherits AbstractSeries
                 The XYSeries class is a base class for line, spline and scatter series.
                 The class cannot be instantiated directly.
             */
             /*!
                 \property QXYSeries::pointsVisible
                 Controls if the data points are visible and should be drawn.
             */
             /*!
                 \qmlproperty bool XYSeries::pointsVisible
                 Controls if the data points are visible and should be drawn.
             */
             /*!
                \fn QPen QXYSeries::pen() const
                \brief  Returns pen used to draw points for series.
                 \sa setPen()
             */
             /*!
                \fn QBrush QXYSeries::brush() const
                \brief  Returns brush used to draw points for series.
                 \sa setBrush()
             */
             /*!
                 \property QXYSeries::color
                 The color of the series. This is line (pen) color in case of QLineSeries or QSplineSeries and
                 fill (brush) color in case of QScatterSeries or QAreaSeries.
                 \sa QXYSeries::pen(), QXYSeries::brush()
             */
             /*!
                 \qmlproperty color XYSeries::color
                 The color of the series. This is line (pen) color in case of LineSeries or SplineSeries and
                 fill (brush) color in case of ScatterSeries or AreaSeries.
             */
             /*!
                 \fn void QXYSeries::clicked(const QPointF& point)
                 \brief Signal is emitted when user clicks the \a point on chart.
             */
             /*!
                 \qmlsignal XYSeries::onClicked(QPointF point)
                 Signal is emitted when user clicks the \a point on chart. For example:
                 \code
                 LineSeries {
-                    XyPoint { x: 0; y: 0 }
+                    XYPoint { x: 0; y: 0 }
-                    XyPoint { x: 1.1; y: 2.1 }
+                    XYPoint { x: 1.1; y: 2.1 }
                     onClicked: console.log("onClicked: " + point.x + ", " + point.y);
                 }
                 \endcode
             */
             /*!
                 \fn void QXYSeries::pointReplaced(int index)
                 Signal is emitted when a point has been replaced at \a index.
                 \sa replace()
             */
             /*!
                 \qmlsignal XYSeries::onPointReplaced(int index)
                 Signal is emitted when a point has been replaced at \a index.
             */
             /*!
                 \fn void QXYSeries::pointAdded(int index)
                 Signal is emitted when a point has been added at \a index.
                 \sa append(), insert()
             */
             /*!
                 \qmlsignal XYSeries::onPointAdded(int index)
                 Signal is emitted when a point has been added at \a index.
             */
             /*!
                 \fn void QXYSeries::pointRemoved(int index)
                 Signal is emitted when a point has been removed from \a index.
                 \sa remove()
             */
             /*!
                 \qmlsignal XYSeries::onPointRemoved(int index)
                 Signal is emitted when a point has been removed from \a index.
             */
             /*!
                 \fn void QXYSeries::colorChanged(QColor color)
                 \brief Signal is emitted when the line (pen) color has changed to \a color.
             */
             /*!
                 \qmlsignal XYSeries::onColorChanged(color color)
                 Signal is emitted when the line (pen) color has changed to \a color.
             */
             /*!
                 \fn void QXYSeriesPrivate::updated()
                 \brief \internal
             */
             /*!
                 \qmlmethod XYSeries::append(real x, real y)
                 Append point (\a x, \a y) to the series
             */
             /*!
                 \qmlmethod XYSeries::replace(real oldX, real oldY, real newX, real newY)
                 Replaces point (\a oldX, \a oldY) with point (\a newX, \a newY). Does nothing, if point (oldX, oldY) does not
                 exist.
             */
             /*!
                 \qmlmethod XYSeries::remove(real x, real y)
                 Removes point (\a x, \a y) from the series. Does nothing, if point (x, y) does not exist.
             */
             /*!
                 \qmlmethod XYSeries::insert(int index, real x, real y)
                 Inserts point (\a x, \a y) to the \a index. If index is 0 or smaller than 0 the point is prepended to the list of
                 points. If index is the same as or bigger than count, the point is appended to the list of points.
             */
             /*!
                 \qmlmethod QPointF XYSeries::at(int index)
                 Returns point at \a index. Returns (0, 0) if the index is not valid.
             */
             /*!
                 \internal
                 Constructs empty series object which is a child of \a parent.
                 When series object is added to QChartView or QChart instance ownerships is transferred.
             */
             QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent) : QAbstractSeries(d, parent)
             {
             }
             /*!
                 Destroys the object. Series added to QChartView or QChart instances are owned by those,
                 and are deleted when mentioned object are destroyed.
             */
             QXYSeries::~QXYSeries()
             {
             }
             /*!
                 Adds data point \a x \a y to the series. Points are connected with lines on the chart.
              */
             void QXYSeries::append(qreal x,qreal y)
             {
                 append(QPointF(x,y));
             }
             /*!
                This is an overloaded function.
                Adds data \a point to the series. Points are connected with lines on the chart.
              */
             void QXYSeries::append(const QPointF &point)
             {
                 Q_D(QXYSeries);
                 d->m_points<<point;
             //    emit d->pointAdded(d->m_points.count()-1);
                 emit pointAdded(d->m_points.count()-1);
             }
             /*!
                This is an overloaded function.
                Adds list of data \a points to the series. Points are connected with lines on the chart.
              */
             void QXYSeries::append(const QList<QPointF> &points)
             {
                 foreach(const QPointF& point , points) {
                     append(point);
                 }
             }
             /*!
               Replaces data point \a oldX \a oldY with data point \a newX \a newY.
             */
             void QXYSeries::replace(qreal oldX,qreal oldY,qreal newX,qreal newY)
             {
                 replace(QPointF(oldX,oldY),QPointF(newX,newY));
             }
             /*!
               Replaces \a oldPoint with \a newPoint.
             */
             void QXYSeries::replace(const QPointF &oldPoint,const QPointF &newPoint)
             {
                 Q_D(QXYSeries);
                 int index = d->m_points.indexOf(oldPoint);
                 if(index==-1) return;
                 d->m_points[index] = newPoint;
             //    emit d->pointReplaced(index);
                 emit pointReplaced(index);
             }
             /*!
               Removes current \a x and \a y value.
             */
             void QXYSeries::remove(qreal x,qreal y)
             {
                 remove(QPointF(x,y));
             }
             /*!
               Removes current \a point x value.
               Note: point y value is ignored.
             */
             void QXYSeries::remove(const QPointF &point)
             {
                 Q_D(QXYSeries);
                 int index = d->m_points.indexOf(point);
                 if(index==-1) return;
                 d->m_points.remove(index);
             //    emit d->pointRemoved(index);
                 emit pointRemoved(index);
             }
             /*!
                Inserts a \a point in the series at \a index position.
             */
             void QXYSeries::insert(int index, const QPointF &point)
             {
                 Q_D(QXYSeries);
                 d->m_points.insert(index, point);
             //    emit d->pointAdded(index);
                 emit pointAdded(index);
             }
             /*!
                 Removes all points from the series.
             */
             void QXYSeries::clear()
             {
                 Q_D(QXYSeries);
                 for (int i = d->m_points.size() - 1; i >= 0; i--)
                     remove(d->m_points.at(i));
             }
             /*!
                 \internal \a pos
             */
             QList<QPointF> QXYSeries::points() const
             {
                 Q_D(const QXYSeries);
                 return d->m_points.toList();
             }
             /*!
                 Returns number of data points within series.
             */
             int QXYSeries::count() const
             {
                 Q_D(const QXYSeries);
                 return d->m_points.count();
             }
             /*!
                 Sets \a pen used for drawing points on the chart. If the pen is not defined, the
                 pen from chart theme is used.
                 \sa QChart::setTheme()
             */
             void QXYSeries::setPen(const QPen &pen)
             {
                 Q_D(QXYSeries);
                 if (d->m_pen!=pen) {
                     d->m_pen = pen;
                     emit d->updated();
                 }
             }
             QPen QXYSeries::pen() const
             {
                 Q_D(const QXYSeries);
                 return d->m_pen;
             }
             /*!
                 Sets \a brush used for drawing points on the chart. If the brush is not defined, brush
                 from chart theme setting is used.
                 \sa QChart::setTheme()
             */
             void QXYSeries::setBrush(const QBrush &brush)
             {
                 Q_D(QXYSeries);
                 if (d->m_brush!=brush) {
                     d->m_brush = brush;
                     emit d->updated();
                 }
             }
             QBrush QXYSeries::brush() const
             {
                 Q_D(const QXYSeries);
                 return d->m_brush;
             }
             void QXYSeries::setColor(const QColor &color)
             {
                 QPen p = pen();
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
                     emit colorChanged(color);
                 }
             }
             QColor QXYSeries::color() const
             {
                 return pen().color();
             }
             void QXYSeries::setPointsVisible(bool visible)
             {
                 Q_D(QXYSeries);
                 if (d->m_pointsVisible != visible){
                     d->m_pointsVisible = visible;
                     emit d->updated();
                 }
             }
             bool QXYSeries::pointsVisible() const
             {
                 Q_D(const QXYSeries);
                 return d->m_pointsVisible;
             }
             /*!
                 Stream operator for adding a data \a point to the series.
                 \sa append()
             */
             QXYSeries& QXYSeries::operator<< (const QPointF &point)
             {
                 append(point);
                 return *this;
             }
             /*!
                 Stream operator for adding a list of \a points to the series.
                 \sa append()
             */
             QXYSeries& QXYSeries::operator<< (const QList<QPointF>& points)
             {
                 append(points);
                 return *this;
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_pointsVisible(false)
             {
             }
             void QXYSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 Q_Q(QXYSeries);
                 const QList<QPointF>& points = q->points();
                 if(points.isEmpty()){
                     minX=0.0;
                     minY=0.0;
                     maxX=1.0;
                     maxY=1.0;
                 }
                 for (int i = 0; i < points.count(); i++)
                 {
                     qreal x = points[i].x();
                     qreal y = points[i].y();
                     minX = qMin(minX, x);
                     minY = qMin(minY, y);
                     maxX = qMax(maxX, x);
                     maxY = qMax(maxY, y);
                 }
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             QList<LegendMarker*> QXYSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QXYSeries);
                 QList<LegendMarker*> list;
                 return list << new XYLegendMarker(q,legend);
             }
             #include "moc_qxyseries.cpp"
             #include "moc_qxyseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
             **
             ** 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
                 axisXLabels: ["0", "2000", "1", "2001", "2", "2002", "3", "2003", "4", "2004", "5", "2005",
                     "6", "2006", "7", "2007", "8", "2008", "9", "2009", "10", "2010", "11", "2011"]
                 property variant series: areaSeries
                 AreaSeries {
                     id: areaSeries
                     name: "area 1"
                     upperSeries: LineSeries {
-                        XyPoint { x: 0; y: 1 }
+                        XYPoint { x: 0; y: 1 }
-                        XyPoint { x: 1; y: 1 }
+                        XYPoint { x: 1; y: 1 }
-                        XyPoint { x: 2; y: 3 }
+                        XYPoint { x: 2; y: 3 }
-                        XyPoint { x: 3; y: 3 }
+                        XYPoint { x: 3; y: 3 }
-                        XyPoint { x: 4; y: 2 }
+                        XYPoint { x: 4; y: 2 }
-                        XyPoint { x: 5; y: 0 }
+                        XYPoint { x: 5; y: 0 }
-                        XyPoint { x: 6; y: 2 }
+                        XYPoint { x: 6; y: 2 }
-                        XyPoint { x: 7; y: 1 }
+                        XYPoint { x: 7; y: 1 }
-                        XyPoint { x: 8; y: 2 }
+                        XYPoint { x: 8; y: 2 }
-                        XyPoint { x: 9; y: 1 }
+                        XYPoint { x: 9; y: 1 }
-                        XyPoint { x: 10; y: 3 }
+                        XYPoint { x: 10; y: 3 }
-                        XyPoint { x: 11; y: 3 }
+                        XYPoint { x: 11; y: 3 }
                     }
                     lowerSeries: LineSeries {
-                        XyPoint { x: 0; y: 0 }
+                        XYPoint { x: 0; y: 0 }
-                        XyPoint { x: 1; y: 0 }
+                        XYPoint { x: 1; y: 0 }
-                        XyPoint { x: 2; y: 0 }
+                        XYPoint { x: 2; y: 0 }
-                        XyPoint { x: 3; y: 0 }
+                        XYPoint { x: 3; y: 0 }
-                        XyPoint { x: 4; y: 0 }
+                        XYPoint { x: 4; y: 0 }
-                        XyPoint { x: 5; y: 0 }
+                        XYPoint { x: 5; y: 0 }
-                        XyPoint { x: 6; y: 0 }
+                        XYPoint { x: 6; y: 0 }
-                        XyPoint { x: 7; y: 0 }
+                        XYPoint { x: 7; y: 0 }
-                        XyPoint { x: 8; y: 0 }
+                        XYPoint { x: 8; y: 0 }
-                        XyPoint { x: 9; y: 0 }
+                        XYPoint { x: 9; y: 0 }
-                        XyPoint { x: 10; y: 0 }
+                        XYPoint { x: 10; y: 0 }
-                        XyPoint { x: 11; 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);
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +7 -7

             /****************************************************************************
             **
             ** 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: 0; y: 0 }
-                    XyPoint { x: 1.1; y: 2.1 }
+                    XYPoint { x: 1.1; y: 2.1 }
-                    XyPoint { x: 1.9; y: 3.3 }
+                    XYPoint { x: 1.9; y: 3.3 }
-                    XyPoint { x: 2.1; y: 2.1 }
+                    XYPoint { x: 2.1; y: 2.1 }
-                    XyPoint { x: 2.9; y: 4.9 }
+                    XYPoint { x: 2.9; y: 4.9 }
-                    XyPoint { x: 3.4; y: 3.0 }
+                    XYPoint { x: 3.4; y: 3.0 }
-                    XyPoint { x: 4.1; y: 3.3 }
+                    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);
                 legend.onLabelBrushChanged:        console.log("legend.onLabelBrushChanged: " + brush);
                 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);
                 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 }
                     }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +13 -13

             /****************************************************************************
             **
             ** 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: 0; y: 0 }
-                    XyPoint { x: 1.1; y: 2.1 }
+                    XYPoint { x: 1.1; y: 2.1 }
-                    XyPoint { x: 1.9; y: 3.3 }
+                    XYPoint { x: 1.9; y: 3.3 }
-                    XyPoint { x: 2.1; y: 2.1 }
+                    XYPoint { x: 2.1; y: 2.1 }
-                    XyPoint { x: 2.9; y: 4.9 }
+                    XYPoint { x: 2.9; y: 4.9 }
-                    XyPoint { x: 3.4; y: 3.0 }
+                    XYPoint { x: 3.4; y: 3.0 }
-                    XyPoint { x: 4.1; y: 3.3 }
+                    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.1; y: 1.1 }
-                    XyPoint { x: 1.9; y: 2.3 }
+                    XYPoint { x: 1.9; y: 2.3 }
-                    XyPoint { x: 2.1; y: 1.1 }
+                    XYPoint { x: 2.1; y: 1.1 }
-                    XyPoint { x: 2.9; y: 3.9 }
+                    XYPoint { x: 2.9; y: 3.9 }
-                    XyPoint { x: 3.4; y: 2.0 }
+                    XYPoint { x: 3.4; y: 2.0 }
-                    XyPoint { x: 4.1; y: 2.3 }
+                    XYPoint { x: 4.1; y: 2.3 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +13 -13

             /****************************************************************************
             **
             ** 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"
                 axisX.max: 4
                 axisY.max: 4
                 property variant series: scatterSeries
                 ScatterSeries {
                     id: scatterSeries
                     name: "scatter 1"
-                    XyPoint { x: 1.5; y: 1.5 }
+                    XYPoint { x: 1.5; y: 1.5 }
-                    XyPoint { x: 1.5; y: 1.6 }
+                    XYPoint { x: 1.5; y: 1.6 }
-                    XyPoint { x: 1.57; y: 1.55 }
+                    XYPoint { x: 1.57; y: 1.55 }
-                    XyPoint { x: 1.8; y: 1.8 }
+                    XYPoint { x: 1.8; y: 1.8 }
-                    XyPoint { x: 1.9; y: 1.6 }
+                    XYPoint { x: 1.9; y: 1.6 }
-                    XyPoint { x: 2.1; y: 1.3 }
+                    XYPoint { x: 2.1; y: 1.3 }
-                    XyPoint { x: 2.5; y: 2.1 }
+                    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.0 }
-                    XyPoint { x: 2.0; y: 2.1 }
+                    XYPoint { x: 2.0; y: 2.1 }
-                    XyPoint { x: 2.07; y: 2.05 }
+                    XYPoint { x: 2.07; y: 2.05 }
-                    XyPoint { x: 2.2; y: 2.9 }
+                    XYPoint { x: 2.2; y: 2.9 }
-                    XyPoint { x: 2.4; y: 2.7 }
+                    XYPoint { x: 2.4; y: 2.7 }
-                    XyPoint { x: 2.67; y: 2.65 }
+                    XYPoint { x: 2.67; y: 2.65 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +13 -13

             /****************************************************************************
             **
             ** 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: 0; y: 0 }
-                    XyPoint { x: 1.1; y: 2.1 }
+                    XYPoint { x: 1.1; y: 2.1 }
-                    XyPoint { x: 1.9; y: 3.3 }
+                    XYPoint { x: 1.9; y: 3.3 }
-                    XyPoint { x: 2.1; y: 2.1 }
+                    XYPoint { x: 2.1; y: 2.1 }
-                    XyPoint { x: 2.9; y: 4.9 }
+                    XYPoint { x: 2.9; y: 4.9 }
-                    XyPoint { x: 3.4; y: 3.0 }
+                    XYPoint { x: 3.4; y: 3.0 }
-                    XyPoint { x: 4.1; y: 3.3 }
+                    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.1; y: 1.1 }
-                    XyPoint { x: 1.9; y: 2.3 }
+                    XYPoint { x: 1.9; y: 2.3 }
-                    XyPoint { x: 2.1; y: 1.1 }
+                    XYPoint { x: 2.1; y: 1.1 }
-                    XyPoint { x: 2.9; y: 3.9 }
+                    XYPoint { x: 2.9; y: 3.9 }
-                    XyPoint { x: 3.4; y: 2.0 }
+                    XYPoint { x: 3.4; y: 2.0 }
-                    XyPoint { x: 4.1; y: 2.3 }
+                    XYPoint { x: 4.1; y: 2.3 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
             }

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