HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1604:6954b167a346

Adds axis to qml...

Michal Klocek -

r1604:6954b167a346

parent child

Context file:

r1604:6954b167a346

Collapse all files

demos/qmlchart/qml/qmlchart/View2.qml +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Line"
                     anchors.fill: parent
                     LineSeries {
                         name: "LineSeries"
                         XYPoint { x: 0; y: 0 }
                         XYPoint { x: 1.1; y: 2.1 }
                         XYPoint { x: 1.9; y: 3.3 }
                         XYPoint { x: 2.1; y: 2.1 }
                         XYPoint { x: 2.9; y: 4.9 }
                         XYPoint { x: 3.4; y: 3.0 }
                         XYPoint { x: 4.1; y: 3.3 }
                     }
+                Component.onCompleted: {
+                    createDefaultAxes();
+                }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/View3.qml +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Spline"
                     anchors.fill: parent
                     SplineSeries {
                         name: "SplineSeries"
                         XYPoint { x: 0; y: 0.3 }
                         XYPoint { x: 1.1; y: 3.2 }
                         XYPoint { x: 1.9; y: 2.4 }
                         XYPoint { x: 2.1; y: 2.1 }
                         XYPoint { x: 2.9; y: 2.6 }
                         XYPoint { x: 3.4; y: 2.3 }
                         XYPoint { x: 4.1; y: 3.1 }
                     }
+                    Component.onCompleted: {
+                    createDefaultAxes();
+                }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/View4.qml +9 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "NHL All-Star Team Players"
                     anchors.fill: parent
                     AreaSeries {
-                        axisX: CategoriesAxis {
+                        //TODO: obsolate
-                            id: categoriesAxis
+                        //axisX: CategoriesAxis {
-                            categories: ["2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007",
+                        //    id: categoriesAxis
-                                "2008", "2009", "2010", "2011" ]
+                        //    categories: ["2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007",
+                        //        "2008", "2009", "2010", "2011" ]
+                        //}
                         name: "Russian"
                         upperSeries: LineSeries {
                             XYPoint { x: 0; y: 1 }
                             XYPoint { x: 1; y: 1 }
                             XYPoint { x: 2; y: 1 }
                             XYPoint { x: 3; y: 1 }
                             XYPoint { x: 4; y: 1 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 1 }
                             XYPoint { x: 7; y: 1 }
                             XYPoint { x: 8; y: 4 }
                             XYPoint { x: 9; y: 3 }
                             XYPoint { x: 10; y: 2 }
                             XYPoint { x: 11; y: 1 }
                         }
                         lowerSeries: LineSeries {
                             XYPoint { x: 0; y: 0 }
                             XYPoint { x: 1; y: 0 }
                             XYPoint { x: 2; y: 0 }
                             XYPoint { x: 3; y: 0 }
                             XYPoint { x: 4; y: 0 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 0 }
                             XYPoint { x: 7; y: 0 }
                             XYPoint { x: 8; y: 0 }
                             XYPoint { x: 9; y: 0 }
                             XYPoint { x: 10; y: 0 }
                             XYPoint { x: 11; y: 0 }
                         }
                     }
                     // ...
                     //![1]
                     AreaSeries {
                         id: swedish
                         name: "Swedish"
                         upperSeries: LineSeries {
                             XYPoint { x: 0; y: 1 }
                             XYPoint { x: 1; y: 1 }
                             XYPoint { x: 2; y: 3 }
                             XYPoint { x: 3; y: 3 }
                             XYPoint { x: 4; y: 2 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 2 }
                             XYPoint { x: 7; y: 1 }
                             XYPoint { x: 8; y: 2 }
                             XYPoint { x: 9; y: 1 }
                             XYPoint { x: 10; y: 3 }
                             XYPoint { x: 11; y: 3 }
                         }
                         lowerSeries: LineSeries {
                             XYPoint { x: 0; y: 0 }
                             XYPoint { x: 1; y: 0 }
                             XYPoint { x: 2; y: 0 }
                             XYPoint { x: 3; y: 0 }
                             XYPoint { x: 4; y: 0 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 0 }
                             XYPoint { x: 7; y: 0 }
                             XYPoint { x: 8; y: 0 }
                             XYPoint { x: 9; y: 0 }
                             XYPoint { x: 10; y: 0 }
                             XYPoint { x: 11; y: 0 }
                         }
                         onClicked: {
                             color = "yellow";
                             borderColor = "blue";
                         }
                     }
                     AreaSeries {
                         name: "Finnish"
                         upperSeries: LineSeries {
                             XYPoint { x: 0; y: 0 }
                             XYPoint { x: 1; y: 0 }
                             XYPoint { x: 2; y: 0 }
                             XYPoint { x: 3; y: 0 }
                             XYPoint { x: 4; y: 0 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 1 }
                             XYPoint { x: 7; y: 0 }
                             XYPoint { x: 8; y: 0 }
                             XYPoint { x: 9; y: 0 }
                             XYPoint { x: 10; y: 0 }
                             XYPoint { x: 11; y: 1 }
                         }
                         lowerSeries: LineSeries {
                             XYPoint { x: 0; y: 0 }
                             XYPoint { x: 1; y: 0 }
                             XYPoint { x: 2; y: 0 }
                             XYPoint { x: 3; y: 0 }
                             XYPoint { x: 4; y: 0 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 0 }
                             XYPoint { x: 7; y: 0 }
                             XYPoint { x: 8; y: 0 }
                             XYPoint { x: 9; y: 0 }
                             XYPoint { x: 10; y: 0 }
                             XYPoint { x: 11; y: 0 }
                         }
                         onClicked: {
                             color = "white";
                             borderColor = "blue";
                         }
                     }
+                    Component.onCompleted: {
+                    createDefaultAxes();
+                }
                 }
             }

