HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1193:62e3aa7546c6

QML BarSeries API to support BarSet children

Tero Ahola -

r1193:62e3aa7546c6

parent child

Context file:

r1193:62e3aa7546c6

Collapse all files

demos/qmlchart/qml/qmlchart/View5.qml +11 -30

             /****************************************************************************
             **
             ** 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
                 ChartView {
                     title: "Bar series"
                     anchors.fill: parent
                     theme: ChartView.ChartThemeLight
                     legend: ChartView.LegendBottom
             //        axisXLabels: ["0", "2008", "1", "2009", "2", "2010", "3", "2012"]
                     axisX.max: 10
                     BarSeries {
                         barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
-                        model: barModel
+                        BarSet { name: "Bob"; values: [2, 2, 3, 4, 5, 6] }
+                        BarSet { name: "Susan"; values: [5, 1, 2, 4, 1, 7] }
+                        BarSet { name: "James"; values: [3, 5, 8, 13, 5, 8] }
                     }
-            //        // TODO: optional syntax with ChartModel base model API
+                    // TODO: optional syntax with ChartModel base model API
             //        BarSeries {
             //            model: chartModel
             //            modelMapping: BarSeriesMapping {
-            //                // Giving "undefined" x mapping value means that the indexes are used as x-values
+            //                ?
-            //                setIndexes: [BarSeriesMapping.Undefined, 0,
-            //                             BarSeriesMapping.Undefined, 1,
-            //                             BarSeriesMapping.Undefined, 2] // defaults to []
-            ////                setValues: [
-            ////                    BarSetMapping {x: BarSetMapping.Undefined; y: 0},
-            ////                    BarSetMapping {x: BarSetMapping.Undefined; y: 1},
-            ////                    BarSetMapping {x: BarSetMapping.Undefined; y: 2}
-            ////                ]
-            //                orientation: BarSeriesMapping.Vertical // defaults to Vertical
             //                startIndex: 0 // defaults to 0
             //                count: BarSeriesMapping.Undefined // defaults to "Undefined"
             //            }
             //        }
+            //        ChartModel {
+            //            id: chartModel
+            //            ChartModelElement { values: ["Bob", 2, 2, 3, 4, 5, 6] }
+            //            ChartModelElement { values: ["Susan", 5, 1, 2, 4, 1, 7] }
+            //            ChartModelElement { values: ["James", 3, 5, 8, 13, 5, 8] }
+            //        }
                 }
-            //    ChartModel {
-            //        id: chartModel
-            //    }
-                BarModel {
-                    id: barModel
-                    BarSet { name: "Bob"; values: [2, 2, 3, 4, 5, 6] }
-                    BarSet { name: "Susan"; values: [5, 1, 2, 4, 1, 7] }
-                    BarSet { name: "James"; values: [3, 5, 8, 13, 5, 8] }
-                // TODO
-            //    Component.onCompleted: {
-            //        bobBars.append(1.2);
-            //        bobBars.append(1.5);
-            //        bobBars.append([1.5, 1.4, 1.9]);
-            //    }
             }

qmlplugin/declarativebarseries.cpp +15 -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 "declarativebarseries.h"
             #include "declarativechart.h"
             #include <QBarSet>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
                 QBarSet("", parent)
             {
             }
             QVariantList DeclarativeBarSet::values()
             {
                 QVariantList values;
                 for (int i(0); i < count(); i++)
                     values.append(QVariant(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))
                         append(values[i].toDouble());
                 }
             }
             DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
-                QBarSeries(parent)
+                QGroupedBarSeries(parent)
             {
             }
             void DeclarativeBarSeries::classBegin()
             {
             }
             void DeclarativeBarSeries::componentComplete()
             {
-            //    if (model())
+                foreach(QObject *child, children()) {
-            //        setModelMapping(0, 1, 1, Qt::Vertical);
+                    if (qobject_cast<QBarSet *>(child)) {
+                        qDebug() << "append bar set:" << child;
+                        QBarSeries::appendBarSet(qobject_cast<QBarSet *>(child));
+                    }
+                }
+            }
+            QDeclarativeListProperty<DeclarativeBarSet> DeclarativeBarSeries::initialBarSets()
+            {
+                return QDeclarativeListProperty<DeclarativeBarSet>(this, 0, &DeclarativeBarSeries::appendInitialBarSets);
             }
-            bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model)
+            bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeTableModel *model)
             {
                 QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
                 bool value(false);
                 if (m) {
                     setModel(m);
                     //setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical);
             //        setModelMapping(0, 1, 1, Qt::Vertical);
                 } else {
                     qWarning("DeclarativeBarSeries: Illegal model");
                 }
                 return value;
             }
-            DeclarativeBarModel *DeclarativeBarSeries::declarativeModel()
+            DeclarativeTableModel *DeclarativeBarSeries::declarativeModel()
             {
-                return qobject_cast<DeclarativeBarModel *>(model());
+                return qobject_cast<DeclarativeTableModel *>(model());
             }
             void DeclarativeBarSeries::setBarCategories(QStringList categories)
             {
                 setCategories(categories);
             }
             QStringList DeclarativeBarSeries::barCategories()
             {
                 return categories();
             }
             #include "moc_declarativebarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativebarseries.h +9 -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 DECLARATIVEBARSERIES_H
             #define DECLARATIVEBARSERIES_H
             #include "qchartglobal.h"
             #include "declarativemodel.h"
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
-            #include <QBarSeries>
+            #include <QGroupedBarSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
-            class QBarSeries;
             class DeclarativeBarSet : public QBarSet
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
                 Q_PROPERTY(QString name READ name WRITE setName)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
             };
-            class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
+            class DeclarativeBarSeries : public QGroupedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(DeclarativeBarModel *model READ declarativeModel WRITE setDeclarativeModel)
+                Q_PROPERTY(DeclarativeTableModel *model READ declarativeModel WRITE setDeclarativeModel)
                 Q_PROPERTY(QStringList barCategories READ barCategories WRITE setBarCategories)
+                Q_PROPERTY(QDeclarativeListProperty<DeclarativeBarSet> initialBarSets READ initialBarSets)
+                Q_CLASSINFO("DefaultProperty", "initialBarSets")
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
+                QDeclarativeListProperty<DeclarativeBarSet> initialBarSets();
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public:
-                bool setDeclarativeModel(DeclarativeBarModel *model);
+                bool setDeclarativeModel(DeclarativeTableModel *model);
-                DeclarativeBarModel *declarativeModel();
+                DeclarativeTableModel *declarativeModel();
                 void setBarCategories(QStringList categories);
                 QStringList barCategories();
-            Q_SIGNALS:
             public Q_SLOTS:
+                static void appendInitialBarSets(QDeclarativeListProperty<DeclarativeBarSet> */*list*/, DeclarativeBarSet */*element*/) {}
-            public:
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

