##// END OF EJS Templates
Add count property for QBoxPlotSeries...
Titta Heikkala -
r2682:7786daffde49
parent child
Show More
@@ -199,6 +199,10 QTCOMMERCIALCHART_BEGIN_NAMESPACE
199 This property configures the brush of the box-and-whiskers items.
199 This property configures the brush of the box-and-whiskers items.
200 */
200 */
201 /*!
201 /*!
202 \qmlproperty int BoxPlotSeries::count
203 The count of sets in series.
204 */
205 /*!
202 \qmlsignal BoxPlotSeries::onBoxOutlineVisibilityChanged()
206 \qmlsignal BoxPlotSeries::onBoxOutlineVisibilityChanged()
203 Signal is emitted when the middle box outline visibility is changed.
207 Signal is emitted when the middle box outline visibility is changed.
204 */
208 */
@@ -1738,6 +1738,7 Module {
1738 Property { name: "boxWidth"; type: "double" }
1738 Property { name: "boxWidth"; type: "double" }
1739 Property { name: "pen"; type: "QPen" }
1739 Property { name: "pen"; type: "QPen" }
1740 Property { name: "brush"; type: "QBrush" }
1740 Property { name: "brush"; type: "QBrush" }
1741 Property { name: "count"; revision: 1; type: "int"; isReadonly: true }
1741 Signal {
1742 Signal {
1742 name: "clicked"
1743 name: "clicked"
1743 Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
1744 Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
@@ -1747,7 +1748,6 Module {
1747 Parameter { name: "status"; type: "bool" }
1748 Parameter { name: "status"; type: "bool" }
1748 Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
1749 Parameter { name: "boxset"; type: "QBoxSet"; isPointer: true }
1749 }
1750 }
1750 Signal { name: "countChanged" }
1751 Signal { name: "boxOutlineVisibilityChanged" }
1751 Signal { name: "boxOutlineVisibilityChanged" }
1752 Signal {
1752 Signal {
1753 name: "boxsetsAdded"
1753 name: "boxsetsAdded"
@@ -87,6 +87,10 QTCOMMERCIALCHART_BEGIN_NAMESPACE
87 \property QBoxPlotSeries::brush
87 \property QBoxPlotSeries::brush
88 \brief This property configures the brush of the box-and-whiskers items.
88 \brief This property configures the brush of the box-and-whiskers items.
89 */
89 */
90 /*!
91 \property QBoxPlotSeries::count
92 \brief The count of sets in series.
93 */
90
94
91 /*!
95 /*!
92 \qmlproperty QString BoxPlotSeries::brushFilename
96 \qmlproperty QString BoxPlotSeries::brushFilename
@@ -36,6 +36,7 class QTCOMMERCIALCHART_EXPORT QBoxPlotSeries : public QAbstractSeries
36 Q_PROPERTY(qreal boxWidth READ boxWidth WRITE setBoxWidth NOTIFY boxWidthChanged)
36 Q_PROPERTY(qreal boxWidth READ boxWidth WRITE setBoxWidth NOTIFY boxWidthChanged)
37 Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
37 Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
38 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
38 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
39 Q_PROPERTY(int count READ count NOTIFY countChanged REVISION 1)
39 public:
40 public:
40 explicit QBoxPlotSeries(QObject *parent = 0);
41 explicit QBoxPlotSeries(QObject *parent = 0);
41 ~QBoxPlotSeries();
42 ~QBoxPlotSeries();
@@ -44,6 +44,7 Rectangle {
44 }
44 }
45
45
46 function test_append() {
46 function test_append() {
47 boxPlotSeries.clear();
47 addedSpy.clear();
48 addedSpy.clear();
48 countChangedSpy.clear();
49 countChangedSpy.clear();
49 var count = 50;
50 var count = 50;
@@ -51,11 +52,12 Rectangle {
51 boxPlotSeries.append("boxplot" + i, Math.random());
52 boxPlotSeries.append("boxplot" + i, Math.random());
52 compare(addedSpy.count, count);
53 compare(addedSpy.count, count);
53 compare(countChangedSpy.count, count);
54 compare(countChangedSpy.count, count);
54 console.log("Check the series count once QTRD-2504 is implemented");
55 compare(boxPlotSeries.count, count)
55 boxPlotSeries.clear();
56 boxPlotSeries.clear();
56 }
57 }
57
58
58 function test_remove() {
59 function test_remove() {
60 boxPlotSeries.clear();
59 removedSpy.clear();
61 removedSpy.clear();
60 countChangedSpy.clear();
62 countChangedSpy.clear();
61 var count = 50;
63 var count = 50;
@@ -65,7 +67,7 Rectangle {
65 boxPlotSeries.remove(boxPlotSeries.at(0));
67 boxPlotSeries.remove(boxPlotSeries.at(0));
66 compare(removedSpy.count, count);
68 compare(removedSpy.count, count);
67 compare(countChangedSpy.count, 2 * count);
69 compare(countChangedSpy.count, 2 * count);
68 console.log("Check the series count once QTRD-2504 is implemented");
70 compare(boxPlotSeries.count, 0)
69 }
71 }
70 }
72 }
71
73
@@ -49,7 +49,6 Rectangle {
49 boxPlotSeries.append("boxplot" + i, Math.random());
49 boxPlotSeries.append("boxplot" + i, Math.random());
50 compare(addedSpy.count, count);
50 compare(addedSpy.count, count);
51 compare(countChangedSpy.count, count);
51 compare(countChangedSpy.count, count);
52 console.log("Check the series count once QTRD-2504 is implemented");
53 boxPlotSeries.clear();
52 boxPlotSeries.clear();
54 }
53 }
55
54
@@ -63,7 +62,6 Rectangle {
63 boxPlotSeries.remove(boxPlotSeries.at(0));
62 boxPlotSeries.remove(boxPlotSeries.at(0));
64 compare(removedSpy.count, count);
63 compare(removedSpy.count, count);
65 compare(countChangedSpy.count, 2 * count);
64 compare(countChangedSpy.count, 2 * count);
66 console.log("Check the series count once QTRD-2504 is implemented");
67 }
65 }
68 }
66 }
69
67
General Comments 0
You need to be logged in to leave comments. Login now