HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1189:88d7235253d9

Removed usage of model in QML pie example

Tero Ahola -

r1189:88d7235253d9

parent child

Context file:

r1189:88d7235253d9

Collapse all files

demos/qmlchart/qml/qmlchart/View1.qml +16 -10

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

qmlplugin/declarativechart.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 "declarativechart.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this)),
-                  m_legend(LegendDisabled)
+                  m_legend(LegendTop)
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
                 m_chart->axisX()->setNiceNumbersEnabled(false);
             }
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
             }
             void DeclarativeChart::childEvent(QChildEvent *event)
             {
                 if (event->type() == QEvent::ChildAdded) {
                     if (qobject_cast<QAbstractSeries *>(event->child())) {
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(event->child()));
                     }
                 }
             }
             void DeclarativeChart::componentComplete()
             {
             //    qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
                 foreach(QObject *child, children()) {
                     if (qobject_cast<QAbstractSeries *>(child)) {
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));
                     }
                 }
             //    qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
                 QDeclarativeItem::componentComplete();
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
             //    qDebug() << "DeclarativeChart::geometryChanged" << newGeometry.width() << newGeometry.height();
                 Q_UNUSED(oldGeometry)
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         m_chart->resize(newGeometry.width(), newGeometry.height());
                     }
                 }
             }
             void DeclarativeChart::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 // TODO: optimized?
                 painter->setRenderHint(QPainter::Antialiasing, true);
             }
             void DeclarativeChart::setAnimationOptions(QChart::AnimationOption animations)
             {
                 m_chart->setAnimationOptions(animations);
             }
             QChart::AnimationOption DeclarativeChart::animationOptions()
             {
                 if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
                     return QChart::AllAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
                     return QChart::GridAxisAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
                     return QChart::SeriesAnimations;
                 else
                     return QChart::NoAnimation;
             }
             void DeclarativeChart::setLegend(ChartLegend legend)
             {
                 if (legend != m_legend) {
                     m_legend = legend;
                     switch (m_legend) {
                     case LegendDisabled:
                         m_chart->legend()->setVisible(false);
                         break;
                     case LegendTop:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentTop);
                         break;
                     case LegendBottom:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentBottom);
                         break;
                     case LegendLeft:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentLeft);
                         break;
                     case LegendRight:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentRight);
                         break;
                     default:
                         m_chart->legend()->setVisible(false);
                         break;
                     }
                 }
             }
             DeclarativeChart::ChartLegend DeclarativeChart::legend()
             {
                 return m_legend;
             }
             QAxis *DeclarativeChart::axisX()
             {
                 return m_chart->axisX();
             }
             QAxis *DeclarativeChart::axisY()
             {
                 return m_chart->axisY();
             }
             QVariantList DeclarativeChart::axisXLabels()
             {
                 QVariantList labels;
                 foreach (qreal value, m_chart->axisX()->categories()->values()) {
             //        qDebug() << "Label for" << value << "is" << m_chart->axisX()->categories()->label(value);
                     labels.append(value);
                     labels.append(m_chart->axisX()->categories()->label(value));
                 }
                 return labels;
             }
             void DeclarativeChart::setAxisXLabels(QVariantList list)
             {
                 QVariant value(QVariant::Invalid);
                 foreach (QVariant element, list) {
                     if (value.isValid() && element.type() == QVariant::String) {
                         m_chart->axisX()->categories()->insert(value.toDouble(), element.toString());
                         value = QVariant(QVariant::Invalid);
                     } else {
                         if (element.canConvert(QVariant::Double))
                             value = element;
                     }
                 }
             }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativepieseries.cpp +10 -11

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativepieseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include <qdeclarativelist.h>
             #include "qpiemodelmapper.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativePieSeries::DeclarativePieSeries(QObject *parent) :
                 QPieSeries(parent)
             {
                 // TODO: set default model on init?
-                setModel(new DeclarativeTableModel());
+            //    setModel(new DeclarativeTableModel());
-                // Set default mapper parameters to allow easy to use PieSeries api
+                // TODO: Set default mapper parameters to allow easy to use PieSeries api?
                 QPieModelMapper *mapper = new QPieModelMapper();
                 mapper->setMapLabels(0);
                 mapper->setMapValues(1);
                 mapper->setOrientation(Qt::Vertical);
                 mapper->setFirst(0);
                 mapper->setCount(-1);
                 setModelMapper(mapper);
             }
             void DeclarativePieSeries::classBegin()
             {
             }
             void DeclarativePieSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
-                    qDebug() << "pie child: " << child;
                     if (qobject_cast<QPieSlice *>(child)) {
-                        QPieSlice *slice = qobject_cast<QPieSlice *>(child);
+                        QPieSeries::append(qobject_cast<QPieSlice *>(child));
-                        QVariantList values;
-                        values.insert(modelMapper()->mapLabels(), slice->label());
-                        values.insert(modelMapper()->mapValues(), slice->value());
-                        DeclarativeTableModel *m = qobject_cast<DeclarativeTableModel *>(model());
-                        Q_ASSERT(m);
-                        m->append(values);
                     }
                 }
             }
             QDeclarativeListProperty<QPieSlice> DeclarativePieSeries::initialSlices()
             {
                 return QDeclarativeListProperty<QPieSlice>(this, 0, &DeclarativePieSeries::appendInitialSlices);
             }
-            QPieSlice *DeclarativePieSeries::slice(int index)
+            QPieSlice *DeclarativePieSeries::at(int index)
             {
                 QList<QPieSlice*> sliceList = slices();
                 if (index < sliceList.count())
                     return sliceList[index];
                 return 0;
             }
+            QPieSlice* DeclarativePieSeries::append(QString name, qreal value)
+            {
+                // TODO: parameter order is wrong, switch it:
+                return QPieSeries::append(value, name);
+            }
             void DeclarativePieSeries::setPieModel(DeclarativeTableModel *model)
             {
                 QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
                 if (m) {
                     QPieSeries::setModel(m);
                 } else {
                     qWarning("DeclarativePieSeries: Illegal model");
                 }
             }
             DeclarativeTableModel *DeclarativePieSeries::pieModel()
             {
                 return qobject_cast<DeclarativeTableModel *>(model());
             }
             #include "moc_declarativepieseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativepieseries.h +2 -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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEPIESERIES_H
             #define DECLARATIVEPIESERIES_H
             #include "qchartglobal.h"
             #include <QPieSlice>
             #include <QPieSeries>
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             #include <QAbstractItemModel>
             #include <QVariant>
             #include "declarativemodel.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(DeclarativeTableModel *model READ pieModel WRITE setPieModel)
                 Q_PROPERTY(QDeclarativeListProperty<QPieSlice> initialSlices READ initialSlices)
                 Q_CLASSINFO("DefaultProperty", "initialSlices")
             public:
                 explicit DeclarativePieSeries(QObject *parent = 0);
                 QDeclarativeListProperty<QPieSlice> initialSlices();
                 DeclarativeTableModel *pieModel();
                 void setPieModel(DeclarativeTableModel *model);
-                Q_INVOKABLE QPieSlice *slice(int index);
+                Q_INVOKABLE QPieSlice *at(int index);
+                Q_INVOKABLE QPieSlice* append(QString name, qreal value);
             public:
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendInitialSlices(QDeclarativeListProperty<QPieSlice> */*list*/, QPieSlice */*element*/) {}
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEPIESERIES_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