HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1117:4e706181034e

Simplified declarative implementation

Tero Ahola -

r1117:4e706181034e

parent child

Context file:

r1117:4e706181034e

Collapse all files

demos/qmlchart/qml/qmlchart/View1.qml +3 -8

             /****************************************************************************
             **
             ** 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
                 Chart {
                     title: "Car brand shares in Finland"
                     anchors.fill: parent
                     theme: Chart.ChartThemeLight
                     legend: Chart.LegendBottom
                     PieSeries {
-                        horizontalPosition: 0.2
+                        horizontalPosition: 0.5
-                        verticalPosition: 0.3
+                        verticalPosition: 0.5
-                        size: 0.4
+                        size: 0.7
                         slices: [
                             PieSlice { label: "Volkswagen"; value: 13.5 },
                             PieSlice { label: "Toyota"; value: 10.9 },
                             PieSlice { label: "Ford"; value: 8.6 },
                             PieSlice { label: "Skoda"; value: 8.2 },
                             PieSlice { label: "Volvo"; value: 6.8 },
                             PieSlice { label: "Others"; value: 52.0 }
                         ]
                     }
-                    BarSeries {
-                        barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
-                        // data implementation missing
                 }
             }

demos/qmlchart/qml/qmlchart/View3.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
             Rectangle {
                 anchors.fill: parent
                 Chart {
                     title: "NHL All-Star Team Players"
                     anchors.fill: parent
                     theme: Chart.ChartThemeHighContrast
                     legend: Chart.LegendTop
                     AreaSeries {
-                        name: "Finnish"
+                        name: "Swedish"
                         points: [
-                            XyPoint { x: 0; y: 0 },
+                            XyPoint { x: 0; y: 1 },
-                            XyPoint { x: 1; y: 0 },
+                            XyPoint { x: 1; y: 1 },
-                            XyPoint { x: 2; y: 0 },
+                            XyPoint { x: 2; y: 3 },
-                            XyPoint { x: 3; y: 0 },
+                            XyPoint { x: 3; y: 3 },
-                            XyPoint { x: 4; y: 0 },
+                            XyPoint { x: 4; y: 2 },
                             XyPoint { x: 5; y: 0 },
-                            XyPoint { x: 6; y: 1 },
+                            XyPoint { x: 6; y: 2 },
-                            XyPoint { x: 7; y: 0 },
+                            XyPoint { x: 7; y: 1 },
-                            XyPoint { x: 8; y: 0 },
+                            XyPoint { x: 8; y: 2 },
-                            XyPoint { x: 9; y: 0 },
+                            XyPoint { x: 9; y: 1 },
-                            XyPoint { x: 10; y: 0 },
+                            XyPoint { x: 10; y: 3 },
-                            XyPoint { x: 11; y: 1 }
+                            XyPoint { x: 11; y: 3 }
                         ]
                         lowerPoints: [
                             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 }
                         ]
                     }
                     AreaSeries {
                         name: "Russian"
                         points: [
                             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 }
                         ]
                         lowerPoints: [
                             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 }
                         ]
                     }
                     AreaSeries {
-                        name: "Swedish"
+                        name: "Finnish"
                         points: [
-                            XyPoint { x: 0; y: 1 },
+                            XyPoint { x: 0; y: 0 },
-                            XyPoint { x: 1; y: 1 },
+                            XyPoint { x: 1; y: 0 },
-                            XyPoint { x: 2; y: 3 },
+                            XyPoint { x: 2; y: 0 },
-                            XyPoint { x: 3; y: 3 },
+                            XyPoint { x: 3; y: 0 },
-                            XyPoint { x: 4; y: 2 },
+                            XyPoint { x: 4; y: 0 },
                             XyPoint { x: 5; y: 0 },
-                            XyPoint { x: 6; y: 2 },
+                            XyPoint { x: 6; y: 1 },
-                            XyPoint { x: 7; y: 1 },
+                            XyPoint { x: 7; y: 0 },
-                            XyPoint { x: 8; y: 2 },
+                            XyPoint { x: 8; y: 0 },
-                            XyPoint { x: 9; y: 1 },
+                            XyPoint { x: 9; y: 0 },
-                            XyPoint { x: 10; y: 3 },
+                            XyPoint { x: 10; y: 0 },
-                            XyPoint { x: 11; y: 3 }
+                            XyPoint { x: 11; y: 1 }
                         ]
                         lowerPoints: [
                             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 }
                         ]
                     }
                 }
             }

demos/qmlchart/qml/qmlchart/main.qml +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$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 width: parent.width
                 height: parent.height
                 property int __viewNumber: 0
                 Timer {
                     id: timer
                     running: true
                     repeat: true
                     interval: 5000
                     triggeredOnStart: false
                     onTriggered: {
                         __viewNumber++;
                     }
                 }
                 Loader {
                     id: loader
                     anchors.fill: parent
-                    source: "View" + (__viewNumber % 4 + 1) + ".qml";
+                    source: "View" + (__viewNumber % 5 + 1) + ".qml";
                 }
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
                         timer.restart();
                         __viewNumber++;
                     }
                 }
             }

demos/qmlchart/resources.qrc +1 0

             <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>
                 </qresource>
             </RCC>

qmlplugin/declarativeareaseries.cpp 0 -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 "declarativeareaseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qlineseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
                 QAreaSeries(new QLineSeries(parent), new QLineSeries(parent))
             {
             }
-            QAbstractSeries *DeclarativeAreaSeries::series()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeAreaSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeAreaSeries::appendPoints);
             }
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeAreaSeries::lowerPoints()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeAreaSeries::appendLowerPoints);
             }
             void DeclarativeAreaSeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                                       DeclarativeXyPoint *element)
             {
                 QAreaSeries *series = qobject_cast<QAreaSeries *>(list->object);
                 if (series) {
                     QLineSeries *upper = series->upperSeries();
                     upper->append(element->x(), element->y());
                 }
             }
             void DeclarativeAreaSeries::appendLowerPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                                           DeclarativeXyPoint *element)
             {
                 QAreaSeries *series = qobject_cast<QAreaSeries *>(list->object);
                 if (series) {
                     QLineSeries *lower = series->lowerSeries();
                     lower->append(element->x(), element->y());
                 }
             }
             #include "moc_declarativeareaseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativeareaseries.h 0 -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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEAREASERIES_H
             #define DECLARATIVEAREASERIES_H
             #include "qchartglobal.h"
             #include "qareaseries.h"
             #include "declarativexyseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeAreaSeries : public QAreaSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> lowerPoints READ lowerPoints)
             public:
                 explicit DeclarativeAreaSeries(QObject *parent = 0);
             public:
-                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
                 QDeclarativeListProperty<DeclarativeXyPoint> lowerPoints();
             public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
                 static void appendLowerPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEAREASERIES_H

qmlplugin/declarativechart.cpp +21 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$
             **
             ****************************************************************************/
             #include "declarativechart.h"