demos/qmlchart/qml/qmlchart/View5.qml +5 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             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.6 }
                         XYPoint { x: 1.57; y: 1.55 }
                         XYPoint { x: 1.8; y: 1.8 }
                         XYPoint { x: 1.9; y: 1.6 }
                         XYPoint { x: 2.1; y: 1.3 }
                         XYPoint { x: 2.5; y: 2.1 }
                     }
                     ScatterSeries {
                         name: "Scatter2"
                         // ...
                         //![1]
                         XYPoint { x: 2.0; y: 2.0 }
                         XYPoint { x: 2.0; y: 2.1 }
                         XYPoint { x: 2.07; y: 2.05 }
                         XYPoint { x: 2.2; y: 2.9 }
                         XYPoint { x: 2.4; y: 2.7 }
                         XYPoint { x: 2.67; y: 2.65 }
                 //![2]
                     }
+                    Component.onCompleted: {
+                    createDefaultAxes();
+                    }
                 }
                 //![2]
             }

demos/qmlchart/qml/qmlchart/View6.qml +9 -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$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
+                    CategoriesAxis {
+                        id:myAxis
+                        categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
+                        }
                     BarSeries {
-                        axisX: CategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        id: mySeries
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     }
+                    Component.onCompleted: {
+                        createDefaultAxes();
+                        setAxisX(myAxis,mySeries);
+                    }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/View7.qml +11 -4

             /****************************************************************************
             **
             ** 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: "Grouped Bar series"
+                    title: "Stacked Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
+                    CategoriesAxis {
-                    GroupedBarSeries {
+                        id: myAxis;
-                        axisX: CategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
+                        }
+                    StackedBarSeries {
+                        id: mySeries;
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     }
+                    Component.onCompleted: {
+                        createDefaultAxes();
+                        setAxisX(myAxis,mySeries);
+                    }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/View8.qml +12 -4

             /****************************************************************************
             **
             ** 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: "Stacked Bar series"
+                    title: "Percent Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
+                    CategoriesAxis {
-                    StackedBarSeries {
+                        id: myAxis
-                        axisX: CategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
+                        }
+                    PercentBarSeries {
+                        id: mySeries
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     }
+                    Component.onCompleted: {
+                        createDefaultAxes();
+                         setAxisX(myAxis,mySeries);
+                    }
                 }
                 //![1]
             }

demos/qmlchart/qml/qmlchart/main.qml +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$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 width: parent.width
                 height: parent.height
                 property int viewNumber: 1
                 Loader {
                     id: loader
                     anchors.fill: parent
                     source: "View" + viewNumber + ".qml";
                 }
                 Rectangle {
                     id: infoText
                     anchors.centerIn: parent
                     width: parent.width
                     height: 40
                     color: "black"
                     Text {
                         color: "white"
                         anchors.centerIn: parent
                         text: "Use left and right arrow keys to navigate between chart types"
                     }
                     Behavior on opacity {
                         NumberAnimation { duration: 400 }
                     }
                 }
                 MouseArea {
                     focus: true
                     anchors.fill: parent
                     onClicked: {
                         if (infoText.opacity > 0) {
                             infoText.opacity = 0.0;
                         } else {
                             nextView();
                         }
                     }
                     Keys.onPressed: {
                         if (infoText.opacity > 0) {
                             infoText.opacity = 0.0;
                         } else {
                             if (event.key == Qt.Key_Left) {
                                 previousView();
                             } else {
                                 nextView();
                             }
                         }
                     }
                 }
                 function nextView() {
                     var i = viewNumber + 1;
-                    if (i > 9)
+                    if (i > 8)
                         viewNumber = 1;
                     else
                         viewNumber = i;
                 }
                 function previousView() {
                     var i = viewNumber - 1;
                     if (i <= 0)
-                        viewNumber = 9;
+                        viewNumber = 8;
                     else
                         viewNumber = i;
                 }
             }

demos/qmlchart/resources.qrc 0 -1

             <RCC>
                 <qresource prefix="/">
                     <file>qml/qmlchart/loader.qml</file>
                     <file>qml/qmlchart/main.qml</file>
                     <file>qml/qmlchart/View1.qml</file>
                     <file>qml/qmlchart/View2.qml</file>
                     <file>qml/qmlchart/View3.qml</file>
                     <file>qml/qmlchart/View4.qml</file>
                     <file>qml/qmlchart/View5.qml</file>
                     <file>qml/qmlchart/View6.qml</file>
                     <file>qml/qmlchart/View7.qml</file>
                     <file>qml/qmlchart/View8.qml</file>
-                    <file>qml/qmlchart/View9.qml</file>
                 </qresource>
             </RCC>

plugins/declarative/declarativebarseries.cpp +3 -162

             /****************************************************************************
             **
             ** 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 "declarativebarseries.h"
             #include "declarativechart.h"
             #include <QBarSet>
             #include <QVBarModelMapper>
             #include <QHBarModelMapper>
             #include <QAbstractAxis>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
                 QBarSet("", parent)
             {
                 connect(this, SIGNAL(valuesAdded(int,int)), this, SLOT(handleCountChanged(int, int)));
                 connect(this, SIGNAL(valuesRemoved(int,int)), this, SLOT(handleCountChanged(int, int)));
             }
             void DeclarativeBarSet::handleCountChanged(int index, int count)
             {
                 Q_UNUSED(index)
                 Q_UNUSED(count)
                 emit countChanged(QBarSet::count());
             }
             QVariantList DeclarativeBarSet::values()
             {
                 QVariantList values;
                 for (int i(0); i < count(); i++)
                     values.append(QVariant(QBarSet::at(i)));
                 return values;
             }
             void DeclarativeBarSet::setValues(QVariantList values)
             {
                 while (count())
                     remove(count() - 1);
                 for (int i(0); i < values.count(); i++) {
                     if (values.at(i).canConvert(QVariant::Double))
                         QBarSet::append(values[i].toDouble());
                 }
             }
-            DeclarativeAbstractBarSeries::DeclarativeAbstractBarSeries(QDeclarativeItem *parent) :
-                QAbstractBarSeries(parent)
-                connect(this, SIGNAL(barsetsAdded(QList<QBarSet*>)), this, SLOT(handleAdded(QList<QBarSet*>)));
-                connect(this, SIGNAL(barsetsRemoved(QList<QBarSet*>)), this, SLOT(handleRemoved(QList<QBarSet*>)));
-            void DeclarativeAbstractBarSeries::handleAdded(QList<QBarSet* > barsets)
-                foreach(QBarSet *b, barsets) {
-                    DeclarativeBarSet *barset = qobject_cast<DeclarativeBarSet *>(b);
-                    emit added(barset);
-            void DeclarativeAbstractBarSeries::handleRemoved(QList<QBarSet* > barsets)
-                foreach(QBarSet *b, barsets) {
-                    DeclarativeBarSet *barset = qobject_cast<DeclarativeBarSet *>(b);
-                    emit removed(barset);
-            void DeclarativeAbstractBarSeries::classBegin()
-            void DeclarativeAbstractBarSeries::componentComplete()
-                foreach(QObject *child, children()) {
-                    if (qobject_cast<DeclarativeBarSet *>(child)) {
-                        QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
-                        QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
-                        mapper->setSeries(this);
-                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
-                        QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
-                        mapper->setSeries(this);
-            void DeclarativeAbstractBarSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis, this);
-            QAbstractAxis *DeclarativeAbstractBarSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeAbstractBarSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis, this);
-            QAbstractAxis *DeclarativeAbstractBarSeries::axisY()
-                return chart()->axisY(this);
-            QDeclarativeListProperty<QObject> DeclarativeAbstractBarSeries::seriesChildren()
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
-            void DeclarativeAbstractBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
-                // Empty implementation; the children are parsed in componentComplete instead
-                Q_UNUSED(list);
-                Q_UNUSED(element);
-            DeclarativeBarSet *DeclarativeAbstractBarSeries::at(int index)
-                QList<QBarSet*> setList = barSets();
-                if (index >= 0 && index < setList.count())
-                    return qobject_cast<DeclarativeBarSet *>(setList[index]);
-                return 0;
-            DeclarativeBarSet *DeclarativeAbstractBarSeries::insert(int index, QString label, QVariantList values)
-                int insertIndex = index;
-                if (insertIndex < 0)
-                    insertIndex = 0;
-                else if (insertIndex > count())
-                    insertIndex = count();
-                DeclarativeBarSet *barset = new DeclarativeBarSet(this);
-                barset->setLabel(label);
-                barset->setValues(values);
-                if (QAbstractBarSeries::insert(insertIndex, barset))
-                    return barset;
-                delete barset;
-                return 0;
             DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
                 QBarSeries(parent)
             {
             }
             void DeclarativeBarSeries::classBegin()
             {
             }
             void DeclarativeBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
-            void DeclarativeBarSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis, this);
-            QAbstractAxis *DeclarativeBarSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeBarSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis, this);
-            QAbstractAxis *DeclarativeBarSeries::axisY()
-                return chart()->axisY(this);
             QDeclarativeListProperty<QObject> DeclarativeBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             DeclarativeStackedBarSeries::DeclarativeStackedBarSeries(QDeclarativeItem *parent) :
                 QStackedBarSeries(parent)
             {
             }
             void DeclarativeStackedBarSeries::classBegin()
             {
             }
             void DeclarativeStackedBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
-            void DeclarativeStackedBarSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis, this);
-            QAbstractAxis *DeclarativeStackedBarSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeStackedBarSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis, this);
-            QAbstractAxis *DeclarativeStackedBarSeries::axisY()
-                return chart()->axisY(this);
             QDeclarativeListProperty<QObject> DeclarativeStackedBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeStackedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeStackedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeStackedBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QStackedBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             DeclarativePercentBarSeries::DeclarativePercentBarSeries(QDeclarativeItem *parent) :
                 QPercentBarSeries(parent)
             {
             }
             void DeclarativePercentBarSeries::classBegin()
             {
             }
             void DeclarativePercentBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
-            void DeclarativePercentBarSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis, this);
-            QAbstractAxis *DeclarativePercentBarSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativePercentBarSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis, this);
-            QAbstractAxis *DeclarativePercentBarSeries::axisY()
-                return chart()->axisY(this);
             QDeclarativeListProperty<QObject> DeclarativePercentBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativePercentBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativePercentBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativePercentBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QPercentBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             #include "moc_declarativebarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativebarseries.h +5 -50

             /****************************************************************************
             **
             ** 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 DECLARATIVEBARSERIES_H
             #define DECLARATIVEBARSERIES_H
             #include "qchartglobal.h"
             #include "qabstractbarseries.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qbarset.h"
             #include "qabstractaxis.h"
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativeBarSet : public QBarSet
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
                 Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
                 Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
                 Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
             private Q_SLOTS:
                 void handleCountChanged(int index, int count);
             };
-            class DeclarativeAbstractBarSeries : public QAbstractBarSeries, public QDeclarativeParserStatus
-                Q_OBJECT
-                Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
-                Q_CLASSINFO("DefaultProperty", "seriesChildren")
-            public:
-                explicit DeclarativeAbstractBarSeries(QDeclarativeItem *parent = 0);
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
-                QDeclarativeListProperty<QObject> seriesChildren();
-                Q_INVOKABLE DeclarativeBarSet *at(int index);
-                Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
-                Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
-                Q_INVOKABLE bool remove(QBarSet *barset) { return QAbstractBarSeries::remove(barset); }
-                Q_INVOKABLE void clear() { return QAbstractBarSeries::clear(); }
-            public: // from QDeclarativeParserStatus
-                void classBegin();
-                void componentComplete();
-            Q_SIGNALS:
-                void added(DeclarativeBarSet *barset);
-                void removed(DeclarativeBarSet *barset);
-            public Q_SLOTS:
-                static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
-                void handleAdded(QList<QBarSet* > barsets);
-                void handleRemoved(QList<QBarSet* > barsets);
-            };
             class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
                 void setAxisX(QAbstractAxis *axis);
                 QAbstractAxis *axisX();
                 void setAxisY(QAbstractAxis *axis);
                 QAbstractAxis *axisY();
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
+            private:
+                QAbstractAxis* m_axisX;
+                QAbstractAxis* m_axisY;
             };
             class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeStackedBarSeries(QDeclarativeItem *parent = 0);
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativePercentBarSeries(QDeclarativeItem *parent = 0);
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

plugins/declarative/declarativechart.cpp +16 -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 "declarativechart.h"
             #include <QPainter>
             #include "declarativelineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include "declarativesplineseries.h"
             #include "declarativescatterseries.h"
             #include "qcategoriesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \qmlclass ChartView DeclarativeChart
                 ChartView element is the parent that is responsible for showing different chart series types.
                 The following QML shows how to create a simple chart with one pie series:
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
                 \beginfloatleft
                 \image examples_qmlpiechart.png
                 \endfloat
                 \clearfloat
             */
             /*!
               \qmlproperty Theme ChartView::theme
               Theme defines the visual appearance of the chart, including for example colors, fonts, line
               widths and chart background.
             */
             /*!
               \qmlproperty Animation ChartView::animation
               Animation configuration of the chart. One of ChartView.NoAnimation, ChartView.GridAxisAnimations,
               ChartView.SeriesAnimations or ChartView.AllAnimations.
             */
             /*!
               \qmlproperty Font ChartView::titleFont
               The title font of the chart
               See the \l {Font} {QML Font Element} for detailed documentation.
             */
             /*!
               \qmlproperty string ChartView::title
               The title of the chart, shown on top of the chart.
               \sa ChartView::titleColor
             */
             /*!
               \qmlproperty string ChartView::titleColor
               The color of the title text.
             */
             /*!
               \qmlproperty Axis ChartView::axisX
               The x-axis of the chart.
             */
             /*!
               \qmlproperty Axis ChartView::axisY
               The default y-axis of the chart.
             */
             /*!
               \qmlproperty Legend ChartView::legend
               The legend of the chart. Legend lists all the series, pie slices and bar sets added on the chart.
             */
             /*!
               \qmlproperty int ChartView::count
               The count of series added to the chart.
             */
             /*!
               \qmlproperty color ChartView::backgroundColor
               The color of the chart's background. By default background color is defined by chart theme.
               \sa ChartView::theme
             */
             /*!
               \qmlproperty bool ChartView::dropShadowEnabled
               The chart's border drop shadow. Set to true to enable drop shadow.
             */
             /*!
               \qmlproperty real ChartView::topMargin
               The space between the top of chart view and the top of the plot area. The title (if non-empty) is drawn on top margin
               area of the chart view. Top margin area is also used by legend, if aligned to top.
             */
             /*!
               \qmlproperty real ChartView::bottomMargin
               The space between the bottom of chart view and the bottom of the plot area. The bottom margin area may be used by
               legend (if aligned to bottom), x-axis, x-axis labels and x-axis tick marks.
             */
             /*!
               \qmlproperty real ChartView::leftMargin
               The space between the left side of chart view and the left side of the plot area. The left margin area may be used by
               legend (if aligned to left), y-axis, y-axis labels and y-axis tick marks.
             */
             /*!
               \qmlproperty real ChartView::rightMargin
               The space between the right side of chart view and the right side of the plot area. The right margin area may be used
               by legend (if aligned to right).
             */
             /*!
               \qmlmethod AbstractSeries ChartView::series(int index)
               Returns the series with \a index on the chart. This allows you to loop through the series of a chart together with
               the count property of the chart.
             */
             /*!
               \qmlmethod AbstractSeries ChartView::series(string name)
               Returns the first series on the chart with \a name. If there is no series with that name, returns null.
             */
             /*!
               \qmlmethod AbstractSeries ChartView::createSeries(SeriesType type, string name)
               Creates a series object of \a type to the chart. For example:
               \code
                 var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter series");
                 scatter.markerSize = 22;
                 scatter.append(1.1, 2.0);
               \endcode
             */
             /*!
               \qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
               The y-axis of the series. This is the same as the default y-axis of the chart as multiple y-axes are not yet supported.
             */
             /*!
               \qmlmethod ChartView::zoomY(real factor)
               Zooms in by \a factor on the center of the chart.
             */
             /*!
               \qmlmethod ChartView::scrollLeft(real pixels)
               Scrolls to left by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa Axis::min, Axis::max
             */
             /*!
               \qmlmethod ChartView::scrollRight(real pixels)
               Scrolls to right by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa Axis::min, Axis::max
             */
             /*!
               \qmlmethod ChartView::scrollUp(real pixels)
               Scrolls up by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa Axis::min, Axis::max
             */
             /*!
               \qmlmethod ChartView::scrollDown(real pixels)
               Scrolls down by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa Axis::min, Axis::max
             */
             /*!
               \qmlsignal ChartView::onTopMarginChanged(real margin)
               The top margin of the chart view has changed to \a margin. This may happen for example if you modify font size
               related properties of the legend or chart title.
             */
             /*!
               \qmlsignal ChartView::onBottomMarginChanged(real margin)
               The bottom margin of the chart view has changed to \a margin. This may happen for example if you modify font size
               related properties of the legend or chart title.
             */
             /*!
               \qmlsignal ChartView::onLeftMarginChanged(real margin)
               The left margin of the chart view has changed to \a margin. This may happen for example if you modify font size
               related properties of the legend or chart title.
             */
             /*!
               \qmlsignal ChartView::onRightMarginChanged(real margin)
               The right margin of the chart view has changed to \a margin. This may happen for example if you modify font size
               related properties of the legend or chart title.
             */
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this))
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             //    m_chart->axisX()->setNiceNumbersEnabled(false);
                 m_chartMargins = m_chart->margins();
                 connect(m_chart, SIGNAL(marginsChanged(QRectF)), this, SLOT(handleMarginsChanged(QRectF)));
             }
             void DeclarativeChart::handleMarginsChanged(QRectF newMargins)
             {
                 if (m_chartMargins.top() != newMargins.top())
                     topMarginChanged(m_chart->margins().top());
                 if (m_chartMargins.bottom() != newMargins.bottom())
                     bottomMarginChanged(m_chart->margins().bottom());
                 if (m_chartMargins.left() != newMargins.left())
                     leftMarginChanged(m_chart->margins().left());
                 if (m_chartMargins.right() != newMargins.right())
                     rightMarginChanged(m_chart->margins().right());
                 m_chartMargins = m_chart->margins();
             }
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
             }
             void DeclarativeChart::childEvent(QChildEvent *event)
             {
                 if (event->type() == QEvent::ChildAdded) {
                     if (qobject_cast<QAbstractSeries *>(event->child())) {
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(event->child()));
                     }
                 }
             }
             void DeclarativeChart::componentComplete()
             {
-                bool createAxis = true;
                 foreach(QObject *child, children()) {
                     if (qobject_cast<QAbstractSeries *>(child)) {
             //            qDebug() << "DeclarativeChart::componentComplete(), add: " << child;
                         // TODO: how about optional y-axis?
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));
                     }else if(qobject_cast<QAbstractAxis *>(child)){
-                       createAxis = false;
                     }
                 }
