HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1511:ed36c132b8e6

Implemented BarSeries::append, insert, remove and clear to QML API

Tero Ahola -

r1511:ed36c132b8e6

parent child

Context file:

r1511:ed36c132b8e6

Collapse all files

plugins/declarative/declarativebarseries.cpp +48 -4

             DeclarativeBarSet *DeclarativeBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
-                if (index < setList.count())
+                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)
             {
             DeclarativeBarSet *DeclarativeGroupedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
-                if (index < setList.count())
+                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)
             {
             DeclarativeBarSet *DeclarativeStackedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
-                if (index < setList.count())
+                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)
             {
             DeclarativeBarSet *DeclarativePercentBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
-                if (index < setList.count())
+                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 +16 0

                 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();
                 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();
                 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();
                 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();

plugins/declarative/declarativepieseries.cpp +2 -5

                 return slice;
             }
-            bool DeclarativePieSeries::remove(int index)
+            bool DeclarativePieSeries::remove(QPieSlice *slice)
             {
-                QPieSlice *slice = at(index);
+                return QPieSeries::remove(slice);
-                if (slice)
-                    return QPieSeries::remove(slice);
-                return false;
             }
             void DeclarativePieSeries::clear()

plugins/declarative/declarativepieseries.h +1 -1

                 Q_INVOKABLE QPieSlice *at(int index);
                 Q_INVOKABLE QPieSlice *find(QString label);
                 Q_INVOKABLE QPieSlice *append(QString label, qreal value);
-                Q_INVOKABLE bool remove(int index);
+                Q_INVOKABLE bool remove(QPieSlice *slice);
                 Q_INVOKABLE void clear();
             public:

tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +19 -1

@@ -44,8 +44,26 Flow {
44	onClicked: series.barWidth -= 0.1;	44	onClicked: series.barWidth -= 0.1;
45	}	45	}
46	Button {	46	Button {
		47	text: "append set"
		48	onClicked: {
		49	var count = series.count;
		50	series.append("set" + count, [0, 0.1 * count, 0.2 * count, 0.3 * count, 0.4 * count, 0.5 * count, 0.6 * count]);
		51	}
		52	}
		53	Button {
		54	text: "insert set"
		55	onClicked: {
		56	var count = series.count;
		57	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]);
		58	}
		59	}
		60	Button {
47	text: "remove set"	61	text: "remove set"
48	onClicked: series.remove(series.count - 1);	62	onClicked: series.remove(series.at(series.count - 1));
		63	}
		64	Button {
		65	text: "clear sets"
		66	onClicked: series.clear();
49	}	67	}
50	Button {	68	Button {
51	text: "set 1 color"	69	text: "set 1 color"

tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +1 -1

                 }
                 Button {
                     text: "remove slice"
-                    onClicked: series.remove(series.count - 1);
+                    onClicked: series.remove(series.at(series.count - 1));
                 }
                 Button {
                     text: "slice color"

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