HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1162:e5feb9c12a84

Added declarative model for bar series

Tero Ahola -

r1162:e5feb9c12a84

parent child

Context file:

r1162:e5feb9c12a84

Collapse all files

demos/qmlchart/qml/qmlchart/View1.qml +30 -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
+                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
                     PieSeries {
+                        id: pieSeries
                         model: PieModel {
                             id: pieModel
-                            PieSlice { label: "Volkswagen"; value: 13.5 }
+                            // TODO: initializing properties does not work at the moment, see DeclarativePieModel::append
+                            // TODO: explode range, color, border color, border thickness, font, ..
+                            PieSlice { exploded: true; 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 }
                         }
                     }
                 }
+                Timer {
+                    repeat: true
+                    interval: 2000
+                    running: true
+                    onTriggered: {
+                        changeSliceExploded(__explodedIndex);
+                        __explodedIndex = (__explodedIndex + 1) % pieModel.count;
+                        changeSliceExploded(__explodedIndex);
+                    }
+                }
+                function changeSliceExploded(index) {
+                    if (index >= 0 && index < pieModel.count) {
+                        pieSeries.slice(index).exploded = !pieSeries.slice(index).exploded;
+                    }
+                }
                 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: button.state == "" ? "Show others" : "Hide others"
                     }
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
                             if (button.state == "") {
                                 // The share of "others" was enabled -> append the data into the model
                                 // TODO: this should also be doable by redefining the range inside the model
                                 button.state = "show";
                                 pieModel.append(["Others", 52.0]);
                             } else {
                                 // The share of "others" was disabled -> remove the data from the model
                                 // TODO: this should also be doable by redefining the range inside the model
                                 button.state = "";
                                 pieModel.removeRow(pieModel.count - 1);
+                                // TODO: removeAll("label") ?
                             }
                         }
                     }
                 }
                 // TODO: Optional syntax for defining models for different series. Is this really needed?
             //    ChartModel {
             //        id: chartModel
             //        ChartElement { column1: "Volkswagen"; column2: 13.5; column3: 1.2 }
             //        ChartElement { column1: "Toyota"; column2: 10.9; column3: 2.5 }
             //    }
             //    // column3 not used by pie series
             //    PieSeries {
             //        model: chartModel
-            //        mappings: [ {"column1":"label"}, {"column2":"value"} ]
+            //        modelMapping: PieMapping {
+            //            labels: 0 // undefined by default
+            //            values: 1 // undefined by default
+            //            first: 0  // 0 by default
+            //            count: 10 // "Undefined" by default
+            //            orientation: PieMapping.Vertical // Vertical by default
+            //        }
             //    }
                 // 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/View3.qml +13 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$
             **
             ****************************************************************************/
             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
                     legend: ChartView.LegendTop
                     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: russianModel
                         lowerModel: zerosModel
                     }
                     AreaSeries {
                         name: "Swedish"
                         upperModel: swedishModel
                         lowerModel: zerosModel
                     }
                     AreaSeries {
                         name: "Finnish"
                         upperModel: finnishModel
                         lowerModel: zerosModel
                     }
                 }
