HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1272:5cb84e6f3423

QML custom model demo now implements it's own QAbstractItemModel based model

Tero Ahola -

r1272:5cb84e6f3423

parent child

Context file:

r1272:5cb84e6f3423

Collapse all files

demos/qmlcustommodel/customtablemodel.cpp ~~src/charttablemodel.cpp~~ renamed +13 -26

             **
             ****************************************************************************/
-            #include "charttablemodel.h"
+            #include "customtablemodel.h"
             #include <QVector>
             #include <QRect>
             #include <QColor>
-            QTCOMMERCIALCHART_USE_NAMESPACE
+            CustomTableModel::CustomTableModel(QObject *parent) :
-            ChartTableModel::ChartTableModel(QObject *parent) :
                 QAbstractTableModel(parent),
                 m_columnCount(0),
                 m_rowCount(0)
             {
             }
-            int ChartTableModel::rowCount(const QModelIndex & parent) const
+            int CustomTableModel::rowCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
                 return m_data.count();
             }
-            int ChartTableModel::columnCount(const QModelIndex & parent) const
+            int CustomTableModel::columnCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
                 return m_columnCount;
             }
-            QVariant ChartTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
+            QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
             {
                 if (role != Qt::DisplayRole)
                     return QVariant();
                 }
             }
