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

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

barsetCount -> count in tests and examples too
sauimone -
r1463:e1e0c05a814c
parent child
Show More
Side by Side Unified
Context file:
r1463:e1e0c05a814c Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,224 +1,224
1 1 /****************************************************************************
2 2 **
3 3 ** Copyright (C) 2012 Digia Plc
4 4 ** All rights reserved.
5 5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 6 **
7 7 ** This file is part of the Qt Commercial Charts Add-on.
8 8 **
9 9 ** $QT_BEGIN_LICENSE$
10 10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 11 ** accordance with the Qt Commercial License Agreement provided with the
12 12 ** Software or, alternatively, in accordance with the terms contained in
13 13 ** a written agreement between you and Digia.
14 14 **
15 15 ** If you have questions regarding the use of this file, please use
16 16 ** contact form at http://qt.digia.com
17 17 ** $QT_END_LICENSE$
18 18 **
19 19 ****************************************************************************/
20 20
21 21 #include "mainwidget.h"
22 22 #include <QChart>
23 23 #include <QChartView>
24 24 #include <QPushButton>
25 25 #include <QLabel>
26 26 #include <QDebug>
27 27 #include <QBarSet>
28 28 #include <QBarSeries>
29 29 #include <QLegend>
30 30 #include <QFormLayout>
31 31
32 32 QTCOMMERCIALCHART_USE_NAMESPACE
33 33
34 34 MainWidget::MainWidget(QWidget *parent) :
35 35 QWidget(parent)
36 36 {
37 37 // Create buttons for ui
38 38 m_buttonLayout = new QGridLayout();
39 39 QPushButton *detachLegendButton = new QPushButton("detach legend");
40 40 connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(detachLegend()));
41 41 m_buttonLayout->addWidget(detachLegendButton, 0, 0);
42 42 QPushButton *attachLegendButton = new QPushButton("attach legend");
43 43 connect(attachLegendButton, SIGNAL(clicked()), this, SLOT(attachLegend()));
44 44 m_buttonLayout->addWidget(attachLegendButton, 1, 0);
45 45
46 46 QPushButton *addSetButton = new QPushButton("add barset");
47 47 connect(addSetButton, SIGNAL(clicked()), this, SLOT(addBarset()));
48 48 m_buttonLayout->addWidget(addSetButton, 2, 0);
49 49 QPushButton *removeBarsetButton = new QPushButton("remove barset");
50 50 connect(removeBarsetButton, SIGNAL(clicked()), this, SLOT(removeBarset()));
51 51 m_buttonLayout->addWidget(removeBarsetButton, 3, 0);
52 52
53 53 QPushButton *leftButton = new QPushButton("Align legend left");
54 54 connect(leftButton, SIGNAL(clicked()), this, SLOT(setLegendLeft()));
55 55 m_buttonLayout->addWidget(leftButton, 4, 0);
56 56
57 57 QPushButton *rightButton = new QPushButton("Align legend right");
58 58 connect(rightButton, SIGNAL(clicked()), this, SLOT(setLegendRight()));
59 59 m_buttonLayout->addWidget(rightButton, 5, 0);
60 60
61 61 QPushButton *topButton = new QPushButton("Align legend top");
62 62 connect(topButton, SIGNAL(clicked()), this, SLOT(setLegendTop()));
63 63 m_buttonLayout->addWidget(topButton, 6, 0);
64 64
65 65 QPushButton *bottomButton = new QPushButton("Align legend bottom");
66 66 connect(bottomButton, SIGNAL(clicked()), this, SLOT(setLegendBottom()));
67 67 m_buttonLayout->addWidget(bottomButton, 7, 0);
68 68
69 69 m_legendPosX = new QDoubleSpinBox();
70 70 m_legendPosY = new QDoubleSpinBox();
71 71 m_legendWidth = new QDoubleSpinBox();
72 72 m_legendHeight = new QDoubleSpinBox();
73 73
74 74 connect(m_legendPosX, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
75 75 connect(m_legendPosY, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
76 76 connect(m_legendWidth, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
77 77 connect(m_legendHeight, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
78 78
79 79 QFormLayout* legendLayout = new QFormLayout();
80 80 legendLayout->addRow("Horizontal position", m_legendPosX);
81 81 legendLayout->addRow("Vertical position", m_legendPosY);
82 82 legendLayout->addRow("Width", m_legendWidth);
83 83 legendLayout->addRow("Height", m_legendHeight);
84 84 m_legendSettings = new QGroupBox("Detached legend");
85 85 m_legendSettings->setLayout(legendLayout);
86 86 m_buttonLayout->addWidget(m_legendSettings);
87 87 m_legendSettings->setVisible(false);
88 88
89 89 // Create chart view with the chart
90 90 m_chart = new QChart();
91 91 m_chartView = new QChartView(m_chart, this);
92 92
93 93 // Create layout for grid and detached legend
94 94 m_mainLayout = new QGridLayout();
95 95 m_mainLayout->addLayout(m_buttonLayout, 0, 0);
96 96 m_mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
97 97 setLayout(m_mainLayout);
98 98
99 99 createSeries();
100 100 }
101 101
102 102 void MainWidget::createSeries()
103 103 {
104 104 m_series = new QBarSeries();
105 105 addBarset();
106 106 addBarset();
107 107 addBarset();
108 108 addBarset();
109 109
110 110 m_chart->addSeries(m_series);
111 111 m_chart->setTitle("Legend detach example");
112 112 //![1]
113 113 m_chart->legend()->setVisible(true);
114 114 m_chart->legend()->setAlignment(Qt::AlignBottom);
115 115 //![1]
116 116
117 117 m_chart->axisY()->setNiceNumbersEnabled(true);
118 118 m_chartView->setRenderHint(QPainter::Antialiasing);
119 119 }
120 120
121 121 void MainWidget::showLegendSpinbox()
122 122 {
123 123 m_legendSettings->setVisible(true);
124 124 QRectF chartViewRect = m_chartView->rect();
125 125 QRectF legendRect = m_chart->legend()->boundingRect();
126 126
127 127 m_legendPosX->setMinimum(0);
128 128 m_legendPosX->setMaximum(chartViewRect.width());
129 129 m_legendPosX->setValue(150);
130 130
131 131 m_legendPosY->setMinimum(0);
132 132 m_legendPosY->setMaximum(chartViewRect.height());
133 133 m_legendPosY->setValue(150);
134 134
135 135 m_legendWidth->setMinimum(0);
136 136 m_legendWidth->setMaximum(chartViewRect.width());
137 137 m_legendWidth->setValue(150);
138 138
139 139 m_legendHeight->setMinimum(0);
140 140 m_legendHeight->setMaximum(chartViewRect.height());
141 141 m_legendHeight->setValue(75);
142 142 }
143 143
144 144 void MainWidget::hideLegendSpinbox()
145 145 {
146 146 m_legendSettings->setVisible(false);
147 147 }
148 148
149 149
150 150 void MainWidget::detachLegend()
151 151 {
152 152 //![2]
153 153 QLegend *legend = m_chart->legend();
154 154 legend->detachFromChart();
155 155
156 156 m_chart->legend()->setBackgroundVisible(true);
157 157 m_chart->legend()->setBrush(QBrush(QColor(128,128,128,128)));
158 158 m_chart->legend()->setPen(QPen(QColor(192,192,192,192)));
159 159 //![2]
160 160
161 161 showLegendSpinbox();
162 162 updateLegendLayout();
163 163 update();
164 164 }
165 165
166 166
167 167 void MainWidget::attachLegend()
168 168 {
169 169 //![3]
170 170 QLegend *legend = m_chart->legend();
171 171 legend->attachToChart();
172 172 m_chart->legend()->setBackgroundVisible(false);
173 173 //![3]
174 174
175 175 hideLegendSpinbox();
176 176 update();
177 177 }
178 178
179 179 void MainWidget::addBarset()
180 180 {
181 QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->barsetCount()));
182 qreal delta = m_series->barsetCount() * 0.1;
181 QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->count()));
182 qreal delta = m_series->count() * 0.1;
183 183 *barSet << QPointF(0.0 + delta, 1 + delta) << QPointF(1.0 + delta, 2 + delta) << QPointF(2.0 + delta, 3 + delta) << QPointF(3.0 + delta, 4 + delta);
184 184 m_series->append(barSet);
185 185 }
186 186
187 187 void MainWidget::removeBarset()
188 188 {
189 189 QList<QBarSet*> sets = m_series->barSets();
190 190 if (sets.count() > 0) {
191 191 m_series->remove(sets.at(sets.count()-1));
192 192 }
193 193 }
194 194
195 195 void MainWidget::setLegendLeft()
196 196 {
197 197 m_chart->legend()->setAlignment(Qt::AlignLeft);
198 198 }
199 199
200 200 void MainWidget::setLegendRight()
201 201 {
202 202 m_chart->legend()->setAlignment(Qt::AlignRight);
203 203 }
204 204
205 205 void MainWidget::setLegendTop()
206 206 {
207 207 m_chart->legend()->setAlignment(Qt::AlignTop);
208 208 }
209 209
210 210 void MainWidget::setLegendBottom()
211 211 {
212 212 m_chart->legend()->setAlignment(Qt::AlignBottom);
213 213 }
214 214
215 215 void MainWidget::updateLegendLayout()
216 216 {
217 217 //![4]
218 218 m_chart->legend()->setGeometry(m_legendPosX->value()
219 219 ,m_legendPosY->value()
220 220 ,m_legendWidth->value()
221 221 ,m_legendHeight->value());
222 222 m_chart->legend()->update();
223 223 //![4]
224 224 }
Show file before | Show file after | Hide comments
@@ -1,614 +1,614
1 1 /****************************************************************************
2 2 **
3 3 ** Copyright (C) 2012 Digia Plc
4 4 ** All rights reserved.
5 5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 6 **
7 7 ** This file is part of the Qt Commercial Charts Add-on.
8 8 **
9 9 ** $QT_BEGIN_LICENSE$
10 10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 11 ** accordance with the Qt Commercial License Agreement provided with the
12 12 ** Software or, alternatively, in accordance with the terms contained in
13 13 ** a written agreement between you and Digia.
14 14 **
15 15 ** If you have questions regarding the use of this file, please use
16 16 ** contact form at http://qt.digia.com
17 17 ** $QT_END_LICENSE$
18 18 **
19 19 ****************************************************************************/
20 20
21 21 #include <QtCore/QString>
22 22 #include <QtTest/QtTest>
23 23
24 24 #include <qchart.h>
25 25 #include <qchartview.h>
26 26 #include <qgroupedbarseries.h>
27 27 #include <qbarset.h>
28 28 #include <qvbarmodelmapper.h>
29 29 #include <qhbarmodelmapper.h>
30 30 #include <QStandardItemModel>
31 31
32 32 QTCOMMERCIALCHART_USE_NAMESPACE
33 33
34 34 class tst_qbarmodelmapper : public QObject
35 35 {
36 36 Q_OBJECT
37 37
38 38 public:
39 39 tst_qbarmodelmapper();
40 40 void createVerticalMapper();
41 41 void createHorizontalMapper();
42 42
43 43 private Q_SLOTS:
44 44 void initTestCase();
45 45 void cleanupTestCase();
46 46 void init();
47 47 void cleanup();
48 48 void verticalMapper_data();
49 49 void verticalMapper();
50 50 void verticalMapperCustomMapping_data();
51 51 void verticalMapperCustomMapping();
52 52 void horizontalMapper_data();
53 53 void horizontalMapper();
54 54 void horizontalMapperCustomMapping_data();
55 55 void horizontalMapperCustomMapping();
56 56 void seriesUpdated();
57 57 void verticalModelInsertRows();
58 58 void verticalModelRemoveRows();
59 59 void verticalModelInsertColumns();
60 60 void verticalModelRemoveColumns();
61 61 void horizontalModelInsertRows();
62 62 void horizontalModelRemoveRows();
63 63 void horizontalModelInsertColumns();
64 64 void horizontalModelRemoveColumns();
65 65 void modelUpdateCell();
66 66
67 67 private:
68 68 QStandardItemModel *m_model;
69 69 int m_modelRowCount;
70 70 int m_modelColumnCount;
71 71
72 72 QVBarModelMapper *m_vMapper;
73 73 QHBarModelMapper *m_hMapper;
74 74
75 75 QGroupedBarSeries *m_series;
76 76 QChart *m_chart;
77 77 };
78 78
79 79 tst_qbarmodelmapper::tst_qbarmodelmapper():
80 80 m_model(0),
81 81 m_modelRowCount(10),
82 82 m_modelColumnCount(8),
83 83 m_vMapper(0),
84 84 m_hMapper(0),
85 85 m_series(0),
86 86 m_chart(0)
87 87 {
88 88 }
89 89
90 90 void tst_qbarmodelmapper::createVerticalMapper()
91 91 {
92 92 m_vMapper = new QVBarModelMapper;
93 93 QVERIFY(m_vMapper->model() == 0);
94 94 m_vMapper->setFirstBarSetColumn(0);
95 95 m_vMapper->setLastBarSetColumn(4);
96 96 m_vMapper->setModel(m_model);
97 97 m_vMapper->setSeries(m_series);
98 98 }
99 99
100 100 void tst_qbarmodelmapper::createHorizontalMapper()
101 101 {
102 102 m_hMapper = new QHBarModelMapper;
103 103 QVERIFY(m_hMapper->model() == 0);
104 104 m_hMapper->setFirstBarSetRow(0);
105 105 m_hMapper->setLastBarSetRow(4);
106 106 m_hMapper->setModel(m_model);
107 107 m_hMapper->setSeries(m_series);
108 108 }
109 109
110 110 void tst_qbarmodelmapper::init()
111 111 {
112 112 m_series = new QGroupedBarSeries;
113 113 m_chart->addSeries(m_series);
114 114
115 115 m_model = new QStandardItemModel(m_modelRowCount, m_modelColumnCount, this);
116 116 for (int row = 0; row < m_modelRowCount; ++row) {
117 117 for (int column = 0; column < m_modelColumnCount; column++) {
118 118 m_model->setData(m_model->index(row, column), row * column);
119 119 }
120 120 }
121 121 }
122 122
123 123 void tst_qbarmodelmapper::cleanup()
124 124 {
125 125 m_chart->removeSeries(m_series);
126 126 delete m_series;
127 127 m_series = 0;
128 128
129 129 m_model->clear();
130 130 m_model->deleteLater();
131 131 m_model = 0;
132 132
133 133 if (m_vMapper) {
134 134 m_vMapper->deleteLater();
135 135 m_vMapper = 0;
136 136 }
137 137
138 138 if (m_hMapper) {
139 139 m_hMapper->deleteLater();
140 140 m_hMapper = 0;
141 141 }
142 142 }
143 143
144 144 void tst_qbarmodelmapper::initTestCase()
145 145 {
146 146 m_chart = new QChart;
147 147 QChartView *chartView = new QChartView(m_chart);
148 148 chartView->show();
149 149 }
150 150
151 151 void tst_qbarmodelmapper::cleanupTestCase()
152 152 {
153 153 }
154 154
155 155 void tst_qbarmodelmapper::verticalMapper_data()
156 156 {
157 157 QTest::addColumn<int>("firstBarSetColumn");
158 158 QTest::addColumn<int>("lastBarSetColumn");
159 159 QTest::addColumn<int>("expectedBarSetCount");
160 160 QTest::newRow("lastBarSetColumn greater than firstBarSetColumn") << 0 << 1 << 2;
161 161 QTest::newRow("lastBarSetColumn equal to firstBarSetColumn") << 1 << 1 << 1;
162 162 QTest::newRow("lastBarSetColumn lesser than firstBarSetColumn") << 1 << 0 << 0;
163 163 QTest::newRow("invalid firstBarSetColumn and correct lastBarSetColumn") << -3 << 1 << 0;
164 164 QTest::newRow("firstBarSetColumn beyond the size of model and correct lastBarSetColumn") << m_modelColumnCount << 1 << 0;
165 165 QTest::newRow("firstBarSetColumn beyond the size of model and invalid lastBarSetColumn") << m_modelColumnCount << -1 << 0;
166 166 }
167 167
168 168 void tst_qbarmodelmapper::verticalMapper()
169 169 {
170 170 QFETCH(int, firstBarSetColumn);
171 171 QFETCH(int, lastBarSetColumn);
172 172 QFETCH(int, expectedBarSetCount);
173 173
174 174 m_series = new QGroupedBarSeries;
175 175
176 176 QVBarModelMapper *mapper = new QVBarModelMapper;
177 177 mapper->setFirstBarSetColumn(firstBarSetColumn);
178 178 mapper->setLastBarSetColumn(lastBarSetColumn);
179 179 mapper->setModel(m_model);
180 180 mapper->setSeries(m_series);
181 181
182 182 m_chart->addSeries(m_series);
183 183
184 QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
184 QCOMPARE(m_series->count(), expectedBarSetCount);
185 185 QCOMPARE(mapper->firstBarSetColumn(), qMax(-1, firstBarSetColumn));
186 186 QCOMPARE(mapper->lastBarSetColumn(), qMax(-1, lastBarSetColumn));
187 187
188 188 delete mapper;
189 189 mapper = 0;
190 190 }
191 191
192 192 void tst_qbarmodelmapper::verticalMapperCustomMapping_data()
193 193 {
194 194 QTest::addColumn<int>("first");
195 195 QTest::addColumn<int>("countLimit");
196 196 QTest::addColumn<int>("expectedBarSetCount");
197 197 QTest::addColumn<int>("expectedCount");
198 198 QTest::newRow("first: 0, unlimited count") << 0 << -1 << 2 << m_modelRowCount;
199 199 QTest::newRow("first: 3, unlimited count") << 3 << -1 << 2 << m_modelRowCount - 3;
200 200 QTest::newRow("first: 0, count: 5") << 0 << 5 << 2 << qMin(5, m_modelRowCount);
201 201 QTest::newRow("first: 3, count: 5") << 3 << 5 << 2 << qMin(5, m_modelRowCount - 3);
202 202 QTest::newRow("first: +1 greater then the number of rows in the model, unlimited count") << m_modelRowCount + 1 << -1 << 0 << 0;
203 203 QTest::newRow("first: +1 greater then the number of rows in the model, count: 5") << m_modelRowCount + 1 << 5 << 0 << 0;
204 204 QTest::newRow("first: 0, count: +3 greater than the number of rows in the model (should limit to the size of model)") << 0 << m_modelRowCount + 3 << 2 << m_modelRowCount;
205 205 QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << 2 << m_modelRowCount;
206 206 QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << 2 << m_modelRowCount;
207 207 QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << 2 << m_modelRowCount;
208 208 }
209 209
210 210 void tst_qbarmodelmapper::verticalMapperCustomMapping()
211 211 {
212 212 QFETCH(int, first);
213 213 QFETCH(int, countLimit);
214 214 QFETCH(int, expectedBarSetCount);
215 215 QFETCH(int, expectedCount);
216 216
217 217 m_series = new QGroupedBarSeries;
218 218
219 QCOMPARE(m_series->barsetCount(), 0);
219 QCOMPARE(m_series->count(), 0);
220 220
221 221 QVBarModelMapper *mapper = new QVBarModelMapper;
222 222 mapper->setFirstBarSetColumn(0);
223 223 mapper->setLastBarSetColumn(1);
224 224 mapper->setModel(m_model);
225 225 mapper->setSeries(m_series);
226 226 mapper->setFirst(first);
227 227 mapper->setCount(countLimit);
228 228 m_chart->addSeries(m_series);
229 229
230 QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
230 QCOMPARE(m_series->count(), expectedBarSetCount);
231 231
232 232 if (expectedBarSetCount > 0)
233 233 QCOMPARE(m_series->barSets().first()->count(), expectedCount);
234 234
235 235 // change values column mapping to invalid
236 236 mapper->setFirstBarSetColumn(-1);
237 237 mapper->setLastBarSetColumn(1);
238 238
239 QCOMPARE(m_series->barsetCount(), 0);
239 QCOMPARE(m_series->count(), 0);
240 240
241 241 delete mapper;
242 242 mapper = 0;
243 243 }
244 244
245 245 void tst_qbarmodelmapper::horizontalMapper_data()
246 246 {
247 247 QTest::addColumn<int>("firstBarSetRow");
248 248 QTest::addColumn<int>("lastBarSetRow");
249 249 QTest::addColumn<int>("expectedBarSetCount");
250 250 QTest::newRow("lastBarSetRow greater than firstBarSetRow") << 0 << 1 << 2;
251 251 QTest::newRow("lastBarSetRow equal to firstBarSetRow") << 1 << 1 << 1;
252 252 QTest::newRow("lastBarSetRow lesser than firstBarSetRow") << 1 << 0 << 0;
253 253 QTest::newRow("invalid firstBarSetRow and correct lastBarSetRow") << -3 << 1 << 0;
254 254 QTest::newRow("firstBarSetRow beyond the size of model and correct lastBarSetRow") << m_modelRowCount << 1 << 0;
255 255 QTest::newRow("firstBarSetRow beyond the size of model and invalid lastBarSetRow") << m_modelRowCount << -1 << 0;
256 256 }
257 257
258 258 void tst_qbarmodelmapper::horizontalMapper()
259 259 {
260 260 QFETCH(int, firstBarSetRow);
261 261 QFETCH(int, lastBarSetRow);
262 262 QFETCH(int, expectedBarSetCount);
263 263
264 264 m_series = new QGroupedBarSeries;
265 265
266 266 QHBarModelMapper *mapper = new QHBarModelMapper;
267 267 mapper->setFirstBarSetRow(firstBarSetRow);
268 268 mapper->setLastBarSetRow(lastBarSetRow);
269 269 mapper->setModel(m_model);
270 270 mapper->setSeries(m_series);
271 271
272 272 m_chart->addSeries(m_series);
273 273
274 QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
274 QCOMPARE(m_series->count(), expectedBarSetCount);
275 275 QCOMPARE(mapper->firstBarSetRow(), qMax(-1, firstBarSetRow));
276 276 QCOMPARE(mapper->lastBarSetRow(), qMax(-1, lastBarSetRow));
277 277
278 278 delete mapper;
279 279 mapper = 0;
280 280 }
281 281
282 282 void tst_qbarmodelmapper::horizontalMapperCustomMapping_data()
283 283 {
284 284 QTest::addColumn<int>("first");
285 285 QTest::addColumn<int>("countLimit");
286 286 QTest::addColumn<int>("expectedBarSetCount");
287 287 QTest::addColumn<int>("expectedCount");
288 288 QTest::newRow("first: 0, unlimited count") << 0 << -1 << 2 << m_modelColumnCount;
289 289 QTest::newRow("first: 3, unlimited count") << 3 << -1 << 2 << m_modelColumnCount - 3;
290 290 QTest::newRow("first: 0, count: 5") << 0 << 5 << 2 << qMin(5, m_modelColumnCount);
291 291 QTest::newRow("first: 3, count: 5") << 3 << 5 << 2 << qMin(5, m_modelColumnCount - 3);
292 292 QTest::newRow("first: +1 greater then the number of rows in the model, unlimited count") << m_modelColumnCount + 1 << -1 << 0 << 0;
293 293 QTest::newRow("first: +1 greater then the number of rows in the model, count: 5") << m_modelColumnCount + 1 << 5 << 0 << 0;
294 294 QTest::newRow("first: 0, count: +3 greater than the number of rows in the model (should limit to the size of model)") << 0 << m_modelColumnCount + 3 << 2 << m_modelColumnCount;
295 295 QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << 2 << m_modelColumnCount;
296 296 QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << 2 << m_modelColumnCount;
297 297 QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << 2 << m_modelColumnCount;
298 298 }
299 299
300 300 void tst_qbarmodelmapper::horizontalMapperCustomMapping()
301 301 {
302 302 QFETCH(int, first);
303 303 QFETCH(int, countLimit);
304 304 QFETCH(int, expectedBarSetCount);
305 305 QFETCH(int, expectedCount);
306 306
307 307 m_series = new QGroupedBarSeries;
308 308
309 QCOMPARE(m_series->barsetCount(), 0);
309 QCOMPARE(m_series->count(), 0);
310 310
311 311 QHBarModelMapper *mapper = new QHBarModelMapper;
312 312 mapper->setFirstBarSetRow(0);
313 313 mapper->setLastBarSetRow(1);
314 314 mapper->setModel(m_model);
315 315 mapper->setSeries(m_series);
316 316 mapper->setFirst(first);
317 317 mapper->setCount(countLimit);
318 318 m_chart->addSeries(m_series);
319 319
320 QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
320 QCOMPARE(m_series->count(), expectedBarSetCount);
321 321
322 322 if (expectedBarSetCount > 0)
323 323 QCOMPARE(m_series->barSets().first()->count(), expectedCount);
324 324
325 325 // change values column mapping to invalid
326 326 mapper->setFirstBarSetRow(-1);
327 327 mapper->setLastBarSetRow(1);
328 328
329 QCOMPARE(m_series->barsetCount(), 0);
329 QCOMPARE(m_series->count(), 0);
330 330
331 331 delete mapper;
332 332 mapper = 0;
333 333 }
334 334
335 335 void tst_qbarmodelmapper::seriesUpdated()
336 336 {
337 337 // setup the mapper
338 338 createVerticalMapper();
339 339 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
340 340 QCOMPARE(m_vMapper->count(), -1);
341 341
342 342 m_series->barSets().first()->append(123);
343 343 QCOMPARE(m_model->rowCount(), m_modelRowCount + 1);
344 344 QCOMPARE(m_vMapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
345 345
346 346 m_series->barSets().last()->remove(0, m_modelRowCount);
347 347 QCOMPARE(m_model->rowCount(), 1);
348 348 QCOMPARE(m_vMapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
349 349
350 350 m_series->barSets().first()->replace(0, 444.0);
351 351 QCOMPARE(m_model->data(m_model->index(0, 0)).toReal(), 444.0);
352 352
353 353 m_series->barSets().first()->setLabel("Hello");
354 354 QCOMPARE(m_model->headerData(0, Qt::Horizontal).toString(), QString("Hello"));
355 355
356 356 QList<qreal> newValues;
357 357 newValues << 15 << 27 << 35 << 49;
358 358 m_series->barSets().first()->append(newValues);
359 359 QCOMPARE(m_model->rowCount(), 1 + newValues.count());
360 360
361 361 QList<QBarSet* > newBarSets;
362 362 QBarSet* newBarSet_1 = new QBarSet("New_1");
363 363 newBarSet_1->append(101);
364 364 newBarSet_1->append(102);
365 365 newBarSet_1->append(103);
366 366 newBarSets.append(newBarSet_1);
367 367
368 368 QBarSet* newBarSet_2 = new QBarSet("New_1");
369 369 newBarSet_2->append(201);
370 370 newBarSet_2->append(202);
371 371 newBarSet_2->append(203);
372 372 newBarSets.append(newBarSet_2);
373 373
374 374 m_series->append(newBarSets);
375 375 QCOMPARE(m_model->columnCount(), m_modelColumnCount + newBarSets.count());
376 376 }
377 377
378 378 void tst_qbarmodelmapper::verticalModelInsertRows()
379 379 {
380 380 // setup the mapper
381 381 createVerticalMapper();
382 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
382 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
383 383 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
384 384 QVERIFY(m_vMapper->model() != 0);
385 385
386 386 int insertCount = 4;
387 387 m_model->insertRows(3, insertCount);
388 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
388 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
389 389 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + insertCount);
390 390
391 391 int first = 3;
392 392 m_vMapper->setFirst(3);
393 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
393 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
394 394 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + insertCount - first);
395 395
396 396 m_model->insertRows(3, insertCount);
397 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
397 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
398 398 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + 2 * insertCount - first);
399 399
400 400 int countLimit = 6;
401 401 m_vMapper->setCount(countLimit);
402 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
402 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
403 403 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount + 2 * insertCount - first));
404 404
405 405 m_model->insertRows(3, insertCount);
406 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
406 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
407 407 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount - first));
408 408
409 409 m_vMapper->setFirst(0);
410 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
410 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
411 411 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount));
412 412
413 413 m_vMapper->setCount(-1);
414 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
414 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
415 415 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + 3 * insertCount);
416 416 }
417 417
418 418 void tst_qbarmodelmapper::verticalModelRemoveRows()
419 419 {
420 420 // setup the mapper
421 421 createVerticalMapper();
422 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
422 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
423 423 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
424 424 QVERIFY(m_vMapper->model() != 0);
425 425
426 426 int removeCount = 2;
427 427 m_model->removeRows(1, removeCount);
428 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
428 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
429 429 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount - removeCount);
430 430
431 431 int first = 1;
432 432 m_vMapper->setFirst(first);
433 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
433 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
434 434 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount - removeCount - first);
435 435
436 436 m_model->removeRows(1, removeCount);
437 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
437 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
438 438 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount - 2 * removeCount - first);
439 439
440 440 int countLimit = 3;
441 441 m_vMapper->setCount(countLimit);
442 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
442 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
443 443 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount - 2 * removeCount - first));
444 444
445 445 m_model->removeRows(1, removeCount);
446 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
446 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
447 447 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount - 3 * removeCount - first));
448 448
449 449 m_vMapper->setFirst(0);
450 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
450 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
451 451 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount - 3 * removeCount));
452 452
453 453 m_vMapper->setCount(-1);
454 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
454 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
455 455 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount - 3 * removeCount);
456 456 }
457 457
458 458 void tst_qbarmodelmapper::verticalModelInsertColumns()
459 459 {
460 460 // setup the mapper
461 461 createVerticalMapper();
462 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
462 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
463 463 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
464 464 QVERIFY(m_vMapper->model() != 0);
465 465
466 466 int insertCount = 4;
467 467 m_model->insertColumns(3, insertCount);
468 QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
468 QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
469 469 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
470 470 }
471 471
472 472 void tst_qbarmodelmapper::verticalModelRemoveColumns()
473 473 {
474 474 // setup the mapper
475 475 createVerticalMapper();
476 QCOMPARE(m_series->barsetCount(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
476 QCOMPARE(m_series->count(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
477 477 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
478 478 QVERIFY(m_vMapper->model() != 0);
479 479
480 480 int removeCount = m_modelColumnCount - 2;
481 481 m_model->removeColumns(0, removeCount);
482 QCOMPARE(m_series->barsetCount(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
482 QCOMPARE(m_series->count(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
483 483 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
484 484
485 485 // leave all the columns
486 486 m_model->removeColumns(0, m_modelColumnCount - removeCount);
487 QCOMPARE(m_series->barsetCount(), 0);
487 QCOMPARE(m_series->count(), 0);
488 488 }
489 489
490 490 void tst_qbarmodelmapper::horizontalModelInsertRows()
491 491 {
492 492 // setup the mapper
493 493 createHorizontalMapper();
494 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
494 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
495 495 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
496 496 QVERIFY(m_hMapper->model() != 0);
497 497
498 498 int insertCount = 4;
499 499 m_model->insertRows(3, insertCount);
500 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
500 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
501 501 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
502 502 }
503 503
504 504 void tst_qbarmodelmapper::horizontalModelRemoveRows()
505 505 {
506 506 // setup the mapper
507 507 createHorizontalMapper();
508 QCOMPARE(m_series->barsetCount(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
508 QCOMPARE(m_series->count(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
509 509 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
510 510 QVERIFY(m_hMapper->model() != 0);
511 511
512 512 int removeCount = m_modelRowCount - 2;
513 513 m_model->removeRows(0, removeCount);
514 QCOMPARE(m_series->barsetCount(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
514 QCOMPARE(m_series->count(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
515 515 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
516 516
517 517 // leave all the columns
518 518 m_model->removeRows(0, m_modelRowCount - removeCount);
519 QCOMPARE(m_series->barsetCount(), 0);
519 QCOMPARE(m_series->count(), 0);
520 520 }
521 521
522 522 void tst_qbarmodelmapper::horizontalModelInsertColumns()
523 523 {
524 524 // setup the mapper
525 525 createHorizontalMapper();
526 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
526 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
527 527 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
528 528 QVERIFY(m_hMapper->model() != 0);
529 529
530 530 int insertCount = 4;
531 531 m_model->insertColumns(3, insertCount);
532 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
532 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
533 533 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + insertCount);
534 534
535 535 int first = 3;
536 536 m_hMapper->setFirst(3);
537 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
537 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
538 538 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + insertCount - first);
539 539
540 540 m_model->insertColumns(3, insertCount);
541 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
541 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
542 542 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + 2 * insertCount - first);
543 543
544 544 int countLimit = 6;
545 545 m_hMapper->setCount(countLimit);
546 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
546 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
547 547 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount + 2 * insertCount - first));
548 548
549 549 m_model->insertColumns(3, insertCount);
550 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
550 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
551 551 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount - first));
552 552
553 553 m_hMapper->setFirst(0);
554 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
554 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
555 555 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount));
556 556
557 557 m_hMapper->setCount(-1);
558 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
558 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
559 559 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + 3 * insertCount);
560 560 }
561 561
562 562 void tst_qbarmodelmapper::horizontalModelRemoveColumns()
563 563 {
564 564 // setup the mapper
565 565 createHorizontalMapper();
566 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
566 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
567 567 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
568 568 QVERIFY(m_hMapper->model() != 0);
569 569
570 570 int removeCount = 2;
571 571 m_model->removeColumns(1, removeCount);
572 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
572 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
573 573 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount - removeCount);
574 574
575 575 int first = 1;
576 576 m_hMapper->setFirst(first);
577 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
577 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
578 578 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount - removeCount - first);
579 579
580 580 m_model->removeColumns(1, removeCount);
581 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
581 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
582 582 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount - 2 * removeCount - first);
583 583
584 584 int countLimit = 3;
585 585 m_hMapper->setCount(countLimit);
586 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
586 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
587 587 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount - 2 * removeCount - first));
588 588
589 589 m_model->removeColumns(1, removeCount);
590 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
590 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
591 591 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount - 3 * removeCount - first));
592 592
593 593 m_hMapper->setFirst(0);
594 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
594 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
595 595 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount - 3 * removeCount));
596 596
597 597 m_hMapper->setCount(-1);
598 QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
598 QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
599 599 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount - 3 * removeCount);
600 600 }
601 601
602 602 void tst_qbarmodelmapper::modelUpdateCell()
603 603 {
604 604 // setup the mapper
605 605 createVerticalMapper();
606 606
607 607 QVERIFY(m_model->setData(m_model->index(1, 0), 44));
608 608 QCOMPARE(m_series->barSets().at(0)->at(1).y(), 44.0);
609 609 QCOMPARE(m_model->data(m_model->index(1, 0)).toReal(), 44.0);
610 610 }
611 611
612 612 QTEST_MAIN(tst_qbarmodelmapper)
613 613
614 614 #include "tst_qbarmodelmapper.moc"
Show file before | Show file after | Hide comments
@@ -1,508 +1,508
1 1 /****************************************************************************
2 2 **
3 3 ** Copyright (C) 2012 Digia Plc
4 4 ** All rights reserved.
5 5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 6 **
7 7 ** This file is part of the Qt Commercial Charts Add-on.
8 8 **
9 9 ** $QT_BEGIN_LICENSE$
10 10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 11 ** accordance with the Qt Commercial License Agreement provided with the
12 12 ** Software or, alternatively, in accordance with the terms contained in
13 13 ** a written agreement between you and Digia.
14 14 **
15 15 ** If you have questions regarding the use of this file, please use
16 16 ** contact form at http://qt.digia.com
17 17 ** $QT_END_LICENSE$
18 18 **
19 19 ****************************************************************************/
20 20
21 21 #include <QtTest/QtTest>
22 22 #include <qbarseries.h>
23 23 #include <qbarset.h>
24 24 #include <qchartview.h>
25 25 #include <qchart.h>
26 26
27 27 QTCOMMERCIALCHART_USE_NAMESPACE
28 28
29 29 Q_DECLARE_METATYPE(QBarSet*)
30 30
31 31 class tst_QBarSeries : public QObject
32 32 {
33 33 Q_OBJECT
34 34
35 35 public slots:
36 36 void initTestCase();
37 37 void cleanupTestCase();
38 38 void init();
39 39 void cleanup();
40 40
41 41 private slots:
42 42 void qbarseries_data();
43 43 void qbarseries();
44 44 void type_data();
45 45 void type();
46 46 void append_data();
47 47 void append();
48 48 void remove_data();
49 49 void remove();
50 50 void appendList_data();
51 51 void appendList();
52 void barsetCount_data();
53 void barsetCount();
52 void count_data();
53 void count();
54 54 void barSets_data();
55 55 void barSets();
56 56 void setLabelsVisible_data();
57 57 void setLabelsVisible();
58 58 void mouseclicked_data();
59 59 void mouseclicked();
60 60 void mousehovered_data();
61 61 void mousehovered();
62 62 void clearWithAnimations();
63 63
64 64 private:
65 65 QBarSeries* m_barseries;
66 66 QBarSeries* m_barseries_with_sets;
67 67
68 68 QList<QBarSet*> m_testSets;
69 69
70 70 };
71 71
72 72 void tst_QBarSeries::initTestCase()
73 73 {
74 74 qRegisterMetaType<QBarSet*>("QBarSet*");
75 75 }
76 76
77 77 void tst_QBarSeries::cleanupTestCase()
78 78 {
79 79 }
80 80
81 81 void tst_QBarSeries::init()
82 82 {
83 83 m_barseries = new QBarSeries();
84 84 m_barseries_with_sets = new QBarSeries();
85 85
86 86 for (int i=0; i<5; i++) {
87 87 m_testSets.append(new QBarSet("testset"));
88 88 m_barseries_with_sets->append(m_testSets.at(i));
89 89 }
90 90 }
91 91
92 92 void tst_QBarSeries::cleanup()
93 93 {
94 94 foreach(QBarSet* s, m_testSets) {
95 95 m_barseries_with_sets->remove(s);
96 96 delete s;
97 97 }
98 98 m_testSets.clear();
99 99
100 100 delete m_barseries;
101 101 m_barseries = 0;
102 102 delete m_barseries_with_sets;
103 103 m_barseries_with_sets = 0;
104 104 }
105 105
106 106 void tst_QBarSeries::qbarseries_data()
107 107 {
108 108 }
109 109
110 110 void tst_QBarSeries::qbarseries()
111 111 {
112 112 QBarSeries *barseries = new QBarSeries();
113 113 QVERIFY(barseries != 0);
114 114 }
115 115
116 116 void tst_QBarSeries::type_data()
117 117 {
118 118
119 119 }
120 120
121 121 void tst_QBarSeries::type()
122 122 {
123 123 QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeBar);
124 124 }
125 125
126 126 void tst_QBarSeries::append_data()
127 127 {
128 128 }
129 129
130 130 void tst_QBarSeries::append()
131 131 {
132 QVERIFY(m_barseries->barsetCount() == 0);
132 QVERIFY(m_barseries->count() == 0);
133 133
134 134 bool ret = false;
135 135
136 136 // Try adding barset
137 137 QBarSet *barset = new QBarSet("testset");
138 138 ret = m_barseries->append(barset);
139 139
140 140 QVERIFY(ret == true);
141 QVERIFY(m_barseries->barsetCount() == 1);
141 QVERIFY(m_barseries->count() == 1);
142 142
143 143 // Try adding another set
144 144 QBarSet *barset2 = new QBarSet("testset2");
145 145 ret = m_barseries->append(barset2);
146 146
147 147 QVERIFY(ret == true);
148 QVERIFY(m_barseries->barsetCount() == 2);
148 QVERIFY(m_barseries->count() == 2);
149 149
150 150 // Try adding same set again
151 151 ret = m_barseries->append(barset2);
152 152 QVERIFY(ret == false);
153 QVERIFY(m_barseries->barsetCount() == 2);
153 QVERIFY(m_barseries->count() == 2);
154 154
155 155 // Try adding null set
156 156 ret = m_barseries->append(0);
157 157 QVERIFY(ret == false);
158 QVERIFY(m_barseries->barsetCount() == 2);
158 QVERIFY(m_barseries->count() == 2);
159 159
160 160 }
161 161
162 162 void tst_QBarSeries::remove_data()
163 163 {
164 164 }
165 165
166 166 void tst_QBarSeries::remove()
167 167 {
168 168 int count = m_testSets.count();
169 QVERIFY(m_barseries_with_sets->barsetCount() == count);
169 QVERIFY(m_barseries_with_sets->count() == count);
170 170
171 171 // Try to remove null pointer (should not remove, should not crash)
172 172 bool ret = false;
173 173 ret = m_barseries_with_sets->remove(0);
174 174 QVERIFY(ret == false);
175 QVERIFY(m_barseries_with_sets->barsetCount() == count);
175 QVERIFY(m_barseries_with_sets->count() == count);
176 176
177 177 // Try to remove invalid pointer (should not remove, should not crash)
178 178 ret = m_barseries_with_sets->remove((QBarSet*) (m_testSets.at(0) + 1) );
179 179 QVERIFY(ret == false);
180 QVERIFY(m_barseries_with_sets->barsetCount() == count);
180 QVERIFY(m_barseries_with_sets->count() == count);
181 181
182 182 // remove some sets
183 183 ret = m_barseries_with_sets->remove(m_testSets.at(2));
184 184 QVERIFY(ret == true);
185 185 ret = m_barseries_with_sets->remove(m_testSets.at(3));
186 186 QVERIFY(ret == true);
187 187 ret = m_barseries_with_sets->remove(m_testSets.at(4));
188 188 QVERIFY(ret == true);
189 189
190 QVERIFY(m_barseries_with_sets->barsetCount() == 2);
190 QVERIFY(m_barseries_with_sets->count() == 2);
191 191
192 192 QList<QBarSet*> verifysets = m_barseries_with_sets->barSets();
193 193
194 194 QVERIFY(verifysets.at(0) == m_testSets.at(0));
195 195 QVERIFY(verifysets.at(1) == m_testSets.at(1));
196 196
197 197 // Try removing all sets again (should be ok, even if some sets have already been removed)
198 198 ret = false;
199 199 for (int i=0; i<count; i++) {
200 200 ret |= m_barseries_with_sets->remove(m_testSets.at(i));
201 201 }
202 202
203 203 QVERIFY(ret == true);
204 QVERIFY(m_barseries_with_sets->barsetCount() == 0);
204 QVERIFY(m_barseries_with_sets->count() == 0);
205 205 }
206 206
207 207 void tst_QBarSeries::appendList_data()
208 208 {
209 209
210 210 }
211 211
212 212 void tst_QBarSeries::appendList()
213 213 {
214 214 int count = 5;
215 QVERIFY(m_barseries->barsetCount() == 0);
215 QVERIFY(m_barseries->count() == 0);
216 216
217 217 QList<QBarSet*> sets;
218 218 for (int i=0; i<count; i++) {
219 219 sets.append(new QBarSet("testset"));
220 220 }
221 221
222 222 // Append new sets (should succeed, count should match the count of sets)
223 223 bool ret = false;
224 224 ret = m_barseries->append(sets);
225 225 QVERIFY(ret == true);
226 QVERIFY(m_barseries->barsetCount() == count);
226 QVERIFY(m_barseries->count() == count);
227 227
228 228 // Append same sets again (should fail, count should remain same)
229 229 ret = m_barseries->append(sets);
230 230 QVERIFY(ret == false);
231 QVERIFY(m_barseries->barsetCount() == count);
231 QVERIFY(m_barseries->count() == count);
232 232
233 233 // Try append empty list (should succeed, but count should remain same)
234 234 QList<QBarSet*> invalidList;
235 235 ret = m_barseries->append(invalidList);
236 236 QVERIFY(ret == true);
237 QVERIFY(m_barseries->barsetCount() == count);
237 QVERIFY(m_barseries->count() == count);
238 238
239 239 // Try append list with one new and one existing set (should fail, count remains same)
240 240 invalidList.append(new QBarSet("ok set"));
241 241 invalidList.append(sets.at(0));
242 242 ret = m_barseries->append(invalidList);
243 243 QVERIFY(ret == false);
244 QVERIFY(m_barseries->barsetCount() == count);
244 QVERIFY(m_barseries->count() == count);
245 245
246 246 // Try append list with null pointers (should fail, count remains same)
247 247 QList<QBarSet*> invalidList2;
248 248 invalidList2.append(0);
249 249 invalidList2.append(0);
250 250 invalidList2.append(0);
251 251 ret = m_barseries->append(invalidList2);
252 252 QVERIFY(ret == false);
253 QVERIFY(m_barseries->barsetCount() == count);
253 QVERIFY(m_barseries->count() == count);
254 254 }
255 255
256 void tst_QBarSeries::barsetCount_data()
256 void tst_QBarSeries::count_data()
257 257 {
258 258
259 259 }
260 260
261 void tst_QBarSeries::barsetCount()
261 void tst_QBarSeries::count()
262 262 {
263 QVERIFY(m_barseries->barsetCount() == 0);
264 QVERIFY(m_barseries_with_sets->barsetCount() == m_testSets.count());
263 QVERIFY(m_barseries->count() == 0);
264 QVERIFY(m_barseries_with_sets->count() == m_testSets.count());
265 265 }
266 266
267 267 void tst_QBarSeries::barSets_data()
268 268 {
269 269
270 270 }
271 271
272 272 void tst_QBarSeries::barSets()
273 273 {
274 274 QVERIFY(m_barseries->barSets().count() == 0);
275 275
276 276 QList<QBarSet*> sets = m_barseries_with_sets->barSets();
277 277 QVERIFY(sets.count() == m_testSets.count());
278 278
279 279 for (int i=0; i<m_testSets.count(); i++) {
280 280 QVERIFY(sets.at(i) == m_testSets.at(i));
281 281 }
282 282 }
283 283
284 284 void tst_QBarSeries::setLabelsVisible_data()
285 285 {
286 286
287 287 }
288 288
289 289 void tst_QBarSeries::setLabelsVisible()
290 290 {
291 291 // labels should be invisible by default
292 292 QVERIFY(m_barseries->isLabelsVisible() == false);
293 293 QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
294 294
295 295 // turn labels to visible
296 296 m_barseries_with_sets->setLabelsVisible(true);
297 297 // TODO: test the signal
298 298 QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
299 299
300 300 // turn labels to invisible
301 301 m_barseries_with_sets->setLabelsVisible(false);
302 302 // TODO: test the signal
303 303 QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
304 304
305 305 // without parameter, should turn labels to visible
306 306 m_barseries_with_sets->setLabelsVisible();
307 307 // TODO: test the signal
308 308 QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
309 309 }
310 310
311 311 void tst_QBarSeries::mouseclicked_data()
312 312 {
313 313
314 314 }
315 315
316 316 void tst_QBarSeries::mouseclicked()
317 317 {
318 318 QBarSeries* series = new QBarSeries();
319 319
320 320 QBarSet* set1 = new QBarSet(QString("set 1"));
321 321 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
322 322 series->append(set1);
323 323
324 324 QBarSet* set2 = new QBarSet(QString("set 2"));
325 325 *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
326 326 series->append(set2);
327 327
328 328 QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int)));
329 329
330 330 QChartView view(new QChart());
331 331 view.resize(400,300);
332 332 view.chart()->addSeries(series);
333 333 view.show();
334 334 QTest::qWaitForWindowShown(&view);
335 335
336 336 //====================================================================================
337 337 // barset 1, bar 0
338 338 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(102,142));
339 339 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
340 340
341 341 QCOMPARE(seriesSpy.count(), 1);
342 342
343 343 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
344 344 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
345 345 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
346 346 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
347 347
348 348 //====================================================================================
349 349 // barset 1, bar 1
350 350 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,142));
351 351 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
352 352
353 353 QCOMPARE(seriesSpy.count(), 1);
354 354
355 355 seriesSpyArg = seriesSpy.takeFirst();
356 356 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
357 357 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
358 358 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
359 359
360 360 //====================================================================================
361 361 // barset 1, bar 2
362 362 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(271,142));
363 363 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
364 364
365 365 QCOMPARE(seriesSpy.count(), 1);
366 366
367 367 seriesSpyArg = seriesSpy.takeFirst();
368 368 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
369 369 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
370 370 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
371 371
372 372 //====================================================================================
373 373 // barset 2, bar 0
374 374 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(127,142));
375 375 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
376 376
377 377 QCOMPARE(seriesSpy.count(), 1);
378 378
379 379 seriesSpyArg = seriesSpy.takeFirst();
380 380 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
381 381 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
382 382 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
383 383
384 384 //====================================================================================
385 385 // barset 2, bar 1
386 386 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(212,142));
387 387 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
388 388
389 389 QCOMPARE(seriesSpy.count(), 1);
390 390
391 391 seriesSpyArg = seriesSpy.takeFirst();
392 392 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
393 393 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
394 394 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
395 395
396 396 //====================================================================================
397 397 // barset 2, bar 2
398 398 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(296,142));
399 399 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
400 400
401 401 QCOMPARE(seriesSpy.count(), 1);
402 402
403 403 seriesSpyArg = seriesSpy.takeFirst();
404 404 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
405 405 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
406 406 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
407 407 }
408 408
409 409 void tst_QBarSeries::mousehovered_data()
410 410 {
411 411
412 412 }
413 413
414 414 void tst_QBarSeries::mousehovered()
415 415 {
416 416 QBarSeries* series = new QBarSeries();
417 417
418 418 QBarSet* set1 = new QBarSet(QString("set 1"));
419 419 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
420 420 series->append(set1);
421 421
422 422 QBarSet* set2 = new QBarSet(QString("set 2"));
423 423 *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
424 424 series->append(set2);
425 425
426 426 QSignalSpy seriesSpy(series,SIGNAL(hovered(QBarSet*,bool)));
427 427
428 428 QChartView view(new QChart());
429 429 view.resize(400,300);
430 430 view.chart()->addSeries(series);
431 431 view.show();
432 432 QTest::qWaitForWindowShown(&view);
433 433
434 434 //this is hack since view does not get events otherwise
435 435 view.setMouseTracking(true);
436 436
437 437 //=======================================================================
438 438 // move mouse to left border
439 439 QTest::mouseMove(view.viewport(), QPoint(0, 142));
440 440
441 441 QVERIFY(seriesSpy.count() == 0);
442 442
443 443 //=======================================================================
444 444 // move mouse on top of set1
445 445 QTest::mouseMove(view.viewport(), QPoint(102,142));
446 446
447 447 QVERIFY(seriesSpy.count() == 1);
448 448
449 449 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
450 450 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
451 451 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
452 452 QVERIFY(seriesSpyArg.at(1).toBool() == true);
453 453
454 454 //=======================================================================
455 455 // move mouse from top of set1 to top of set2
456 456 QTest::mouseMove(view.viewport(), QPoint(127,142));
457 457
458 458 QVERIFY(seriesSpy.count() == 2);
459 459
460 460 // should leave set1
461 461 seriesSpyArg = seriesSpy.takeFirst();
462 462 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
463 463 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
464 464 QVERIFY(seriesSpyArg.at(1).toBool() == false);
465 465
466 466 // should enter set2
467 467 seriesSpyArg = seriesSpy.takeFirst();
468 468 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
469 469 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
470 470 QVERIFY(seriesSpyArg.at(1).toBool() == true);
471 471
472 472 //=======================================================================
473 473 // move mouse from top of set2 to background
474 474 QTest::mouseMove(view.viewport(), QPoint(127,0));
475 475 QVERIFY(seriesSpy.count() == 1);
476 476
477 477 // should leave set2
478 478 seriesSpyArg = seriesSpy.takeFirst();
479 479 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
480 480 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
481 481 QVERIFY(seriesSpyArg.at(1).toBool() == false);
482 482 }
483 483
484 484 void tst_QBarSeries::clearWithAnimations()
485 485 {
486 486 QBarSeries* series = new QBarSeries();
487 487
488 488 QBarSet* set1 = new QBarSet(QString("set 1"));
489 489 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
490 490 series->append(set1);
491 491
492 492 QBarSet* set2 = new QBarSet(QString("set 2"));
493 493 *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
494 494 series->append(set2);
495 495
496 496 QChartView view(new QChart());
497 497 view.resize(400,300);
498 498 view.chart()->setAnimationOptions(QChart::SeriesAnimations);
499 499 view.chart()->addSeries(series);
500 500 view.show();
501 501
502 502 series->clear();
503 503 }
504 504
505 505 QTEST_MAIN(tst_QBarSeries)
506 506
507 507 #include "tst_qbarseries.moc"
508 508
General Comments 0
You need to be logged in to leave comments. Login now