HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1190:f9f8ff23359b

Cleaning up ChartModel impl before moving it into a demo app

Tero Ahola -

r1190:f9f8ff23359b

parent child

Context file:

r1190:f9f8ff23359b

Collapse all files

demos/qmlchart/qml/qmlchart/View1.qml +5 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 property int __explodedIndex: -1
                 ChartView {
                     id: chart
                     title: "Top-5 car brand shares in Finland"
                     anchors.top: parent.top
                     anchors.bottom: button.top
                     anchors.left: parent.left
                     anchors.right: parent.right
                     theme: ChartView.ChartThemeLight
                     legend: ChartView.LegendBottom
                     animationOptions: ChartView.SeriesAnimations
                     // If you have static data, you can simply use the PieSlice API
                     PieSeries {
                         id: pieSeries
                         PieSlice { id: volkswagenSlice; 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 }
                     }
                     // TODO: move ChartModel API into a demo application instead of making it a public API
             //        // For dynamic data you can use the ChartModel API.
             //        ChartModel {
             //            id: chartModel
-            //            ChartModelRow { values: ["Volkswagen", 13.5] }
+            //            ChartModelElement { values: ["Volkswagen", 13.5] }
-            //            ChartModelRow { values: ["Toyota", 10.9] }
+            //            ChartModelElement { values: ["Toyota", 10.9] }
-            //            ChartModelRow { values: ["Ford", 8.6] }
+            //            ChartModelElement { values: ["Ford", 8.6] }
-            //            ChartModelRow { values: ["Skoda", 8.2] }
+            //            ChartModelElement { values: ["Skoda", 8.2] }
-            //            ChartModelRow { values: ["Volvo", 6.8] }
+            //            ChartModelElement { values: ["Volvo", 6.8] }
             //        }
             //        // In this case you need to define how the data maps to pie slices with the ModelMapper API of the pie series.
             //        PieSeries {
             //            id: pieSeries
             //            model: chartModel
             //            modelMapper.mapLabels: 0
             //            modelMapper.mapValues: 1
             //            modelMapper.first: 0
             //            modelMapper.count: -1 // "Undefined" = -1 by default
             //            modelMapper.orientation: PieModelMapper.Vertical
             //        }
                     // TODO: you could also append to your model, for example:
             //        pieSeries.model.append(["Others", 52.0]);
                 }
                 Component.onCompleted: {
                     volkswagenSlice.exploded = true;
                     // You can also add slices dynamically
                     var newSlice = pieSeries.append("Others", 52.0);
                 }
                 Timer {
                     repeat: true
                     interval: 2000
                     running: true
                     onTriggered: {
                         // Set all slices as not exploded
                         for (var i = 0; i < pieSeries.count; i++)
                             pieSeries.at(i).exploded = false;
                         // Explode one of the slices
                         __explodedIndex = (__explodedIndex + 1) % pieSeries.count;
                         pieSeries.at(__explodedIndex).exploded = true;
                         // TODO: implement for convenience
             //            pieSeries.find("Ford").exploded = true;
             //            pieSeries.removeAll("Ford")
                     }
                 }
                 Rectangle {
                     id: button
                     anchors.bottom: parent.bottom
                     anchors.bottomMargin: 10
                     anchors.horizontalCenter: parent.horizontalCenter
                     height: 40
                     width: 100
                     color: "orange"
                     radius: 5
                     Text {
                         id: buttonText
                         anchors.centerIn: parent
                         text: "Hide others"
                     }
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
                             if (buttonText.text == "Show others") {
                                 pieSeries.modelMapper.count = -1;
                                 buttonText.text = "Hide others";
                             } else {
                                 pieSeries.modelMapper.count = 5;
                                 buttonText.text = "Show others";
                             }
                         }
                     }
                 }
                 // TODO: show how to use data from a list model in a chart view
                 // i.e. copy the data into a chart model
             //    ListModel {
             //        id: listModel
             //        ListElement {
             //            label: "Volkswagen"
             //            value: 13.5
             //        }
             //        ListElement {
             //            label: "Toyota"
             //            value: 10.9
             //        }
             //        // and so on...
             //    }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 ChartView {
                     title: "Line&Spline"
                     anchors.fill: parent
                     theme: ChartView.ChartThemeBrownSand
                     animationOptions: ChartView.NoAnimation
                     LineSeries {
                         name: "Line"
                         model: chartModel
                         modelMapper.mapX: 0
                         modelMapper.mapY: 1
                         modelMapper.first: 0
                         modelMapper.count: -1
                         modelMapper.orientation: XYModelMapper.Vertical
                     }
                     SplineSeries {
                         name: "Spline"
                         model: chartModel
                         modelMapper.mapX: 0
                         modelMapper.mapY: 2
                     }
                 }
                 ChartModel {
                     id: chartModel
-                    ChartModelRow { values: [0.0, 0.0, 0.3] }
+                    ChartModelElement { values: [0.0, 0.0, 0.3] }
-                    ChartModelRow { values: [1.1, 2.1, 3.2] }
+                    ChartModelElement { values: [1.1, 2.1, 3.2] }
-                    ChartModelRow { values: [1.9, 3.3, 2.4] }
+                    ChartModelElement { values: [1.9, 3.3, 2.4] }
-                    ChartModelRow { values: [2.1, 2.1, 2.1] }
+                    ChartModelElement { values: [2.1, 2.1, 2.1] }
-                    ChartModelRow { values: [2.9, 4.9, 2.6] }
+                    ChartModelElement { values: [2.9, 4.9, 2.6] }
-                    ChartModelRow { values: [3.4, 3.0, 2.3] }
+                    ChartModelElement { values: [3.4, 3.0, 2.3] }
-                    ChartModelRow { values: [4.1, 3.3, 3.1] }
+                    ChartModelElement { values: [4.1, 3.3, 3.1] }
                 }
             }

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

             /****************************************************************************
             **
             ** 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: "NHL All-Star Team Players"
                     anchors.fill: parent
                     theme: ChartView.ChartThemeHighContrast
                     axisXLabels: ["0", "2000", "1", "2001", "2", "2002", "3", "2003", "4", "2004", "5", "2005",
                         "6", "2006", "7", "2007", "8", "2008", "9", "2009", "10", "2010", "11", "2011"]
                     AreaSeries {
                         name: "Russian"
                         upperModel: chartModel
                         upperModelMapper.mapX: 0
                         upperModelMapper.mapY: 2
                         lowerModel: chartModel
                         lowerModelMapper.mapX: 0
                         lowerModelMapper.mapY: 1
                     }
                     AreaSeries {
                         name: "Swedish"
                         upperModel: chartModel
                         upperModelMapper.mapX: 0
                         upperModelMapper.mapY: 3
                         lowerModel: chartModel
                         lowerModelMapper.mapX: 0
                         lowerModelMapper.mapY: 1
                     }
                     AreaSeries {
                         name: "Finnish"
                         upperModel: chartModel
                         upperModelMapper.mapX: 0
                         upperModelMapper.mapY: 4
                         lowerModel: chartModel
                         lowerModelMapper.mapX: 0
                         lowerModelMapper.mapY: 1
                     }
                 }
                 ChartModel {
                     id: chartModel
-                    ChartModelRow { values: [0,  0, 1, 1, 0] }
+                    ChartModelElement { values: [0,  0, 1, 1, 0] }
-                    ChartModelRow { values: [1,  0, 1, 1, 0] }
+                    ChartModelElement { values: [1,  0, 1, 1, 0] }
-                    ChartModelRow { values: [2,  0, 1, 3, 0] }
+                    ChartModelElement { values: [2,  0, 1, 3, 0] }
-                    ChartModelRow { values: [3,  0, 1, 3, 0] }
+                    ChartModelElement { values: [3,  0, 1, 3, 0] }
-                    ChartModelRow { values: [4,  0, 1, 2, 0] }
+                    ChartModelElement { values: [4,  0, 1, 2, 0] }
-                    ChartModelRow { values: [5,  0, 0, 0, 0] }
+                    ChartModelElement { values: [5,  0, 0, 0, 0] }
-                    ChartModelRow { values: [6,  0, 1, 2, 1] }
+                    ChartModelElement { values: [6,  0, 1, 2, 1] }
-                    ChartModelRow { values: [7,  0, 1, 1, 0] }
+                    ChartModelElement { values: [7,  0, 1, 1, 0] }
-                    ChartModelRow { values: [8,  0, 4, 2, 0] }
+                    ChartModelElement { values: [8,  0, 4, 2, 0] }
-                    ChartModelRow { values: [9,  0, 3, 1, 0] }
+                    ChartModelElement { values: [9,  0, 3, 1, 0] }
-                    ChartModelRow { values: [10, 0, 2, 3, 0] }
+                    ChartModelElement { values: [10, 0, 2, 3, 0] }
-                    ChartModelRow { values: [11, 0, 1, 3, 1] }
+                    ChartModelElement { values: [11, 0, 1, 3, 1] }
                 }
             }

demos/qmlchart/qml/qmlchart/View5.qml +2 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             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
                     }
             //        // 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
             //    }
                 BarModel {
                     id: barModel
                     BarSet { name: "Bob"; values: [2, 2, 3, 4, 5, 6] }
-                    BarSet { name: "Bub"; values: [5, 1, 2, 4, 1, 7] }
+                    BarSet { name: "Susan"; values: [5, 1, 2, 4, 1, 7] }
-                    BarSet { name: "Bib"; values: [3, 5, 8, 13, 5, 8] }
+                    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/declarativemodel.cpp +6 -42

             /****************************************************************************
             **
             ** 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 ///////////////////
-            DeclarativeTableModelRow::DeclarativeTableModelRow(QObject *parent)
+            DeclarativeTableModelElement::DeclarativeTableModelElement(QObject *parent)
                 : QObject(parent)
             {
             }
-            QVariantList DeclarativeTableModelRow::values()
+            QVariantList DeclarativeTableModelElement::values()
             {
                 return m_values;
             }
-            void DeclarativeTableModelRow::setValues(QVariantList 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<DeclarativeTableModelRow *>(child)) {
+                    if (qobject_cast<DeclarativeTableModelElement *>(child)) {
-                        append(qobject_cast<DeclarativeTableModelRow *>(child)->values());
+                        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;
+            //    qDebug() << "DeclarativeTableModel::appendPoint:" << point;
                 QVariantList values;
                 values.insert(mapper->mapX(), point->x());
                 values.insert(mapper->mapY(), point->y());
                 append(values);
             }
-            //void DeclarativeTableModel::appendPoints(QVariantList points)
-            //{
-            //    qreal x = 0.0;
-            //    for (int i(0); i < points.count(); i++) {
-            //        if (i % 2) {
-            //            bool ok(false);
-            //            qreal y = points.at(i).toReal(&ok);
-            //            if (ok) {
-            //                DeclarativeXyPoint *point= new DeclarativeXyPoint();
-            //                point->setX(x);
-            //                point->setY(y);
-            //                appendPoint(point);
-            //            } else {
-            //                qWarning() << "Illegal y value";
-            //            }
-            //        } else {
-            //            bool ok(false);
-            //            x = points.at(i).toReal(&ok);
-            //            if (!ok) {
-            //                qWarning() << "Illegal x value";
-            //            }
-            //        }
-            //    }
-            //}
-            //void DeclarativeTableModel::appendPoint(DeclarativeXyPoint* point)
-            //{
-            ////    qDebug() << "DeclarativeTableModel::append:" << point->x() << " " << point->y();
-            //    insertRow(rowCount());
-            //    QModelIndex xModelIndex = createIndex(rowCount() - 1, 0);
-            //    QModelIndex yModelIndex = createIndex(rowCount() - 1, 1);
-            //    setData(xModelIndex, point->x());
-            //    setData(yModelIndex, point->y());
-            //    dataChanged(xModelIndex, yModelIndex);
-            //}
             ////////////// 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 +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef 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 DeclarativeTableModelRow : public QObject
+            class DeclarativeTableModelElement : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
             public:
-                explicit DeclarativeTableModelRow(QObject *parent = 0);
+                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 +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "qchart.h"
             #include "qaxiscategories.h"
             #include "declarativechart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"
             #include "declarativesplineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include "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<DeclarativeTableModelRow>(uri, 1, 0, "ChartModelRow");
+                    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