HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1265:eb8a020650cc

Fixed QML pie model mapper API

Tero Ahola -

r1265:eb8a020650cc

parent child

Context file:

r1265:eb8a020650cc

Collapse all files

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +6 -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 {
                 width: parent.width
                 height: parent.height
                 ChartView {
                     id: chart
                     title: "Custom model example"
                     anchors.fill: parent
                     theme: ChartView.ChartThemeLight
                     // For dynamic data you can use the ChartModel API.
                     ChartModel {
                         id: chartModel
                         ChartModelElement { values: ["Volkswagen", 13.5, 4.4] }
                         ChartModelElement { values: ["Toyota", 10.9, 4.2] }
                         ChartModelElement { values: ["Ford", 8.6, 3.0] }
                         ChartModelElement { values: ["Skoda", 8.2, 1.9] }
                         ChartModelElement { values: ["Volvo", 6.8, 1.5] }
                     }
                     LineSeries {
                         name: "line"
                         // TODO: the new mapper api
             //            VXYModelMapper {
             //                model: chartModel
             //                xColumn: 0
             //                yColumn: 1
             //            }
                     }
                     PieSeries {
                         id: pieSeries
                         size: 0.4
                         horizontalPosition: 0.2
                         verticalPosition: 0.3
-                        VPieModelMapper {
-                            model: chartModel
-                            labelsColumn: 0
-                            valuesColumn: 1
                     }
-            //        VPieModelMapper {
+                    VPieModelMapper {
-            //            series: pieSeries
+                        series: pieSeries
-            //            model: chartModel
+                        model: chartModel
-            //            labelsColumn: 1
+                        labelsColumn: 0
-            //            valuesColumn: 2
+                        valuesColumn: 1
-            //        }
             //        AreaSeries {
             //            name: "area"
             //            upperSeries: LineSeries {}
             //            lowerSeries: LineSeries {}
             //        }
                     // TODO: BarSeries with ChartModel base model API
             //        BarSeries {
             //            model: chartModel
             //            modelMapper.first: 0
             //        }
                 }
                 // TODO: you could also implement appending to your model, for example:
             //        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
             //    ListModel {
             //        id: listModel
             //        ListElement {
             //            label: "Volkswagen"
             //            value: 13.5
             //        }
             //        ListElement {
             //            label: "Toyota"
             //            value: 10.9
             //        }
             //        // and so on...
             //    }
             }

plugins/declarative/plugin.cpp +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$
             **
             ****************************************************************************/
             #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 <QHPieModelMapper>
             #include <QVPieModelMapper>
             #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");
                     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<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",
+                                                      QLatin1String("Trying to create uncreatable: QPieSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                       QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                       QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                       QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAxis>(uri, 1, 0, "Axis",
                                                       QLatin1String("Trying to create uncreatable: Axis."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: XYModelMapper."));
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))

src/charttablemodel.cpp +3 -18

             /****************************************************************************
             **
             ** 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 "charttablemodel.h"
             #include <QVector>
-            #include <QTime>
             #include <QRect>
             #include <QColor>
             QTCOMMERCIALCHART_USE_NAMESPACE
             ChartTableModel::ChartTableModel(QObject *parent) :
-                QAbstractTableModel(parent)
+                QAbstractTableModel(parent),
+                m_columnCount(0),
+                m_rowCount(0)
             {
-                qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
-                m_columnCount = 2;
-                m_rowCount = 0;
-                // m_data
-                for (int i = 0; i < m_rowCount; i++) {
-                    QVector<QVariant>* dataVec = new QVector<QVariant>(m_columnCount);
-                    for (int k = 0; k < dataVec->size(); k++) {
-                        if (k%2 == 0)
-                            dataVec->replace(k, i * 50 + qrand()%20);
-                        else
-                            dataVec->replace(k, qrand()%100);
-                    m_data.append(dataVec);
             }
             int ChartTableModel::rowCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
                 return m_data.count();
             }
             int ChartTableModel::columnCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
                 return m_columnCount;
             }
             QVariant ChartTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
             {
                 if (role != Qt::DisplayRole)
                     return QVariant();
                 if (orientation == Qt::Horizontal) {
                     if (section % 2 == 0)
                         return "x";
                     else
                         return "y";
                 } else {
                     return QString("%1").arg(section + 1);
                 }
             }
             QVariant ChartTableModel::data(const QModelIndex &index, int role) const
             {
                 if (role == Qt::DisplayRole) {
                     return m_data[index.row()]->at(index.column());
                 } else if (role == Qt::EditRole) {
                     return m_data[index.row()]->at(index.column());
                 }
                 return QVariant();
             }
             bool ChartTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
             {
                 if (index.isValid() && role == Qt::EditRole) {
                     m_data[index.row()]->replace(index.column(), value);
                     emit dataChanged(index, index);
                     return true;
                 }
                 return false;
             }
             void ChartTableModel::insertColumn(int column, const QModelIndex &parent)
             {
                 beginInsertColumns(parent, column, column);
                 m_columnCount++;
                 endInsertColumns();
             }
             void ChartTableModel::insertRow(int row, const QModelIndex &parent)
             {
                 beginInsertRows(parent, row, row);
                 QVector<QVariant>* dataVec = new QVector<QVariant>(m_columnCount);
                 m_data.insert(row, dataVec);
                 endInsertRows();
             }
             //bool ChartTableModel::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)
             {
                 beginRemoveRows(parent, row, row + count - 1);
                 bool removed(false);
                 for (int i(row); i < (row + count); i++) {
                     m_data.removeAt(i);
                     removed = true;
                 }
                 endRemoveRows();
                 return removed;
             }
             Qt::ItemFlags ChartTableModel::flags ( const QModelIndex & index ) const
             {
                 return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
             }
             #include "moc_charttablemodel.cpp"

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