+                // TODO: optional implementation with generic ChartModel
+            //    AreaSeries {
+            //        model: chartModel
+            //        modelMapping: XyMapping {
+            //            xValues: 0 // undefined by default
+            //            yValues: 1 // undefined by default
+            //            first: 0  // 0 by default
+            //            count: 10 // "Undefined" by default
+            //            orientation: XyMapping.Vertical // Vertical by default
+            //        }
+            //    }
                 XYModel {
                     id: zerosModel
                     XyPoint { x: 0; y: 0 }
                     XyPoint { x: 1; y: 0 }
                     XyPoint { x: 2; y: 0 }
                     XyPoint { x: 3; y: 0 }
                     XyPoint { x: 4; y: 0 }
                     XyPoint { x: 5; y: 0 }
                     XyPoint { x: 6; y: 0 }
                     XyPoint { x: 7; y: 0 }
                     XyPoint { x: 8; y: 0 }
                     XyPoint { x: 9; y: 0 }
                     XyPoint { x: 10; y: 0 }
                     XyPoint { x: 11; y: 0 }
                 }
                 XYModel {
                     id: russianModel
                     XyPoint { x: 0; y: 1 }
                     XyPoint { x: 1; y: 1 }
                     XyPoint { x: 2; y: 1 }
                     XyPoint { x: 3; y: 1 }
                     XyPoint { x: 4; y: 1 }
                     XyPoint { x: 5; y: 0 }
                     XyPoint { x: 6; y: 1 }
                     XyPoint { x: 7; y: 1 }
                     XyPoint { x: 8; y: 4 }
                     XyPoint { x: 9; y: 3 }
                     XyPoint { x: 10; y: 2 }
                     XyPoint { x: 11; y: 1 }
                 }
                 XYModel {
                     id: swedishModel
                     XyPoint { x: 0; y: 1 }
                     XyPoint { x: 1; y: 1 }
                     XyPoint { x: 2; y: 3 }
                     XyPoint { x: 3; y: 3 }
                     XyPoint { x: 4; y: 2 }
                     XyPoint { x: 5; y: 0 }
                     XyPoint { x: 6; y: 2 }
                     XyPoint { x: 7; y: 1 }
                     XyPoint { x: 8; y: 2 }
                     XyPoint { x: 9; y: 1 }
                     XyPoint { x: 10; y: 3 }
                     XyPoint { x: 11; y: 3 }
                 }
                 XYModel {
                     id: finnishModel
                     XyPoint { x: 0; y: 0 }
                     XyPoint { x: 1; y: 0 }
                     XyPoint { x: 2; y: 0 }
                     XyPoint { x: 3; y: 0 }
                     XyPoint { x: 4; y: 0 }
                     XyPoint { x: 5; y: 0 }
                     XyPoint { x: 6; y: 1 }
                     XyPoint { x: 7; y: 0 }
                     XyPoint { x: 8; y: 0 }
                     XyPoint { x: 9; y: 0 }
                     XyPoint { x: 10; y: 0 }
                     XyPoint { x: 11; y: 1 }
                 }
             }