qmlplugin/declarativemodel.cpp 0 -21

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativemodel.h"
             #include <qdeclarativelist.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ////////////// Table model row ///////////////////
             DeclarativeTableModelElement::DeclarativeTableModelElement(QObject *parent)
                 : QObject(parent)
             {
             }
             QVariantList DeclarativeTableModelElement::values()
             {
                 return m_values;
             }
             void DeclarativeTableModelElement::setValues(QVariantList values)
             {
                 m_values = values;
             }
             ////////////// Table model  ///////////////////
             DeclarativeTableModel::DeclarativeTableModel(QObject *parent) :
                 ChartTableModel(parent)
             {
             }
             void DeclarativeTableModel::classBegin()
             {
             }
             void DeclarativeTableModel::componentComplete()
             {
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeTableModelElement *>(child)) {
                         append(qobject_cast<DeclarativeTableModelElement *>(child)->values());
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeTableModel::modelChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeTableModel::appendModelChild);
             }
             void DeclarativeTableModel::appendModelChild(QDeclarativeListProperty<QObject> *list,
                                                          QObject *child)
             {
                 // childs are added in componentComplete instead
                 Q_UNUSED(list)
                 Q_UNUSED(child)
             }
             void DeclarativeTableModel::append(QVariantList values)
             {
             //    qDebug() << "DeclarativeTableModel::append:" << values;
                 while (columnCount() < values.count())
                     insertColumn(columnCount());
                 insertRow(rowCount());
                 QModelIndex beginIndex = QModelIndex();
                 QModelIndex endIndex = QModelIndex();
                 for (int i(0); i < values.count(); i++) {
                     QModelIndex modelIndex = createIndex(rowCount() - 1, i);
                     if (i == 0)
                         beginIndex = modelIndex;
                     if (i == (values.count() - 1))
                         endIndex = modelIndex;
                     setData(modelIndex, values.at(i));
                 }
                 dataChanged(beginIndex, endIndex);
             }
             void DeclarativeTableModel::appendPoint(QXYModelMapper *mapper, DeclarativeXyPoint *point)
             {
             //    qDebug() << "DeclarativeTableModel::appendPoint:" << point;
                 QVariantList values;
                 values.insert(mapper->mapX(), point->x());
                 values.insert(mapper->mapY(), point->y());
                 append(values);
             }