-            QVariant ChartTableModel::data(const QModelIndex &index, int role) const
+            QVariant CustomTableModel::data(const QModelIndex &index, int role) const
             {
                 if (role == Qt::DisplayRole) {
                     return m_data[index.row()]->at(index.column());
                 return QVariant();
             }
-            bool ChartTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
+            bool CustomTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
             {
                 if (index.isValid() && role == Qt::EditRole) {
                     m_data[index.row()]->replace(index.column(), value);
                 return false;
             }
-            void ChartTableModel::insertColumn(int column, const QModelIndex &parent)
+            void CustomTableModel::insertColumn(int column, const QModelIndex &parent)
             {
                 beginInsertColumns(parent, column, column);
                 m_columnCount++;
                 endInsertColumns();
             }
-            void ChartTableModel::insertRow(int row, const QModelIndex &parent)
+            void CustomTableModel::insertRow(int row, const QModelIndex &parent)
             {
                 beginInsertRows(parent, row, row);
                 QVector<QVariant>* dataVec = new QVector<QVariant>(m_columnCount);
                 endInsertRows();
             }
-            //bool ChartTableModel::removeRow(int row, const QModelIndex &parent)
+            bool CustomTableModel::removeRow(int row, const QModelIndex &parent)
-            //{
-            //    Q_UNUSED(parent)
-            //    Q_ASSERT(row >= 0 && row < rowCount);
-            //    beginRemoveRows(parent, row, row);
-            //    m_data.removeAt(row);
-            //    endRemoveRows();
-            //    return true;
-            //}
-            bool ChartTableModel::removeRow(int row, const QModelIndex &parent)
             {
                 return QAbstractTableModel::removeRow(row, parent);
             }
-            bool ChartTableModel::removeRows(int row, int count, const QModelIndex &parent)
+            bool CustomTableModel::removeRows(int row, int count, const QModelIndex &parent)
             {
                 beginRemoveRows(parent, row, row + count - 1);
                 bool removed(false);
                 return removed;
             }
-            Qt::ItemFlags ChartTableModel::flags ( const QModelIndex & index ) const
+            Qt::ItemFlags CustomTableModel::flags ( const QModelIndex & index ) const
             {
                 return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
             }
-            #include "moc_charttablemodel.cpp"
+            #include "moc_customtablemodel.cpp"

demos/qmlcustommodel/customtablemodel.h ~~src/charttablemodel.h~~ renamed +5 -11

             **
             ****************************************************************************/
-            #ifndef CHARTTABLEMODEL_H
+            #ifndef CUSTOMTABLEMODEL_H
-            #define CHARTTABLEMODEL_H
+            #define CUSTOMTABLEMODEL_H
-            #include "qchartglobal.h"
             #include <QAbstractTableModel>
             #include <QHash>
-            #include <QRect>
-            QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class CustomTableModel : public QAbstractTableModel
-            class QTCOMMERCIALCHART_EXPORT ChartTableModel : public QAbstractTableModel
             {
                 Q_OBJECT
                 Q_PROPERTY(int count READ rowCount)
             public:
-                explicit ChartTableModel(QObject *parent = 0);
+                explicit CustomTableModel(QObject *parent = 0);
                 int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
                 int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
                 int m_rowCount;
             };
-            QTCOMMERCIALCHART_END_NAMESPACE
+            #endif // CUSTOMTABLEMODEL_H
-            #endif // CHARTTABLEMODEL_H

demos/qmlcustommodel/declarativemodel.cpp ~~plugins/declarative/declarativemodel.cpp~~ renamed +13 -18

             #include <qdeclarativelist.h>
             #include <QDebug>
-            QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            ////////////// Table model element ///////////////////
-            ////////////// Table model row ///////////////////
             DeclarativeTableModelElement::DeclarativeTableModelElement(QObject *parent)
                 : QObject(parent)
             ////////////// Table model  ///////////////////
             DeclarativeTableModel::DeclarativeTableModel(QObject *parent) :
-                ChartTableModel(parent)
+                CustomTableModel(parent)
             {
             }
                 dataChanged(beginIndex, endIndex);
             }
-            void DeclarativeTableModel::appendPoint(QXYModelMapper *mapper, DeclarativeXyPoint *point)
+            //void DeclarativeTableModel::appendPoint(QXYModelMapper *mapper, DeclarativeXyPoint *point)
+            //{
-                Q_UNUSED(mapper)
+            //    Q_UNUSED(mapper)
-                Q_UNUSED(point)
+            //    Q_UNUSED(point)
-                // TODO: XYModelMapper implementation has change, this code has to be updated.
+            //    // TODO: XYModelMapper implementation has change, this code has to be updated.
-            //    qDebug() << "DeclarativeTableModel::appendPoint:" << point;
+            ////    qDebug() << "DeclarativeTableModel::appendPoint:" << point;
-            //    QVariantList values;
+            ////    QVariantList values;
-            //    values.insert(mapper->mapX(), point->x());
+            ////    values.insert(mapper->mapX(), point->x());
-            //    values.insert(mapper->mapY(), point->y());
+            ////    values.insert(mapper->mapY(), point->y());
-            //    append(values);
+            ////    append(values);
+            //}
             #include "moc_declarativemodel.cpp"
-            QTCOMMERCIALCHART_END_NAMESPACE

demos/qmlcustommodel/declarativemodel.h ~~plugins/declarative/declarativemodel.h~~ renamed +3 -15

             #ifndef DECLARATIVEMODEL_H
             #define DECLARATIVEMODEL_H
-            #include "qchartglobal.h"
+            #include "customtablemodel.h"
-            #include "declarativexypoint.h"
-            #include <QPieSlice>
-            #include "../src/charttablemodel.h" // TODO
-            #include <QBarSet>
-            #include <QXYModelMapper>
             #include <QDeclarativeListProperty>
             #include <QVariant>
             #include <QDeclarativeParserStatus>
-            QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            // TODO: move model into demo app,
-            // the ChartModel API will not be implemented by charts declarative plugin
             class DeclarativeTableModelElement : public QObject
             {
                 Q_OBJECT
                 QVariantList m_values;
             };
-            class DeclarativeTableModel : public ChartTableModel, public QDeclarativeParserStatus
+            class DeclarativeTableModel : public CustomTableModel, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
             public:
                 explicit DeclarativeTableModel(QObject *parent = 0);
                 QDeclarativeListProperty<QObject> modelChildren();
-                void appendPoint(QXYModelMapper *mapper, DeclarativeXyPoint *point);
+            //    void appendPoint(QXYModelMapper *mapper, DeclarativeXyPoint *point);
             public: // from QDeclarativeParserStatus
                 void classBegin();
                                              QObject *element);
             };
-            QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEMODEL_H

demos/qmlcustommodel/main.cpp +12 0

             #include <QtGui/QApplication>
             #include <QDeclarativeEngine>
+            #include <QtDeclarative>
+            #include <QAbstractItemModel>
+            #include "declarativemodel.h"
+            #include "customtablemodel.h"
             #include "qmlapplicationviewer.h"
+            const char *uri = "QmlCustomModel";
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
+                // @uri QmlCustomModel
+                qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
+                                                               QLatin1String("Trying to create uncreatable: AbstractItemModel."));
+                qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "CustomModel");
+                qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "CustomModelElement");
                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlcustommodel/loader.qml"));
                 viewer->showExpanded();

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +13 -13

             import QtQuick 1.0
             import QtCommercial.Chart 1.0