demos/qmlchart/qml/qmlchart/View5.qml +41 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 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" ]
-                        // data implementation missing
+                        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: "Bib"; 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 +48 -32

             /****************************************************************************
             **
             ** 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 "qchart.h"
+            #include <QBarSet>
-            #include "qbarseries.h"
-            #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
+            DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
-                QDeclarativeItem(parent)
+                QBarSet("", parent)
             {
-                setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
-            void DeclarativeBarSeries::componentComplete()
+            QVariantList DeclarativeBarSet::values()
             {
+                QVariantList values;
+                for (int i(0); i < count(); i++)
+                    values.append(QVariant(at(i)));
+                return values;
             }
-            void DeclarativeBarSeries::setBarCategories(QStringList categories)
+            void DeclarativeBarSet::setValues(QVariantList values)
             {
-                m_categories = categories;
+                while (count())
+                    remove(count() - 1);
-                if (m_series) {
+                for (int i(0); i < values.count(); i++) {
-                    delete m_series;
+                    if (values.at(i).canConvert(QVariant::Double))
-                    m_series = 0;
+                        append(values[i].toDouble());
                 }
+            }
-                DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
+            DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
-                if (declarativeChart) {
+                QBarSeries(parent)
-                    QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-                    Q_ASSERT(chart);
-            //        m_series = new QBarSeries(m_categories);
+            void DeclarativeBarSeries::classBegin()
-                    m_series = new QBarSeries();
-                    m_series->setCategories(m_categories);
-                    // TODO: use data from model
+            void DeclarativeBarSeries::componentComplete()
-                    QBarSet *set0 = new QBarSet("Bub");
-                    QBarSet *set1 = new QBarSet("Bob");
+                if (model())
-                    QBarSet *set2 = new QBarSet("Guybrush");
+                    setModelMapping(0, 1, 1, Qt::Vertical);
+            }
-                    *set0 << 1 << 2 << 3 << 4 << 5 << 6;
+            bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model)
-                    *set1 << 5 << 1 << 2 << 4 << 1 << 7;
-                    *set2 << 3 << 5 << 8 << 13 << 8 << 5;
+                QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
+                bool value(false);
+                if (m) {
+                    value = 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;
+            }
-                    m_series->appendBarSet(set0);
+            DeclarativeBarModel *DeclarativeBarSeries::declarativeModel()
-                    m_series->appendBarSet(set1);
-                    m_series->appendBarSet(set2);
+                return qobject_cast<DeclarativeBarModel *>(model());
+            }
-                    chart->addSeries(m_series);
+            void DeclarativeBarSeries::setBarCategories(QStringList categories)
+            {
+                setCategories(categories);
             }
             QStringList DeclarativeBarSeries::barCategories()
             {
-                return m_categories;
+                return categories();
             }
             #include "moc_declarativebarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativebarseries.h +21 -4

             /****************************************************************************
             **
             ** 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>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QBarSeries;
-            class DeclarativeBarSeries : public QDeclarativeItem
+            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
+            {
+                Q_OBJECT
+                Q_INTERFACES(QDeclarativeParserStatus)
+                Q_PROPERTY(DeclarativeBarModel *model READ declarativeModel WRITE setDeclarativeModel)
                 Q_PROPERTY(QStringList barCategories READ barCategories WRITE setBarCategories)
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
             public: // from QDeclarativeParserStatus
+                void classBegin();
                 void componentComplete();
             public:
+                bool setDeclarativeModel(DeclarativeBarModel *model);
+                DeclarativeBarModel *declarativeModel();
                 void setBarCategories(QStringList categories);
                 QStringList barCategories();
             Q_SIGNALS:
             public Q_SLOTS:
             public:
-                QChart *m_chart;
-                QBarSeries *m_series;
-                QStringList m_categories;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

qmlplugin/declarativemodel.cpp +65 -26

             /****************************************************************************
             **
             ** 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 (base) ///////////////////
+            DeclarativeTableModel::DeclarativeTableModel(QObject *parent) :
+                ChartTableModel(parent)
+            {
+            }
+            void DeclarativeTableModel::classBegin()
+            {
+            }
+            void DeclarativeTableModel::componentComplete()
+            {
+                foreach (QObject *child, children())
+                    appendToModel(child);
+            }
+            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::appendToModel(QObject *object)
+            {
+                if (qobject_cast<DeclarativeBarModel *>(this)) {
+                    DeclarativeBarModel *model = qobject_cast<DeclarativeBarModel *>(this);
+                    model->append(qobject_cast<QBarSet *>(object));
+                } else if (qobject_cast<DeclarativePieModel *>(this)) {
+                    DeclarativePieModel *model = qobject_cast<DeclarativePieModel *>(this);
+                    model->append(qobject_cast<QPieSlice *>(object));
+                } else if (qobject_cast<DeclarativeXyModel *>(this)) {
+                    DeclarativeXyModel *model = qobject_cast<DeclarativeXyModel *>(this);
+                    model->append(qobject_cast<DeclarativeXyPoint *>(object));
+                }
+            }
             ////////////// XY model ///////////////////////
             DeclarativeXyModel::DeclarativeXyModel(QObject *parent) :
-                ChartTableModel(parent)
+                DeclarativeTableModel(parent)
             {
             }
             void DeclarativeXyModel::append(DeclarativeXyPoint* point)
             {
             //    qDebug() << "DeclarativeXyModel::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);
             }
             void DeclarativeXyModel::append(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);
                             append(point);
                         } else {
                             qWarning() << "Illegal y value";
                         }
                     } else {
                         bool ok(false);
                         x = points.at(i).toReal(&ok);
                         if (!ok) {
                             qWarning() << "Illegal x value";
                         }
                     }
                 }
             }
-            QDeclarativeListProperty<DeclarativeXyPoint> DeclarativeXyModel::points()
-                return QDeclarativeListProperty<DeclarativeXyPoint>(this, 0, &DeclarativeXyModel::appendPoint);
-            void DeclarativeXyModel::appendPoint(QDeclarativeListProperty<DeclarativeXyPoint> *list,
-                                                 DeclarativeXyPoint *point)
-                DeclarativeXyModel *model = qobject_cast<DeclarativeXyModel *>(list->object);
-                if (model)
-                    model->append(point);
-                else
-                    qWarning() << "Illegal point item";
             ////////////// Pie model ///////////////////////
             DeclarativePieModel::DeclarativePieModel(QObject *parent) :
-                ChartTableModel(parent)
+                DeclarativeTableModel(parent)
             {
             }
             void DeclarativePieModel::append(QPieSlice* slice)
             {
             //    qDebug() << "DeclarativePieModel::append:" << slice->label() << " " << slice->value();
                 insertRow(rowCount());
                 setData(createIndex(rowCount() - 1, 0), slice->value());
                 setData(createIndex(rowCount() - 1, 1), slice->label());
             }
             void DeclarativePieModel::append(QVariantList slices)
             {
             //    qDebug() << "append:" << slices;
                 QString label = "";
                 for (int i(0); i < slices.count(); i++) {
                     if (i % 2) {
                         bool ok(false);
                         qreal value = slices.at(i).toReal(&ok);
                         if (ok) {
                             QPieSlice *slice = new QPieSlice(value, label);
                             append(slice);
+                            // TODO: how to copy the properties to the newly added slice?
+                            // (DeclarativePieModel::append only copies the label and value to the model)
+            //                QPieSlice *addedSlice = append(slice);
+            //                addedSlice->setExploded(slice->isExploded());
                         } else {
                             qWarning() << "Illegal slice item";
                         }
                     } else {
                         label = slices.at(i).toString();
                     }
                 }
             }
-            QDeclarativeListProperty<QPieSlice> DeclarativePieModel::slices()
+            ////////////// Bar model ///////////////////////
+            DeclarativeBarModel::DeclarativeBarModel(QObject *parent) :
+                DeclarativeTableModel(parent)
             {
-                return QDeclarativeListProperty<QPieSlice>(this, 0, &DeclarativePieModel::appendSlice);
             }
-            void DeclarativePieModel::appendSlice(QDeclarativeListProperty<QPieSlice> *list,
+            void DeclarativeBarModel::append(QBarSet* barSet)
-                                                  QPieSlice *slice)
             {
-                DeclarativePieModel *pieModel = qobject_cast<DeclarativePieModel *>(list->object);
+                insertColumn(columnCount());
-                if (pieModel)
+                for (int i(0); i < barSet->count(); i++) {
-                    pieModel->append(slice);
+                    if (rowCount() < (i + 1))
-                else
+                        insertRow(rowCount());
-                    qWarning() << "Illegal slice item";
+                    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 +38 -14

             /****************************************************************************
             **
             ** 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.h"
+            #include <QPieSlice>
             #include "../src/charttablemodel.h" // TODO
+            #include <QBarSet>
             #include <QDeclarativeListProperty>
             #include <QVariant>
+            #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class DeclarativeXyModel : public ChartTableModel
+            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();
+            public: // from QDeclarativeParserStatus
+                void classBegin();
+                void componentComplete();
+            public Q_SLOTS:
+                static void appendModelChild(QDeclarativeListProperty<QObject> *list,
+                                             QObject *element);
+            private:
+                void appendToModel(QObject *object);
+            };
+            class DeclarativeXyModel : public DeclarativeTableModel
             {
                 Q_OBJECT
-                Q_PROPERTY(QDeclarativeListProperty<DeclarativeXyPoint> points READ points)
-                Q_CLASSINFO("DefaultProperty", "points")
             public:
                 explicit DeclarativeXyModel(QObject *parent = 0);
-                QDeclarativeListProperty<DeclarativeXyPoint> points();
             public Q_SLOTS:
                 void append(DeclarativeXyPoint* point);
                 void append(QVariantList points);
-                static void appendPoint(QDeclarativeListProperty<DeclarativeXyPoint> *list,
-                                        DeclarativeXyPoint *element);
             };
+            class DeclarativePieModel : public DeclarativeTableModel
-            class DeclarativePieModel : public ChartTableModel
             {
                 Q_OBJECT
-                Q_PROPERTY(QDeclarativeListProperty<QPieSlice> slices READ slices)
-                Q_CLASSINFO("DefaultProperty", "slices")
             public:
                 explicit DeclarativePieModel(QObject *parent = 0);
-                QDeclarativeListProperty<QPieSlice> slices();
             public Q_SLOTS:
                 void append(QPieSlice* slice);
                 void append(QVariantList slices);
-                static void appendSlice(QDeclarativeListProperty<QPieSlice> *list,
+            };
-                                        QPieSlice *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/declarativepieseries.cpp +9 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 "declarativepieseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include <qdeclarativelist.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativePieSeries::DeclarativePieSeries(QObject *parent) :
                 QPieSeries(parent)
             {
             }
+            QPieSlice *DeclarativePieSeries::slice(int index)
+            {
+                QList<QPieSlice*> sliceList = slices();
+                if (index < sliceList.count())
+                    return sliceList[index];
+                return 0;
+            }
             bool DeclarativePieSeries::setPieModel(DeclarativePieModel *model)
             {
                 QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
                 bool value(false);
                 if (m) {
                     value = QPieSeries::setModel(m);
                     setModelMapping(0, 1, Qt::Vertical);
                 } else {
                     qWarning("DeclarativePieSeries: Illegal model");
                 }
                 return value;
             }
             DeclarativePieModel *DeclarativePieSeries::pieModel()
             {
                 return qobject_cast<DeclarativePieModel *>(model());
             }
             #include "moc_declarativepieseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativepieseries.h +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEPIESERIES_H
             #define DECLARATIVEPIESERIES_H
             #include "qchartglobal.h"
             #include "qpieslice.h"
             #include "qpieseries.h"
             #include <QDeclarativeListProperty>
             #include <QAbstractItemModel>
             #include <QVariant>
             #include "declarativemodel.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativePieSeries : public QPieSeries
             {
                 Q_OBJECT
                 Q_PROPERTY(DeclarativePieModel *model READ pieModel WRITE setPieModel)
             public:
                 explicit DeclarativePieSeries(QObject *parent = 0);
+            public:
+                Q_INVOKABLE QPieSlice *slice(int index);
             public Q_SLOTS:
             public:
                 bool setPieModel(DeclarativePieModel *model);
                 DeclarativePieModel *pieModel();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEPIESERIES_H

qmlplugin/declarativexyseries.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 "DeclarativeXySeries.h"
             #include "declarativexyseries.h"
             #include "qxyseries.h"
             #include "declarativechart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeXySeries::DeclarativeXySeries()
             {
             }
             DeclarativeXySeries::~DeclarativeXySeries()
             {
             }
             bool DeclarativeXySeries::setDeclarativeModel(DeclarativeXyModel *model)
             {
                 QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
                 bool value(false);
                 if (m) {
                     // All the inherited objects must be of type QXYSeries, so it is safe to cast
                     QXYSeries *series = reinterpret_cast<QXYSeries *>(this);
-                    series->setModel(m);
+                    value = series->setModel(m);
                     series->setModelMapping(0, 1, Qt::Vertical);
                 } else {
                     qWarning("DeclarativeXySeries: Illegal model");
                 }
                 return value;
             }
             DeclarativeXyModel *DeclarativeXySeries::declarativeModel()
             {
                 // All the inherited objects must be of type QXYSeries, so it is safe to cast
                 QXYSeries *series = reinterpret_cast<QXYSeries *>(this);
                 Q_ASSERT(series);
                 return qobject_cast<DeclarativeXyModel *>(series->model());
             }
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/plugin.cpp +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$
             **
             ****************************************************************************/
             #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 "declarativepiemodel.h"
             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 type: 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");
