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

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

Normalizes signal slots connections
Michal Klocek -
r967:8223ac2745a8
parent child
Show More
Show file before | Show file after | Hide comments
@@ -53,7 +53,7 MainWidget::MainWidget(QWidget* parent)
53 m_series->setLabelsVisible();
53 m_series->setLabelsVisible();
54 chart->addSeries(m_series);
54 chart->addSeries(m_series);
55
55
56 connect(m_series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*, Qt::MouseButtons)));
56 connect(m_series, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*,Qt::MouseButtons)));
57
57
58 // chart settings
58 // chart settings
59 m_themeComboBox = new QComboBox();
59 m_themeComboBox = new QComboBox();
Show file before | Show file after | Hide comments
@@ -58,12 +58,12 int main(int argc, char *argv[])
58 foreach (QString month, months)
58 foreach (QString month, months)
59 *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
59 *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
60
60
61 QObject::connect(series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
61 QObject::connect(series, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
62
62
63 *yearSeries << new DrilldownSlice(series->sum(), name, series);
63 *yearSeries << new DrilldownSlice(series->sum(), name, series);
64 }
64 }
65
65
66 QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
66 QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
67
67
68 chart->changeSeries(yearSeries);
68 chart->changeSeries(yearSeries);
69
69
Show file before | Show file after | Hide comments
@@ -80,7 +80,7 m_index(-1),m_chart(chart)
80
80
81 //![4]
81 //![4]
82 foreach (QSeries* series, m_series) {
82 foreach (QSeries* series, m_series) {
83 QObject::connect(series,SIGNAL(clicked(const QPointF&)),this,SLOT(handlePointClicked(const QPointF&)));
83 QObject::connect(series,SIGNAL(clicked(QPointF)),this,SLOT(handlePointClicked(QPointF)));
84 }
84 }
85 //![4]
85 //![4]
86 m_timer.start();
86 m_timer.start();
Show file before | Show file after | Hide comments
@@ -40,7 +40,7 MainWindow::MainWindow(QWidget *parent)
40 chart->axisX()->setRange(0, 4.5);
40 chart->axisX()->setRange(0, 4.5);
41 chart->axisY()->setRange(0, 4.5);
41 chart->axisY()->setRange(0, 4.5);
42
42
43 connect(m_scatter, SIGNAL(clicked(const QPointF&)), this, SLOT(handleClickedPoint(const QPointF&)));
43 connect(m_scatter, SIGNAL(clicked(QPointF)), this, SLOT(handleClickedPoint(QPointF)));
44
44
45 QChartView *chartView = new QChartView(chart);
45 QChartView *chartView = new QChartView(chart);
46 chartView->setRenderHint(QPainter::Antialiasing);
46 chartView->setRenderHint(QPainter::Antialiasing);
Show file before | Show file after | Hide comments
@@ -44,7 +44,7 AreaChartItem::AreaChartItem(QAreaSeries *areaSeries, ChartPresenter *presenter)
44 m_lower = new AreaBoundItem(this,m_series->lowerSeries());
44 m_lower = new AreaBoundItem(this,m_series->lowerSeries());
45
45
46 connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
46 connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
47 connect(this,SIGNAL(clicked(const QPointF&)),areaSeries,SIGNAL(clicked(const QPointF&)));
47 connect(this,SIGNAL(clicked(QPointF)),areaSeries,SIGNAL(clicked(QPointF)));
48
48
49 handleUpdated();
49 handleUpdated();
50 }
50 }
Show file before | Show file after | Hide comments
@@ -109,8 +109,8 private:
109
109
110 class AxisItem: public QGraphicsLineItem
110 class AxisItem: public QGraphicsLineItem
111 {
111 {
112 public:
113
112
113 public:
114 AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {}
114 AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {}
115
115
116 protected:
116 protected:
Show file before | Show file after | Hide comments
@@ -384,18 +384,18 void QBarSeriesPrivate::setModelMapping(int categories, int bottomBoundry, int t
384 if (m_mapOrientation == Qt::Vertical) {
384 if (m_mapOrientation == Qt::Vertical) {
385 m_mapCount = m_model->rowCount() - m_mapFirst;
385 m_mapCount = m_model->rowCount() - m_mapFirst;
386 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
386 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
387 this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
387 this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
388 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)),
388 connect(m_model,SIGNAL(rowsInserted(QModelIndex,int,int)),
389 this, SLOT(modelDataAdded(QModelIndex,int,int)));
389 this, SLOT(modelDataAdded(QModelIndex,int,int)));
390 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)),
390 connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
391 this, SLOT(modelDataRemoved(QModelIndex,int,int)));
391 this, SLOT(modelDataRemoved(QModelIndex,int,int)));
392 } else {
392 } else {
393 m_mapCount = m_model->columnCount() - m_mapFirst;
393 m_mapCount = m_model->columnCount() - m_mapFirst;
394 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
394 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
395 this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
395 this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
396 connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)),
396 connect(m_model,SIGNAL(columnsInserted(QModelIndex,int,int)),
397 this, SLOT(modelDataAdded(QModelIndex,int,int)));
397 this, SLOT(modelDataAdded(QModelIndex,int,int)));
398 connect(m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)),
398 connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
399 this, SLOT(modelDataRemoved(QModelIndex,int,int)));
399 this, SLOT(modelDataRemoved(QModelIndex,int,int)));
400 }
400 }
401
401
Show file before | Show file after | Hide comments
@@ -68,6 +68,6 private:
68
68
69 ChartConfig* ChartConfig::m_instance=0;
69 ChartConfig* ChartConfig::m_instance=0;
70
70
71 #endif
72
73 QTCOMMERCIALCHART_END_NAMESPACE
71 QTCOMMERCIALCHART_END_NAMESPACE
72
73 #endif
Show file before | Show file after | Hide comments
@@ -132,7 +132,7 void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
132 item->handleRangeChanged(domain->minY(),domain->maxY(),domain->tickYCount());
132 item->handleRangeChanged(domain->minY(),domain->maxY(),domain->tickYCount());
133 }
133 }
134
134
135 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
135 QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF)));
136 //initialize
136 //initialize
137 item->handleGeometryChanged(m_chartRect);
137 item->handleGeometryChanged(m_chartRect);
138 m_axisItems.insert(axis, item);
138 m_axisItems.insert(axis, item);
@@ -151,7 +151,7 void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
151 {
151 {
152 Chart *item = series->d_ptr->createGraphics(this);
152 Chart *item = series->d_ptr->createGraphics(this);
153 Q_ASSERT(item);
153 Q_ASSERT(item);
154 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
154 QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF)));
155 QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
155 QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
156 //initialize
156 //initialize
157 item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
157 item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
Show file before | Show file after | Hide comments
@@ -499,13 +499,13 void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::O
499
499
500 // connect the signals
500 // connect the signals
501 if (d->m_mapOrientation == Qt::Vertical) {
501 if (d->m_mapOrientation == Qt::Vertical) {
502 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex, QModelIndex)));
502 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
503 connect(d->m_model, SIGNAL(rowsInserted(QModelIndex, int, int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
503 connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
504 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
504 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
505 } else {
505 } else {
506 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex, QModelIndex)));
506 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
507 connect(d->m_model, SIGNAL(columnsInserted(QModelIndex, int, int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
507 connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
508 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
508 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
509 }
509 }
510
510
511 // create the initial slices set
511 // create the initial slices set
Show file before | Show file after | Hide comments
@@ -563,17 +563,17 void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientat
563 d->m_mapFirst = 0;
563 d->m_mapFirst = 0;
564 d->m_mapOrientation = orientation;
564 d->m_mapOrientation = orientation;
565 if (d->m_mapOrientation == Qt::Vertical) {
565 if (d->m_mapOrientation == Qt::Vertical) {
566 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
566 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
567 connect(d->m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
567 connect(d->m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
568 connect(d->m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
568 connect(d->m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
569 connect(d->m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
569 connect(d->m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
570 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
570 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
571 } else {
571 } else {
572 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
572 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
573 connect(d->m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
573 connect(d->m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
574 connect(d->m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
574 connect(d->m_model,SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
575 connect(d->m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
575 connect(d->m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
576 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
576 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
577 }
577 }
578 }
578 }
579
579
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 XYChartItem::XYChartItem(QXYSeries *series, ChartPresenter *presenter):ChartItem
41 connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
41 connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
42 connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
42 connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
43 connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
43 connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
44 connect(this,SIGNAL(clicked(const QPointF&)),series,SIGNAL(clicked(const QPointF&)));
44 connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));
45 }
45 }
46
46
47 QPointF XYChartItem::calculateGeometryPoint(const QPointF &point) const
47 QPointF XYChartItem::calculateGeometryPoint(const QPointF &point) const
Show file before | Show file after | Hide comments
@@ -118,9 +118,9 void tst_Domain::handleAxisRangeXChanged()
118
118
119 Domain domain;
119 Domain domain;
120
120
121 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
121 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
122 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
122 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
123 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
123 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
124
124
125 domain.handleAxisXChanged(min, max);
125 domain.handleAxisXChanged(min, max);
126
126
@@ -154,9 +154,9 void tst_Domain::handleAxisRangeYChanged()
154
154
155 Domain domain;
155 Domain domain;
156
156
157 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
157 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
158 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
158 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
159 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
159 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
160
160
161 domain.handleAxisYChanged(min, max, 5);
161 domain.handleAxisYChanged(min, max, 5);
162
162
@@ -217,9 +217,9 void tst_Domain::maxX()
217
217
218 Domain domain;
218 Domain domain;
219
219
220 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
220 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
221 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
221 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
222 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
222 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
223
223
224 domain.setMaxX(maxX1);
224 domain.setMaxX(maxX1);
225 QCOMPARE(domain.maxX(), maxX1);
225 QCOMPARE(domain.maxX(), maxX1);
@@ -250,9 +250,9 void tst_Domain::maxY()
250
250
251 Domain domain;
251 Domain domain;
252
252
253 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
253 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
254 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
254 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
255 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
255 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
256
256
257 domain.setMaxY(maxY1);
257 domain.setMaxY(maxY1);
258 QCOMPARE(domain.maxY(), maxY1);
258 QCOMPARE(domain.maxY(), maxY1);
@@ -282,9 +282,9 void tst_Domain::minX()
282
282
283 Domain domain;
283 Domain domain;
284
284
285 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
285 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
286 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
286 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
287 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
287 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
288
288
289 domain.setMinX(minX1);
289 domain.setMinX(minX1);
290 QCOMPARE(domain.minX(), minX1);
290 QCOMPARE(domain.minX(), minX1);
@@ -314,9 +314,9 void tst_Domain::minY()
314
314
315 Domain domain;
315 Domain domain;
316
316
317 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
317 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
318 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
318 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
319 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
319 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
320
320
321 domain.setMinY(minY1);
321 domain.setMinY(minY1);
322 QCOMPARE(domain.minY(), minY1);
322 QCOMPARE(domain.minY(), minY1);
@@ -364,9 +364,9 void tst_Domain::operatorEquals()
364
364
365 Domain domain;
365 Domain domain;
366
366
367 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
367 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
368 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
368 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
369 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
369 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
370
370
371 QCOMPARE(*domain1==*domain2, equals);
371 QCOMPARE(*domain1==*domain2, equals);
372 QCOMPARE(*domain1!=*domain2, notEquals);
372 QCOMPARE(*domain1!=*domain2, notEquals);
@@ -396,9 +396,9 void tst_Domain::setRange()
396
396
397 Domain domain;
397 Domain domain;
398
398
399 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
399 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
400 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
400 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
401 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
401 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
402
402
403 domain.setRange(minX, maxX, minY, maxY);
403 domain.setRange(minX, maxX, minY, maxY);
404
404
@@ -429,9 +429,9 void tst_Domain::setRangeX()
429
429
430 Domain domain;
430 Domain domain;
431
431
432 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
432 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
433 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
433 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
434 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
434 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
435
435
436 domain.setRangeX(min, max);
436 domain.setRangeX(min, max);
437
437
@@ -464,9 +464,9 void tst_Domain::setRangeY()
464
464
465 Domain domain;
465 Domain domain;
466
466
467 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
467 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
468 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
468 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
469 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
469 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
470
470
471 domain.setRangeY(min, max);
471 domain.setRangeY(min, max);
472
472
@@ -502,9 +502,9 void tst_Domain::spanX()
502
502
503 domain.setRangeX(minX, maxX);
503 domain.setRangeX(minX, maxX);
504
504
505 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
505 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
506 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
506 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
507 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
507 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
508
508
509 QCOMPARE(domain.spanX(), spanX);
509 QCOMPARE(domain.spanX(), spanX);
510
510
@@ -532,9 +532,9 void tst_Domain::spanY()
532
532
533 domain.setRangeY(minY, maxY);
533 domain.setRangeY(minY, maxY);
534
534
535 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
535 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
536 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
536 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
537 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
537 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
538
538
539 QCOMPARE(domain.spanY(), spanY);
539 QCOMPARE(domain.spanY(), spanY);
540
540
@@ -574,9 +574,9 void tst_Domain::zoom()
574
574
575 domain.setRange(0, 1000, 0, 1000);
575 domain.setRange(0, 1000, 0, 1000);
576
576
577 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
577 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
578 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
578 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
579 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
579 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
580
580
581 Domain domain0;
581 Domain domain0;
582 domain0.setRange(domain.minX(), domain.maxX(), domain.minY(), domain.maxY());
582 domain0.setRange(domain.minX(), domain.maxX(), domain.minY(), domain.maxY());
@@ -621,9 +621,9 void tst_Domain::move()
621
621
622 domain.setRange(0, size.width(), 0, size.height());
622 domain.setRange(0, size.width(), 0, size.height());
623
623
624 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
624 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
625 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
625 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
626 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
626 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
627
627
628 domain.move(dx, dy, size);
628 domain.move(dx, dy, size);
629
629
@@ -662,9 +662,9 void tst_Domain::handleAxisXChanged()
662 QFETCH(int, resultTickCount);
662 QFETCH(int, resultTickCount);
663
663
664 Domain domain;
664 Domain domain;
665 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
665 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
666 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
666 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
667 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
667 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
668
668
669 domain.handleAxisXChanged(min, max, tickCount, niceNumbers);
669 domain.handleAxisXChanged(min, max, tickCount, niceNumbers);
670
670
@@ -693,9 +693,9 void tst_Domain::handleAxisYChanged()
693 QFETCH(int, resultTickCount);
693 QFETCH(int, resultTickCount);
694
694
695 Domain domain;
695 Domain domain;
696 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
696 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)));
697 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
697 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int)));
698 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
698 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int)));
699
699
700 domain.handleAxisYChanged(min, max, tickCount, niceNumbers);
700 domain.handleAxisYChanged(min, max, tickCount, niceNumbers);
701
701
Show file before | Show file after | Hide comments
@@ -146,9 +146,9 void tst_QChartView::rubberBand()
146 m_view->setMouseTracking(true);
146 m_view->setMouseTracking(true);
147
147
148 QChartAxis* axisY = m_view->chart()->axisY();
148 QChartAxis* axisY = m_view->chart()->axisY();
149 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal, qreal)));
149 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
150 QChartAxis* axisX = m_view->chart()->axisX();
150 QChartAxis* axisX = m_view->chart()->axisX();
151 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal)));
151 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
152
152
153 QTest::qWaitForWindowShown(m_view);
153 QTest::qWaitForWindowShown(m_view);
154 QTest::qWait(500);
154 QTest::qWait(500);
@@ -198,9 +198,9 void tst_QChartView::keys()
198 m_view->show();
198 m_view->show();
199
199
200 QChartAxis* axisY = m_view->chart()->axisY();
200 QChartAxis* axisY = m_view->chart()->axisY();
201 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal, qreal)));
201 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
202 QChartAxis* axisX = m_view->chart()->axisX();
202 QChartAxis* axisX = m_view->chart()->axisX();
203 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal)));
203 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
204
204
205 QTest::keyPress(m_view, key);
205 QTest::keyPress(m_view, key);
206 QTest::keyRelease(m_view, key);
206 QTest::keyRelease(m_view, key);
Show file before | Show file after | Hide comments
@@ -174,8 +174,8 void MainWidget::addSeries()
174 {
174 {
175 if (!m_addSerieDialog) {
175 if (!m_addSerieDialog) {
176 m_addSerieDialog = new DataSerieDialog(this);
176 m_addSerieDialog = new DataSerieDialog(this);
177 connect(m_addSerieDialog, SIGNAL(accepted(QString, int, int, QString, bool)),
177 connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)),
178 this, SLOT(addSeries(QString, int, int, QString, bool)));
178 this, SLOT(addSeries(QString,int,int,QString,bool)));
179 }
179 }
180 m_addSerieDialog->exec();
180 m_addSerieDialog->exec();
181 }
181 }
General Comments 0
You need to be logged in to leave comments. Login now