+            import QmlCustomModel 1.0
             Rectangle {
                 width: parent.width
                     anchors.fill: parent
                     theme: ChartView.ChartThemeLight
-                    // For dynamic data you can use the ChartModel API.
+                    // For dynamic data we use a custom data model derived from QAbstractiItemModel
-                    ChartModel {
+                    CustomModel {
-                        id: chartModel
+                        id: customModel
-                        ChartModelElement { values: ["Volkswagen", 13.5, 4.4] }
+                        CustomModelElement { values: ["Volkswagen", 13.5, 4.4] }
-                        ChartModelElement { values: ["Toyota", 10.9, 4.2] }
+                        CustomModelElement { values: ["Toyota", 10.9, 4.2] }
-                        ChartModelElement { values: ["Ford", 8.6, 3.0] }
+                        CustomModelElement { values: ["Ford", 8.6, 3.0] }
-                        ChartModelElement { values: ["Skoda", 8.2, 1.9] }
+                        CustomModelElement { values: ["Skoda", 8.2, 1.9] }
-                        ChartModelElement { values: ["Volvo", 6.8, 1.5] }
+                        CustomModelElement { values: ["Volvo", 6.8, 1.5] }
                     }
                     LineSeries {
                         // TODO: the new mapper api
             //            VXYModelMapper {
-            //                model: chartModel
+            //                model: customModel
             //                xColumn: 0
             //                yColumn: 1
             //            }
                     VPieModelMapper {
                         series: pieSeries
-                        model: chartModel
+                        model: customModel
                         labelsColumn: 0
                         valuesColumn: 1
                     }
             //            lowerSeries: LineSeries {}
             //        }
-                    // TODO: BarSeries with ChartModel base model API
             //        BarSeries {
-            //            model: chartModel
+            //            model: customModel
             //            modelMapper.first: 0
             //        }
                 }
             //        pieSeries.model.append(["Others", 52.0]);
                 // TODO: show how to use data from a list model in a chart view
-                // i.e. copy the data into a chart model
+                // i.e. copy the data into a custom model
             //    ListModel {
             //        id: listModel
             //        ListElement {

demos/qmlcustommodel/qmlcustommodel.pro +5 -1

             }
             RESOURCES += resources.qrc
-            SOURCES += main.cpp
+            SOURCES += main.cpp\
+                       customtablemodel.cpp \
+                       declarativemodel.cpp
+            HEADERS += customtablemodel.h \
+                       declarativemodel.h
             include(qmlapplicationviewer/qmlapplicationviewer.pri)

plugins/declarative/declarative.pro +2 -4

                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
-                declarativebarseries.cpp \
+                declarativebarseries.cpp
-                declarativemodel.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
-                declarativebarseries.h \
+                declarativebarseries.h
-                declarativemodel.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH

plugins/declarative/declarativeareaseries.h 0 -4

                 explicit DeclarativeAreaSeries(QObject *parent = 0);
             public:
-                bool setDeclarativeUpperModel(DeclarativeTableModel *model);
-                DeclarativeTableModel *declarativeUpperModel();
-                bool setDeclarativeLowerModel(DeclarativeTableModel *model);
-                DeclarativeTableModel *declarativeLowerModel();
                 QXYModelMapper* upperModelMapper() const;
                 QXYModelMapper* lowerModelMapper() const;
             public:

plugins/declarative/declarativebarseries.h +1 -1

             #define DECLARATIVEBARSERIES_H
             #include "qchartglobal.h"
-            #include "declarativemodel.h"
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
             #include <QGroupedBarSeries>
+            #include <QBarSet>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

plugins/declarative/declarativelineseries.h +1 -1

             #include "qlineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
-            #include <QDebug>
+            #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

plugins/declarative/declarativepieseries.h 0 -1

             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             #include <QAbstractItemModel>
-            #include "declarativemodel.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

plugins/declarative/declarativescatterseries.h +1 0

             #include "qchartglobal.h"
             #include "qscatterseries.h"
             #include "declarativexyseries.h"
+            #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

plugins/declarative/declarativesplineseries.h +1 0

             #include "qsplineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
+            #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

plugins/declarative/declarativexyseries.h +1 -1

             #include "qchartglobal.h"
             #include "declarativexypoint.h"
-            #include "declarativemodel.h"
+            #include <QColor>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

plugins/declarative/plugin.cpp 0 -3

             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
-            #include "declarativemodel.h"
             #include <QHPieModelMapper>
             #include <QVPieModelMapper>
             #include <QXYModelMapper>
                     qmlRegisterType<DeclarativeGroupedBarSeries>(uri, 1, 0, "GroupedBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<DeclarativePieSlice>(uri, 1, 0, "PieSlice");
-                    qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "ChartModel");
-                    qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "ChartModelElement");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",

src/src.pro +2 -4

                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chart.cpp \
-                $$PWD/scroller.cpp \
+                $$PWD/scroller.cpp
-                $$PWD/charttablemodel.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
-                $$PWD/qabstractseries_p.h \
+                $$PWD/qabstractseries_p.h
-                $$PWD/charttablemodel.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.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