+            #include "declarativepieseries.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this)),
                   m_legend(LegendDisabled)
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
             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()
+            {
+                foreach(QObject *child, children()) {
+                    if (qobject_cast<QAbstractSeries *>(child)) {
+                        m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));
+                    }
+                }
+                QDeclarativeItem::componentComplete();
+            }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
                 Q_UNUSED(oldGeometry)
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         m_chart->resize(newGeometry.width(), newGeometry.height());
                     }
                 }
             }
             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::setAnimationOptions(QChart::AnimationOption animations)
             {
                 m_chart->setAnimationOptions(animations);
             }
             QChart::AnimationOption DeclarativeChart::animationOptions()
             {
                 if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
                     return QChart::AllAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
                     return QChart::GridAxisAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
                     return QChart::SeriesAnimations;
                 else
                     return QChart::NoAnimation;
             }
             void DeclarativeChart::setLegend(ChartLegend legend)
             {
                 if (legend != m_legend) {
                     m_legend = legend;
                     switch (m_legend) {
                     case LegendDisabled:
                         m_chart->legend()->setVisible(false);
                         break;
                     case LegendTop:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentTop);
                         break;
                     case LegendBottom:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentBottom);
                         break;
                     case LegendLeft:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentLeft);
                         break;
                     case LegendRight:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentRight);
                         break;
                     default:
                         m_chart->legend()->setVisible(false);
                         break;
                     }
                 }
             }
             DeclarativeChart::ChartLegend DeclarativeChart::legend()
             {
                 return m_legend;
             }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativechart.h +2 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$
             **
             ****************************************************************************/
             #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(QChart::ChartTheme theme READ theme WRITE setTheme)
                 Q_PROPERTY(QChart::AnimationOption animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(ChartLegend legend READ legend WRITE setLegend)
                 Q_ENUMS(ChartLegend)
             public:
                 enum ChartLegend {
                     LegendDisabled = 0,
                     LegendTop,
                     LegendBottom,
                     LegendLeft,
                     LegendRight
                 };
             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(QChart::ChartTheme theme) {m_chart->setTheme(theme);}
                 QChart::ChartTheme theme() {return m_chart->theme();}
                 void setAnimationOptions(QChart::AnimationOption animations);
                 QChart::AnimationOption animationOptions();
                 void setTitle(QString title) {m_chart->setTitle(title);}
                 QString title() { return m_chart->title();}
                 void setLegend(ChartLegend legend);
                 ChartLegend legend();
             public:
                 // 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;
                 ChartLegend m_legend;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

qmlplugin/declarativelineseries.cpp 0 -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 "declarativelineseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qlineseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) :
                 QLineSeries(parent)
             {
             }
-            QAbstractSeries *DeclarativeLineSeries::series()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeLineSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             #include "moc_declarativelineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativelineseries.h 0 -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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVELINESERIES_H
             #define DECLARATIVELINESERIES_H
             #include "qchartglobal.h"
             #include "qlineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
             public:
                 explicit DeclarativeLineSeries(QObject *parent = 0);
             public:
-                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVELINESERIES_H

qmlplugin/declarativepieseries.cpp +1 -16

             /****************************************************************************
             **
             ** 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 "declarativepieseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativePieSeries::DeclarativePieSeries(QObject *parent) :
-                QPieSeries(parent),
+                QPieSeries(parent)
-                m_chart(0)
             {
             }
-            void DeclarativePieSeries::classBegin()
-            void DeclarativePieSeries::componentComplete()
-                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
-                if (declarativeChart) {
-                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-                    Q_ASSERT(chart);
-                    chart->addSeries(this);
             QDeclarativeListProperty<QPieSlice> DeclarativePieSeries::slices()
             {
                 return QDeclarativeListProperty<QPieSlice>(this, 0, &DeclarativePieSeries::appendSlice);
             }
             void DeclarativePieSeries::appendSlice(QDeclarativeListProperty<QPieSlice> *list,
                                                   QPieSlice *slice)
             {
                 DeclarativePieSeries *series = qobject_cast<DeclarativePieSeries *>(list->object);
                 if (series)
                     series->append(slice->value(), slice->label());
             }
             #include "moc_declarativepieseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativepieseries.h +2 -10

             /****************************************************************************
             **
             ** 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 DECLARATIVEPIESERIES_H
             #define DECLARATIVEPIESERIES_H
             #include "qchartglobal.h"
             #include "qpieslice.h"
             #include "qpieseries.h"
-            #include <QDeclarativeItem>
+            #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
-            class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
+            class DeclarativePieSeries : public QPieSeries
             {
                 Q_OBJECT
-                Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QPieSlice> slices READ slices)
             public:
                 explicit DeclarativePieSeries(QObject *parent = 0);
                 QDeclarativeListProperty<QPieSlice> slices();
-            public: // from QDeclarativeParserStatus
-                void classBegin();
-                void componentComplete();
             public Q_SLOTS:
                 static void appendSlice(QDeclarativeListProperty<QPieSlice> *list,
                                         QPieSlice *element);
-            private:
-                QChart *m_chart;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEPIESERIES_H

qmlplugin/declarativescatterseries.cpp 0 -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 "declarativescatterseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qscatterseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :
                 QScatterSeries(parent)
             {
             }
-            QAbstractSeries *DeclarativeScatterSeries::series()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeScatterSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             #include "moc_declarativescatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativescatterseries.h 0 -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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESCATTERSERIES_H
             #define DECLARATIVESCATTERSERIES_H
             #include "qchartglobal.h"
             #include "qscatterseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
             public:
                 explicit DeclarativeScatterSeries(QObject *parent = 0);
             public:
-                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESCATTERSERIES_H

qmlplugin/declarativesplineseries.cpp 0 -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 "declarativesplineseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) :
                 QSplineSeries(parent)
             {
             }
-            QAbstractSeries *DeclarativeSplineSeries::series()
-                return this;
             QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeSplineSeries::points()
             {
                 return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXySeries::appendPoints);
             }
             #include "moc_declarativesplineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativesplineseries.h 0 -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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESPLINESERIES_H
             #define DECLARATIVESPLINESERIES_H
             #include "qchartglobal.h"
             #include "qsplineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries
             {
                 Q_OBJECT
                 Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
             public:
                 explicit DeclarativeSplineSeries(QObject *parent = 0);
             public:
-                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESPLINESERIES_H

qmlplugin/declarativexyseries.cpp 0 -16

             /****************************************************************************
             **
             ** 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 "qxyseries.h"
             #include "declarativechart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeXySeries::DeclarativeXySeries()
             {
             }
             DeclarativeXySeries::~DeclarativeXySeries()
             {
             }
-            void DeclarativeXySeries::classBegin()
-            void DeclarativeXySeries::componentComplete()
-                QAbstractSeries *thisObj = reinterpret_cast<QAbstractSeries *>(series());
-                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(thisObj->parent());
-                if (declarativeChart) {
-                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-                    Q_ASSERT(chart);
-                    chart->addSeries(thisObj);
             void DeclarativeXySeries::appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                                    DeclarativeXyPoint *element)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(list->object);
                 if (series)
                     series->append(element->x(), element->y());
             }
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativexyseries.h +1 -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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVE_XY_SERIES_H
             #define DECLARATIVE_XY_SERIES_H
             #include "qchartglobal.h"
             #include "declarativexypoint.h"
-            #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QAbstractSeries;
-            class DeclarativeXySeries : public QDeclarativeParserStatus
+            class DeclarativeXySeries
             {
                 Q_INTERFACES(QDeclarativeParserStatus)
             public:
                 explicit DeclarativeXySeries();
                 ~DeclarativeXySeries();
-            public: // from QDeclarativeParserStatus
-                virtual void classBegin();
-                virtual void componentComplete();
             public:
-                virtual QAbstractSeries *series() = 0;
                 virtual QDeclarativeListProperty<DeclarativeXyPoint> points() = 0;
             public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                          DeclarativeXyPoint *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVE_XY_SERIES_H

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