-            ////////////// Bar model ///////////////////////
-            DeclarativeBarModel::DeclarativeBarModel(QObject *parent) :
-                DeclarativeTableModel(parent)
-            void DeclarativeBarModel::append(QBarSet* barSet)
-                insertColumn(columnCount());
-                for (int i(0); i < barSet->count(); i++) {
-                    if (rowCount() < (i + 1))
-                        insertRow(rowCount());
-                    setData(createIndex(i, columnCount() - 1), barSet->at(i));
-            //        insertRow(rowCount());
-            //        setData(createIndex(rowCount() - 1, 0), );
-            //        setData(createIndex(rowCount() - 1, 1), barSet->at(i));
-            //    TODO: setModelMapping(0, 1, columnCount(), Qt::Vertical);
             #include "moc_declarativemodel.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativemodel.h 0 -11

             /****************************************************************************
             **
             ** 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 DECLARATIVEMODEL_H
             #define DECLARATIVEMODEL_H
             #include "qchartglobal.h"
             #include "declarativexypoint.h"
             #include <QPieSlice>
             #include "../src/charttablemodel.h" // TODO
             #include <QBarSet>
             #include <QXYModelMapper>
             #include <QDeclarativeListProperty>
             #include <QVariant>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeTableModelElement : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
             public:
                 explicit DeclarativeTableModelElement(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
             private:
                 QVariantList m_values;
             };
             class DeclarativeTableModel : public ChartTableModel, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> modelChildren READ modelChildren)
                 Q_CLASSINFO("DefaultProperty", "modelChildren")
             public:
                 explicit DeclarativeTableModel(QObject *parent = 0);
                 QDeclarativeListProperty<QObject> modelChildren();
                 void appendPoint(QXYModelMapper *mapper, DeclarativeXyPoint *point);
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 void append(QVariantList slices);
                 static void appendModelChild(QDeclarativeListProperty<QObject> *list,
                                              QObject *element);
             };
-            class DeclarativeBarModel : public DeclarativeTableModel
-                Q_OBJECT
-            public:
-                explicit DeclarativeBarModel(QObject *parent = 0);
-            public Q_SLOTS:
-                void append(QBarSet* barSet);
-            };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEMODEL_H

qmlplugin/plugin.cpp 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "qchart.h"
             #include "qaxiscategories.h"
             #include "declarativechart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"
             #include "declarativesplineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include "declarativemodel.h"
             #include <QPieModelMapper>
             #include <QXYModelMapper>
             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");
                     qmlRegisterUncreatableType<QAxis>(uri, 1, 0, "Axis",
                                                       QLatin1String("Trying to create uncreatable: Axis."));
                     //qmlRegisterType<DeclarativeAxisCategory>(uri, 1, 0, "AxisCategory");
                     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<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "ChartModel");
                     qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "ChartModelElement");
                     //qmlRegisterType<DeclarativePieMapping>(uri, 1, 0, "PieMapping");
                     //qmlRegisterType<QPieModelMapper>(uri, 1, 0, "PieModelMapper");
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
-                    qmlRegisterType<DeclarativeBarModel>(uri, 1, 0, "BarModel");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))

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