-                    // TODO: a declarative model for each type
                     qmlRegisterType<DeclarativePieModel>(uri, 1, 0, "PieModel");
                     qmlRegisterType<DeclarativeXyModel>(uri, 1, 0, "XYModel");
+                    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))

src/barchart/qbarset.cpp +3 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 "qbarset.h"
             #include "qbarset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSet
                 \brief part of QtCommercial chart API.
                 QBarSet represents one set of bars. Set of bars contains one data value for each category.
                 First value of set is assumed to belong to first category, second to second category and so on.
                 If set has fewer values than there are categories, then the missing values are assumed to be
                 at the end of set. For missing values in middle of a set, numerical value of zero is used.
                 \mainclass
                 \sa QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \fn void QBarSet::clicked(QString category)
                 \brief signals that set has been clicked
                 Parameter \a category describes on which category was clicked
             */
             /*!
                 \fn void QBarSet::hovered(bool status)
                 \brief signals that mouse has hovered over the set. If \a status is true, then mouse was entered. If \a status is false, then mouse was left.
                 The signal is emitted if mouse is hovered on top of set
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 Constructs QBarSet with a name of \a name and with parent of \a parent
             */
             QBarSet::QBarSet(const QString name, QObject *parent)
                 : QObject(parent)
                 ,d_ptr(new QBarSetPrivate(name,this))
             {
             }
             /*!
                 Destroys the barset
             */
             QBarSet::~QBarSet()
             {
                 // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 Sets new \a name for set.
             */
             void QBarSet::setName(const QString name)
             {
                 d_ptr->m_name = name;
             }
             /*!
                 Returns name of the set.
             */
             QString QBarSet::name() const
             {
                 return d_ptr->m_name;
             }
             /*!
                 Appends new value \a value to the end of set.
             */
             void QBarSet::append(const qreal value)
             {
                 d_ptr->m_values.append(value);
                 emit d_ptr->restructuredBars();
             }
             /*!
                 Appends new value \a value to the end of set.
             */
             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 append(value);
                 return *this;
             }
             /*!
                 Inserts new \a value on the \a index position.
                 The value that is currently at this postion is moved to postion index + 1
                 \sa remove()
             */
             void QBarSet::insert(const int index, const qreal value)
             {
                 d_ptr->m_values.insert(index, value);
             //    emit d_ptr->updatedBars();
             }
             /*!
                 Removes the value specified by \a index
                 \sa insert()
             */
             void QBarSet::remove(const int index)
             {
                 d_ptr->m_values.removeAt(index);
             //    emit d_ptr->updatedBars();
             }
             /*!
                 Sets a new value \a value to set, indexed by \a index
             */
             void QBarSet::replace(const int index, const qreal value)
             {
                 d_ptr->m_values.replace(index,value);
                 emit d_ptr->updatedBars();
             }
             /*!
                 Returns value of set indexed by \a index
             */
             qreal QBarSet::at(const int index) const
             {
+                if (index < 0 || index >= d_ptr->m_values.count())
+                    return 0.0;
                 return d_ptr->m_values.at(index);
             }
             /*!
                 Returns value of set indexed by \a index
             */
             qreal QBarSet::operator [] (int index) const
             {
                 return d_ptr->m_values.at(index);
             }
             /*!
                 Returns count of values in set.
             */
             int QBarSet::count() const
             {
                 return d_ptr->m_values.count();
             }
             /*!
                 Returns sum of all values in barset.
             */
             qreal QBarSet::sum() const
             {
                 qreal total(0);
                 for (int i=0; i < d_ptr->m_values.count(); i++) {
                     total += d_ptr->m_values.at(i);
                 }
                 return total;
             }
             /*!
                 Sets pen for set. Bars of this set are drawn using \a pen
             */
             void QBarSet::setPen(const QPen &pen)
             {
                   if(d_ptr->m_pen!=pen){
                       d_ptr->m_pen = pen;
                       emit d_ptr->updatedBars();
                   }
             }
             /*!
                 Returns pen of the set.
             */
             QPen QBarSet::pen() const
             {
                 return d_ptr->m_pen;
             }
             /*!
                 Sets brush for the set. Bars of this set are drawn using \a brush
             */
             void QBarSet::setBrush(const QBrush &brush)
             {
                 if(d_ptr->m_brush!=brush){
                   d_ptr->m_brush = brush;
                   emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns brush of the set.
             */
             QBrush QBarSet::brush() const
             {
                 return d_ptr->m_brush;
             }
             /*!
                 Sets \a pen of the values that are drawn on top of this barset
             */
             void QBarSet::setLabelPen(const QPen &pen)
             {
                 if(d_ptr->m_labelPen!=pen){
                     d_ptr->m_labelPen = pen;
                     emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns pen of the values that are drawn on top of this barset
             */
             QPen QBarSet::labelPen() const
             {
                 return d_ptr->m_labelPen;
             }
             /*!
                 Sets \a brush of the values that are drawn on top of this barset
             */
             void QBarSet::setLabelBrush(const QBrush &brush)
             {
                 if(d_ptr->m_labelBrush!=brush){
                     d_ptr->m_labelBrush = brush;
                     emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns brush of the values that are drawn on top of this barset
             */
             QBrush QBarSet::labelBrush() const
             {
                 return d_ptr->m_labelBrush;
             }
             /*!
                 Sets the \a font for values that are drawn on top of this barset
             */
             void QBarSet::setLabelFont(const QFont &font)
             {
                 if(d_ptr->m_labelFont!=font) {
                     d_ptr->m_labelFont = font;
                     emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns the pen for values that are drawn on top of this set
             */
             QFont QBarSet::labelFont() const
             {
                 return d_ptr->m_labelFont;
             }
             /*!
                 Sets visibility of bar labels. If \a visible is true, labels are drawn on top of barsets.
             */
             void QBarSet::setLabelsVisible(bool visible)
             {
                 if(d_ptr->m_labelsVisible!=visible) {
                     d_ptr->m_labelsVisible = visible;
                     emit d_ptr->labelsVisibleChanged(visible);
                 }
             }
             /*!
                 Returns the visibility of values
             */
             bool QBarSet::labelsVisible() const
             {
                 return d_ptr->m_labelsVisible;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSetPrivate::QBarSetPrivate(const QString name, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
                 m_name(name),
                 m_labelsVisible(false)
             {
             }
             QBarSetPrivate::~QBarSetPrivate()
             {
             }
             #include "moc_qbarset.cpp"
             #include "moc_qbarset_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QBARSET_H
             #define QBARSET_H
             #include <qchartglobal.h>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSetPrivate;
             class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
             {
                 Q_OBJECT
+                Q_PROPERTY(QString name READ name WRITE setName)
             public:
                 explicit QBarSet(const QString name, QObject *parent = 0);
                 virtual ~QBarSet();
                 void setName(const QString name);
                 QString name() const;
             // TODO:
             //    void append(const QPointF value);         // Appends bar with x-value
             //    void append(const QList<QPointF> value);  // Same with list
                 void append(const qreal value);             // TODO: change so, that count becomes x-value
             // TODO:
             //    void append(const QList<qreal> values);   // Append list of values. Using index as x-value
                 QBarSet& operator << (const qreal &value);  // TODO: change implementations so, that count becomes x-value
             // TODO:
             //    QBarSet& operator << (const QPointF &value);  // Appends bar with x-value
                 void insert(const int index, const qreal value); // TODO: internal reindexing (what happens, if there are points with real x values?)
                 void remove(const int index);                    // TODO: internal reindexing (what happens, if there are points with real x values?)
                 void replace(const int index, const qreal value);
                 qreal at(const int index) const;
                 qreal operator [] (int index) const;
                 int count() const;
                 qreal sum() const;
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setLabelPen(const QPen &pen);
                 QPen labelPen() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void setLabelsVisible(bool visible = true);
                 bool labelsVisible() const;
             Q_SIGNALS:
                 void clicked(QString category);
                 void hovered(bool status);
             private:
                 QScopedPointer<QBarSetPrivate> d_ptr;
                 Q_DISABLE_COPY(QBarSet)
                 friend class QBarSeries;
                 friend class BarLegendMarker;
                 friend class BarChartItem;
                 friend class QBarSeriesPrivate;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSET_H

src/charttablemodel.cpp +4 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "charttablemodel.h"
             #include <QVector>
             #include <QTime>
             #include <QRect>
             #include <QColor>
             QTCOMMERCIALCHART_USE_NAMESPACE
             ChartTableModel::ChartTableModel(QObject *parent) :
                 QAbstractTableModel(parent)
             {
                 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 (orientation == Qt::Horizontal) {
+                    if (section % 2 == 0)
-                    if (section%2 == 0)
                         return "x";
                     else
                         return "y";
+                } else {
-                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::insertRow(int row, const QModelIndex &parent)
             {
                 Q_UNUSED(parent)
                 beginInsertRows(QModelIndex(), 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"

src/piechart/qpieslice.h +3 -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 QPIESLICE_H
             #define QPIESLICE_H
             #include <qchartglobal.h>
             #include <QObject>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieSliceData;
             class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY changed)
+                Q_PROPERTY(QString label READ label WRITE setLabel)
-                Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY changed)
+                Q_PROPERTY(qreal value READ value WRITE setValue)
+                Q_PROPERTY(bool exploded READ isExploded WRITE setExploded)
             public:
                 explicit QPieSlice(QObject *parent = 0);
                 QPieSlice(qreal value, QString label, QObject *parent = 0);
                 virtual ~QPieSlice();
                 void setValue(qreal value);
                 qreal value() const;
                 void setLabel(QString label);
                 QString label() const;
                 void setLabelVisible(bool visible = true);
                 bool isLabelVisible() const;
                 void setExploded(bool exploded = true);
                 bool isExploded() const;
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setLabelPen(const QPen &pen);
                 QPen labelPen() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void setLabelArmLengthFactor(qreal factor);
                 qreal labelArmLengthFactor() const;
                 void setExplodeDistanceFactor(qreal factor);
                 qreal explodeDistanceFactor() const;
                 qreal percentage() const;
                 qreal startAngle() const;
                 qreal endAngle() const;
             Q_SIGNALS:
                 void clicked();
                 void hovered(bool state);
                 void changed();
             private:
                 friend class PieSliceData;
                 PieSliceData * const d;
                 Q_DISABLE_COPY(QPieSlice)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QPIESLICE_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