##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Added removeSeries and removeAllSeries to QML API
Tero Ahola -
r1948:1def3447669a
parent child
Show More
Side by Side Unified
Context file:
r1948:1def3447669a Loading diff...:
Show file before | Show file after | Hide comments
@@ -174,6 +174,16 QTCOMMERCIALCHART_BEGIN_NAMESPACE
174 */
174 */
175
175
176 /*!
176 /*!
177 \qmlmethod ChartView::removeSeries(AbstractSeries series)
178 Removes the \a series from the chart. The series object is also destroyed.
179 */
180
181 /*!
182 \qmlmethod ChartView::removeAllSeries()
183 Removes all series from the chart. All the series objects are also destroyed.
184 */
185
186 /*!
177 \qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
187 \qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
178 The y-axis of the series. This is the same as the default y-axis of the chart as multiple y-axes are not yet supported.
188 The y-axis of the series. This is the same as the default y-axis of the chart as multiple y-axes are not yet supported.
179 */
189 */
Show file before | Show file after | Hide comments
@@ -122,12 +122,13 public:
122 Q_INVOKABLE QAbstractSeries *series(int index);
122 Q_INVOKABLE QAbstractSeries *series(int index);
123 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
123 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
124 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
124 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
125 Q_INVOKABLE void removeSeries(QAbstractSeries *series) { m_chart->removeSeries(series); }
126 Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); }
125 Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
127 Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
126 Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
128 Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
127 Q_INVOKABLE void createDefaultAxes();
129 Q_INVOKABLE void createDefaultAxes();
128 Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
130 Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
129 Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
131 Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
130
131 Q_INVOKABLE void zoom(qreal factor);
132 Q_INVOKABLE void zoom(qreal factor);
132 Q_INVOKABLE void scrollLeft(qreal pixels);
133 Q_INVOKABLE void scrollLeft(qreal pixels);
133 Q_INVOKABLE void scrollRight(qreal pixels);
134 Q_INVOKABLE void scrollRight(qreal pixels);
Show file before | Show file after | Hide comments
@@ -33,10 +33,7 ChartView {
33 onTriggered: {
33 onTriggered: {
34 switch (index) {
34 switch (index) {
35 case 0:
35 case 0:
36 while (chartView.count) {
36 var count = chartView.count;
37 console.log("Destroying series. Count: " + chartView.count);
38 chartView.series(0).destroy();
39 }
40 var line = chartView.createSeries(ChartView.SeriesTypeLine, "line");
37 var line = chartView.createSeries(ChartView.SeriesTypeLine, "line");
41 line.append(0, 0);
38 line.append(0, 0);
42 line.append(1, 1);
39 line.append(1, 1);
@@ -50,7 +47,7 ChartView {
50 chartView.axisY().min = 0;
47 chartView.axisY().min = 0;
51 chartView.axisY().max = 4.5;
48 chartView.axisY().max = 4.5;
52 break;
49 break;
53 default:
50 case 2:
54 var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter");
51 var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter");
55 scatter.append(0, 0);
52 scatter.append(0, 0);
56 scatter.append(0.5, 1);
53 scatter.append(0.5, 1);
@@ -61,8 +58,11 ChartView {
61 scatter.append(2, 2);
58 scatter.append(2, 2);
62 scatter.append(3, 3);
59 scatter.append(3, 3);
63 scatter.append(4, 4);
60 scatter.append(4, 4);
61 break;
62 default:
63 chartView.removeAllSeries();
64 }
64 }
65 index = (index + 1) % 3;
65 index = (index + 1) % 4;
66 }
66 }
67 }
67 }
68 }
68 }
General Comments 0
You need to be logged in to leave comments. Login now