-                if(createAxis) m_chart->createDefaultAxes();
                 QDeclarativeItem::componentComplete();
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
             //    qDebug() << "DeclarativeChart::geometryChanged" << newGeometry.width() << newGeometry.height();
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         m_chart->resize(newGeometry.width(), newGeometry.height());
                     }
                 }
                 QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
             }
             void DeclarativeChart::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 // TODO: optimized?
                 painter->setRenderHint(QPainter::Antialiasing, true);
             }
             void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
             {
                 QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;
                 if (chartTheme != m_chart->theme())
                     m_chart->setTheme(chartTheme);
             }
             DeclarativeChart::Theme DeclarativeChart::theme()
             {
                 return (DeclarativeChart::Theme) m_chart->theme();
             }
             void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)
             {
                 QChart::AnimationOption animationOptions = (QChart::AnimationOption) animations;
                 if (animationOptions != m_chart->animationOptions())
                     m_chart->setAnimationOptions(animationOptions);
             }
             DeclarativeChart::Animation DeclarativeChart::animationOptions()
             {
                 if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
                     return DeclarativeChart::AllAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
                     return DeclarativeChart::GridAxisAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
                     return DeclarativeChart::SeriesAnimations;
                 else
                     return DeclarativeChart::NoAnimation;
             }
             void DeclarativeChart::setTitle(QString title)
             {
                 if (title != m_chart->title())
                     m_chart->setTitle(title);
             }
             QString DeclarativeChart::title()
             {
                 return m_chart->title();
             }
             QAbstractAxis *DeclarativeChart::axisX(QAbstractSeries *series)
             {
                 return m_chart->axisX(series);
             }
             QAbstractAxis *DeclarativeChart::axisY(QAbstractSeries *series)
             {
                 return m_chart->axisY(series);
             }
             QLegend *DeclarativeChart::legend()
             {
                 return m_chart->legend();
             }
             void DeclarativeChart::setTitleColor(QColor color)
             {
                 QBrush b = m_chart->titleBrush();
                 if (color != b.color()) {
                     b.setColor(color);
                     m_chart->setTitleBrush(b);
                     emit titleColorChanged(color);
                 }
             }
             QFont DeclarativeChart::titleFont() const
             {
                 return m_chart->titleFont();
             }
             void DeclarativeChart::setTitleFont(const QFont& font)
             {
                 m_chart->setTitleFont(font);
             }
             QColor DeclarativeChart::titleColor()
             {
                 return m_chart->titleBrush().color();
             }
             void DeclarativeChart::setBackgroundColor(QColor color)
             {
                 QBrush b = m_chart->backgroundBrush();
                 if (b.style() != Qt::SolidPattern || color != b.color()) {
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                     m_chart->setBackgroundBrush(b);
                     emit backgroundColorChanged();
                 }
             }
             QColor DeclarativeChart::backgroundColor()
             {
                 return m_chart->backgroundBrush().color();
             }
             int DeclarativeChart::count()
             {
                 return m_chart->series().count();
             }
             void DeclarativeChart::setDropShadowEnabled(bool enabled)
             {
                 if (enabled != m_chart->isDropShadowEnabled()) {
                     m_chart->setDropShadowEnabled(enabled);
                     dropShadowEnabledChanged(enabled);
                 }
             }
             bool DeclarativeChart::dropShadowEnabled()
             {
                 return m_chart->isDropShadowEnabled();
             }
             qreal DeclarativeChart::topMargin()
             {
                 return m_chart->margins().top();
             }
             qreal DeclarativeChart::bottomMargin()
             {
                 return m_chart->margins().bottom();
             }
             qreal DeclarativeChart::leftMargin()
             {
                 return m_chart->margins().left();
             }
             qreal DeclarativeChart::rightMargin()
             {
                 return m_chart->margins().right();
             }
             void DeclarativeChart::zoom(qreal factor)
             {
                 m_chart->zoom(factor);
             }
             void DeclarativeChart::scrollLeft(qreal pixels)
             {
                 m_chart->scroll(pixels, 0);
             }
             void DeclarativeChart::scrollRight(qreal pixels)
             {
                 m_chart->scroll(-pixels, 0);
             }
             void DeclarativeChart::scrollUp(qreal pixels)
             {
                 m_chart->scroll(0, pixels);
             }
             void DeclarativeChart::scrollDown(qreal pixels)
             {
                 m_chart->scroll(0, -pixels);
             }
             QAbstractSeries *DeclarativeChart::series(int index)
             {
                 if (index < m_chart->series().count()) {
                     return m_chart->series().at(index);
                 }
                 return 0;
             }
             QAbstractSeries *DeclarativeChart::series(QString seriesName)
             {
                 foreach(QAbstractSeries *series, m_chart->series()) {
                     if (series->name() == seriesName)
                         return series;
                 }
                 return 0;
             }
             QAbstractSeries *DeclarativeChart::createSeries(DeclarativeChart::SeriesType type, QString name)
             {
                 QAbstractSeries *series = 0;
                 switch (type) {
                 case DeclarativeChart::SeriesTypeLine:
                     series = new DeclarativeLineSeries();
                     break;
                 case DeclarativeChart::SeriesTypeArea:
                     series = new DeclarativeAreaSeries();
                     break;
                 case DeclarativeChart::SeriesTypeStackedBar:
                     // TODO
                     break;
                 case DeclarativeChart::SeriesTypePercentBar:
                     // TODO
                     break;
                 case DeclarativeChart::SeriesTypeBar:
                     series = new DeclarativeBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypePie:
                     series = new DeclarativePieSeries();
                     break;
                 case DeclarativeChart::SeriesTypeScatter:
                     series = new DeclarativeScatterSeries();
                     break;
                 case DeclarativeChart::SeriesTypeSpline:
                     series = new DeclarativeSplineSeries();
                     break;
                 default:
                     qWarning() << "Illegal series type";
                 }
                 series->setName(name);
                 m_chart->addSeries(series);
                 return series;
             }
