HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1513:f9a49067ae3b

QML BarSet data manipulation

Tero Ahola -

r1513:f9a49067ae3b

parent child

Context file:

r1513:f9a49067ae3b

Collapse all files

plugins/declarative/declarativebarseries.cpp +4 -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 "declarativebarseries.h"
             #include "declarativechart.h"
             #include <QBarSet>
             #include <QVBarModelMapper>
             #include <QHBarModelMapper>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
                 QBarSet("", parent)
             {
                 connect(this, SIGNAL(valuesAdded(int,int)), this, SLOT(handleCountChanged(int, int)));
                 connect(this, SIGNAL(valuesRemoved(int,int)), this, SLOT(handleCountChanged(int, int)));
             }
             void DeclarativeBarSet::handleCountChanged(int index, int count)
             {
                 Q_UNUSED(index)
                 Q_UNUSED(count)
                 emit countChanged(QBarSet::count());
             }
             QVariantList DeclarativeBarSet::values()
             {
                 QVariantList values;
                 for (int i(0); i < count(); i++)
-                    values.append(QVariant(at(i)));
+                    values.append(QVariant(QBarSet::at(i)));
                 return values;
             }
             void DeclarativeBarSet::setValues(QVariantList values)
             {
                 while (count())
                     remove(count() - 1);
                 for (int i(0); i < values.count(); i++) {
                     if (values.at(i).canConvert(QVariant::Double))
-                        append(values[i].toDouble());
+                        QBarSet::append(values[i].toDouble());
+                    else if (values.at(i).canConvert(QVariant::PointF))
+                        QBarSet::append(values[i].toPointF());
                 }
             }
             DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
                 QBarSeries(parent)
             {
                 connect(this, SIGNAL(barsetsAdded(QList<QBarSet*>)), this, SLOT(handleAdded(QList<QBarSet*>)));
                 connect(this, SIGNAL(barsetsRemoved(QList<QBarSet*>)), this, SLOT(handleRemoved(QList<QBarSet*>)));
             }
             void DeclarativeBarSeries::handleAdded(QList<QBarSet* > barsets)
             {
                 foreach(QBarSet *b, barsets) {
                     DeclarativeBarSet *barset = qobject_cast<DeclarativeBarSet *>(b);
                     emit added(barset);
                 }
             }
             void DeclarativeBarSeries::handleRemoved(QList<QBarSet* > barsets)
             {
                 foreach(QBarSet *b, barsets) {
                     DeclarativeBarSet *barset = qobject_cast<DeclarativeBarSet *>(b);
                     emit removed(barset);
                 }
             }
             void DeclarativeBarSeries::classBegin()
             {
             }
             void DeclarativeBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             DeclarativeGroupedBarSeries::DeclarativeGroupedBarSeries(QDeclarativeItem *parent) :
                 QGroupedBarSeries(parent)
             {
             }
             void DeclarativeGroupedBarSeries::classBegin()
             {
             }
             void DeclarativeGroupedBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeGroupedBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeGroupedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeGroupedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeGroupedBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QGroupedBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             DeclarativeStackedBarSeries::DeclarativeStackedBarSeries(QDeclarativeItem *parent) :
                 QStackedBarSeries(parent)
             {
             }
             void DeclarativeStackedBarSeries::classBegin()
             {
             }
             void DeclarativeStackedBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeStackedBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeStackedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeStackedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeStackedBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QStackedBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             DeclarativePercentBarSeries::DeclarativePercentBarSeries(QDeclarativeItem *parent) :
                 QPercentBarSeries(parent)
             {
             }
             void DeclarativePercentBarSeries::classBegin()
             {
             }
             void DeclarativePercentBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativePercentBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativePercentBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativePercentBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativePercentBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QPercentBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             #include "moc_declarativebarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativebarseries.h +4 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 DECLARATIVEBARSERIES_H
             #define DECLARATIVEBARSERIES_H
             #include "qchartglobal.h"
             #include <QGroupedBarSeries>
             #include <QStackedBarSeries>
             #include <QPercentBarSeries>
             #include <QBarSet>
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativeBarSet : public QBarSet
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
                 Q_INVOKABLE void append(qreal x, qreal y) { QBarSet::append(QPointF(x, y)); }
+                Q_INVOKABLE bool remove(const int index, const int count = 1) { return QBarSet::remove(index, count); }
+                Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
+                Q_INVOKABLE void replace(int index, qreal x, qreal y) { QBarSet::replace(index, QPointF(x, y)); }
+                Q_INVOKABLE QPointF at(int index) { return QBarSet::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
             private Q_SLOTS:
                 void handleCountChanged(int index, int count);
             };
             class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 void added(DeclarativeBarSet *barset);
                 void removed(DeclarativeBarSet *barset);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleAdded(QList<QBarSet* > barsets);
                 void handleRemoved(QList<QBarSet* > barsets);
             };
             class DeclarativeGroupedBarSeries : public QGroupedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeGroupedBarSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QGroupedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QGroupedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeStackedBarSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativePercentBarSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +8 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
             ChartView {
                 title: "Bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 axisXLabels: ["0", "2007", "1", "2008", "2", "2009", "3", "2010", "4", "2011", "5", "2012"]
                 property variant series: barSeries
                 BarSeries {
                     id: barSeries
                     name: "bar"
                     BarSet { label: "Bob"; values: [4, 7, 3, 10, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                         onHovered:                  console.log("barset.onHovered: " + status);
+                        onPenChanged:               console.log("barset.onPenChanged: " + pen);
+                        onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
+                        onLabelChanged:             console.log("barset.onLabelChanged: " + label);
+                        onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
+                        onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
+                        onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
+                        onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
+                        onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 8] }
                     BarSet { label: "James"; values: [3, 5, 8, 5, 4, 7] }
                     onNameChanged:              console.log("barSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("barSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("barSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("barSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("barSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("barSeries.onCountChanged: " + count);
                     onBarsetsAdded:             console.log("barSeries.onBarsetsAdded: " + sets); // There is no point in this signal on QML side
                     onAdded:                    console.log("barSeries.onBarsetAdded: " + barset);
                     onBarsetsRemoved:           console.log("barSeries.onBarsetsRemoved: " + sets); // There is no point in this signal on QML side
                     onRemoved:                  console.log("barSeries.onBarsetRemoved: " + barset);
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +14 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
             Flow {
                 id: flow
                 spacing: 5
                 flow: Flow.TopToBottom
                 property variant series
                 Button {
                     text: "visible"
                     onClicked: series.visible = !series.visible;
                 }
                 Button {
                     text: "labels visible"
                     onClicked: series.labelsVisible = !series.labelsVisible;
                 }
                 Button {
                     text: "bar width +"
                     onClicked: series.barWidth += 0.1;
                 }
                 Button {
                     text: "bar width -"
                     onClicked: series.barWidth -= 0.1;
                 }
                 Button {
                     text: "append set"
                     onClicked: {
                         var count = series.count;
                         series.append("set" + count, [0, 0.1 * count, 0.2 * count, 0.3 * count, 0.4 * count, 0.5 * count, 0.6 * count]);
                     }
                 }
                 Button {
                     text: "insert set"
                     onClicked: {
                         var count = series.count;
                         series.insert(count - 1, "set" + count, [0, 0.1 * count, 0.2 * count, 0.3 * count, 0.4 * count, 0.5 * count, 0.6 * count]);
                     }
                 }
                 Button {
                     text: "remove set"
                     onClicked: series.remove(series.at(series.count - 1));
                 }
                 Button {
                     text: "clear sets"
                     onClicked: series.clear();
                 }
+                Button {
+                    text: "set 1 append"
+                    onClicked: series.at(0).append(series.at(0).count + 1);
+                }
+                Button {
+                    text: "set 1 replace"
+                    onClicked: series.at(0).replace(series.at(0).count - 1, series.at(0).at(series.at(0).count - 1).y + 0.5);
+                }
+                Button {
+                    text: "set 1 remove"
+                    onClicked: series.at(0).remove(series.at(0).count - 1);
+                }
                 Button {
                     text: "set 1 color"
                     onClicked: series.at(0).color = main.nextColor();
                 }
                 Button {
                     text: "set 1 border color"
                     onClicked: series.at(0).borderColor = main.nextColor();
                 }
                 Button {
                     text: "set 1 label color"
                     onClicked: series.at(0).labelColor = main.nextColor();
                 }
                 Button {
                     text: "set 1 font size +"
                     onClicked: series.at(0).labelFont.pixelSize += 1;
                 }
                 Button {
                     text: "set 1 font size -"
                     onClicked: series.at(0).labelFont.pixelSize -= 1;
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/GroupedBarChart.qml +8 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
             ChartView {
                 title: "Grouped bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 axisXLabels: ["0", "2007", "1", "2008", "2", "2009", "3", "2010", "4", "2011", "5", "2012"]
                 property variant series: barSeries
                 GroupedBarSeries {
                     id: barSeries
                     name: "bar"
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                         onHovered:                  console.log("barset.onHovered: " + status);
+                        onPenChanged:               console.log("barset.onPenChanged: " + pen);
+                        onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
+                        onLabelChanged:             console.log("barset.onLabelChanged: " + label);
+                        onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
+                        onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
+                        onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
+                        onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
+                        onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("groupedBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("groupedBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("groupedBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("groupedBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("groupedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("groupedBarSeries.onCountChanged: " + count);
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +8 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
             ChartView {
                 title: "Percent bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 axisXLabels: ["0", "2007", "1", "2008", "2", "2009", "3", "2010", "4", "2011", "5", "2012"]
                 property variant series: barSeries
                 PercentBarSeries {
                     id: barSeries
                     name: "bar"
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                         onHovered:                  console.log("barset.onHovered: " + status);
+                        onPenChanged:               console.log("barset.onPenChanged: " + pen);
+                        onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
+                        onLabelChanged:             console.log("barset.onLabelChanged: " + label);
+                        onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
+                        onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
+                        onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
+                        onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
+                        onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("percentBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("percentBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("percentBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("percentBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("percentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("percentBarSeries.onCountChanged: " + count);
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +8 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
             ChartView {
                 title: "Stacked bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 axisXLabels: ["0", "2007", "1", "2008", "2", "2009", "3", "2010", "4", "2011", "5", "2012"]
                 property variant series: barSeries
                 StackedBarSeries {
                     id: barSeries
                     name: "bar"
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                         onHovered:                  console.log("barset.onHovered: " + status);
+                        onPenChanged:               console.log("barset.onPenChanged: " + pen);
+                        onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
+                        onLabelChanged:             console.log("barset.onLabelChanged: " + label);
+                        onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
+                        onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
+                        onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
+                        onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
+                        onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("stackedBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("stackedBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("stackedBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("stackedBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("stackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("stackedBarSeries.onCountChanged: " + count);
                 }
             }

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