+            void DeclarativeChart::setAxisX(QAbstractAxis* axis, QAbstractSeries *series)
+            {
+                m_chart->setAxisX(axis,series);
+            }
+            void DeclarativeChart::setAxisY(QAbstractAxis* axis, QAbstractSeries *series)
+            {
+                m_chart->setAxisY(axis,series);
+            }
+            void DeclarativeChart::createDefaultAxes()
+            {
+                m_chart->createDefaultAxes();
+            }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativechart.h +7 -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 DECLARATIVECHART_H
             #define DECLARATIVECHART_H
             #include <QtCore/QtGlobal>
             #include <QDeclarativeItem>
             #include <qchart.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: Derive from QChart for easier definition of properties?
             class DeclarativeChart : public QDeclarativeItem
             // TODO: for QTQUICK2: extend QQuickPainterItem instead
             //class DeclarativeChart : public QQuickPaintedItem, public Chart
             {
                 Q_OBJECT
                 Q_PROPERTY(Theme theme READ theme WRITE setTheme)
                 Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
                 Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY)
                 Q_PROPERTY(QLegend *legend READ legend)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
                 Q_PROPERTY(qreal topMargin READ topMargin NOTIFY topMarginChanged)
                 Q_PROPERTY(qreal bottomMargin READ bottomMargin NOTIFY bottomMarginChanged)
                 Q_PROPERTY(qreal leftMargin READ leftMargin NOTIFY leftMarginChanged)
                 Q_PROPERTY(qreal rightMargin READ rightMargin NOTIFY rightMarginChanged)
                 Q_ENUMS(Animation)
                 Q_ENUMS(Theme)
                 Q_ENUMS(SeriesType)
             public:
                 // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
                 enum Theme {
                     ChartThemeLight = 0,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
                     ChartThemeHighContrast,
                     ChartThemeBlueIcy
                 };
                 enum Animation {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                 };
                 enum SeriesType {
                     SeriesTypeLine,
                     SeriesTypeArea,
                     SeriesTypeBar,
                     SeriesTypeStackedBar,
                     SeriesTypePercentBar,
                     SeriesTypePie,
                     SeriesTypeScatter,
                     SeriesTypeSpline
                 };
             public:
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();
             public: // From QDeclarativeItem/QGraphicsItem
                 void childEvent(QChildEvent *event);
                 void componentComplete();
                 void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
                 void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
             public:
                 void setTheme(DeclarativeChart::Theme theme);
                 DeclarativeChart::Theme theme();
                 void setAnimationOptions(DeclarativeChart::Animation animations);
                 DeclarativeChart::Animation animationOptions();
                 void setTitle(QString title);
                 QString title();
                 QLegend *legend();
                 QFont titleFont() const;
                 void setTitleFont(const QFont& font);
                 void setTitleColor(QColor color);
                 QColor titleColor();
                 void setBackgroundColor(QColor color);
                 QColor backgroundColor();
                 int count();
                 void setDropShadowEnabled(bool enabled);
                 bool dropShadowEnabled();
                 qreal topMargin();
                 qreal bottomMargin();
                 qreal leftMargin();
                 qreal rightMargin();
+                QAbstractAxis *axisX(QAbstractSeries *series = 0);
+                QAbstractAxis *axisY(QAbstractSeries *series = 0);
             public:
                 Q_INVOKABLE QAbstractSeries *series(int index);
                 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
-                Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
+                Q_INVOKABLE void setAxisX(QAbstractAxis* axis, QAbstractSeries *series = 0);
-                Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
+                Q_INVOKABLE void setAxisY(QAbstractAxis* axis, QAbstractSeries *series = 0);
+                Q_INVOKABLE void createDefaultAxes();
                 Q_INVOKABLE void zoom(qreal factor);
                 Q_INVOKABLE void scrollLeft(qreal pixels);
                 Q_INVOKABLE void scrollRight(qreal pixels);
                 Q_INVOKABLE void scrollUp(qreal pixels);
                 Q_INVOKABLE void scrollDown(qreal pixels);
             Q_SIGNALS:
                 void axisLabelsChanged();
                 void titleColorChanged(QColor color);
                 void backgroundColorChanged();
                 void dropShadowEnabledChanged(bool enabled);
                 void topMarginChanged(qreal margin);
                 void bottomMarginChanged(qreal margin);
                 void leftMarginChanged(qreal margin);
                 void rightMarginChanged(qreal margin);
             public Q_SLOTS:
                 void handleMarginsChanged(QRectF newMargins);
             private:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;
                 QRectF m_chartMargins;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

plugins/declarative/plugin.cpp +2 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "qchart.h"
             #include "qabstractaxis.h"
             #include "qvaluesaxis.h"
             #include "qcategoriesaxis.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<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<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");
                     qmlRegisterType<QValuesAxis>(uri, 1, 0, "ValuesAxis");
                     qmlRegisterType<QCategoriesAxis>(uri, 1, 0, "CategoriesAxis");
                     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<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
+                                                         QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
                                                       QLatin1String("Trying to create uncreatable: AbstractAxis."));
                     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))

demos/qmlchart/qml/qmlchart/View9.qml removed 0 -41

NO CONTENT: file was removed

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