@@ -117,7 +117,7 void AxisItem::handleAxisUpdate(QChartAxis* axis) | |||
|
117 | 117 | setShadesBrush(axis->shadesBrush()); |
|
118 | 118 | } |
|
119 | 119 | |
|
120 |
void AxisItem::handle |
|
|
120 | void AxisItem::handleRangeChanged(QChartAxis* axis,const QStringList& labels) | |
|
121 | 121 | { |
|
122 | 122 | int diff = m_thicksList.size() - labels.size(); |
|
123 | 123 |
@@ -51,7 +51,7 public: | |||
|
51 | 51 | |
|
52 | 52 | public slots: |
|
53 | 53 | void handleAxisUpdate(QChartAxis* axis); //look and feel |
|
54 |
void handle |
|
|
54 | void handleRangeChanged(QChartAxis* axis,const QStringList& labels); //labels from dataset | |
|
55 | 55 | void handleGeometryChanged(const QRectF& size); // geometry from presenter |
|
56 | 56 | public: |
|
57 | 57 | virtual void updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout); |
@@ -152,8 +152,8 void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY) | |||
|
152 | 152 | |
|
153 | 153 | QStringList ylabels = createLabels(axisY,domain.m_minY,domain.m_maxY); |
|
154 | 154 | QStringList xlabels = createLabels(axisX(),domain.m_minX,domain.m_maxX); |
|
155 |
emit axis |
|
|
156 |
emit axis |
|
|
155 | emit axisRangeChanged(axisY,ylabels); | |
|
156 | emit axisRangeChanged(axisX(),xlabels); | |
|
157 | 157 | emit seriesAdded(series); |
|
158 | 158 | emit seriesDomainChanged(series,domain); |
|
159 | 159 | |
@@ -240,11 +240,11 void ChartDataSet::setDomain(int index) | |||
|
240 | 240 | foreach(QSeries* series, seriesList) { |
|
241 | 241 | emit seriesDomainChanged(series,domain); |
|
242 | 242 | } |
|
243 |
emit axis |
|
|
243 | emit axisRangeChanged(axis,labels); | |
|
244 | 244 | } |
|
245 | 245 | |
|
246 | 246 | QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX); |
|
247 |
emit axis |
|
|
247 | emit axisRangeChanged(axisX(),labels); | |
|
248 | 248 | } |
|
249 | 249 | |
|
250 | 250 | void ChartDataSet::clearDomains(int toIndex) |
@@ -286,12 +286,12 void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport) | |||
|
286 | 286 | foreach(QSeries* series, seriesList){ |
|
287 | 287 | emit seriesDomainChanged(series,domain); |
|
288 | 288 | } |
|
289 |
emit axis |
|
|
289 | emit axisRangeChanged(axis,labels); | |
|
290 | 290 | m_domainMap.insert(axis,domain); |
|
291 | 291 | } |
|
292 | 292 | |
|
293 | 293 | QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX); |
|
294 |
emit axis |
|
|
294 | emit axisRangeChanged(axisX(),labels); | |
|
295 | 295 | |
|
296 | 296 | m_domainIndex++; |
|
297 | 297 | } |
@@ -346,10 +346,10 void ChartDataSet::handleTickChanged(QChartAxis* axis) | |||
|
346 | 346 | Domain domain = m_domainMap.value(axisY()); |
|
347 | 347 | if(axis==axisX()){ |
|
348 | 348 | QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX); |
|
349 |
emit axis |
|
|
349 | emit axisRangeChanged(axis,labels); | |
|
350 | 350 | }else{ |
|
351 | 351 | QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY); |
|
352 |
emit axis |
|
|
352 | emit axisRangeChanged(axis,labels); | |
|
353 | 353 | } |
|
354 | 354 | } |
|
355 | 355 |
@@ -35,7 +35,7 signals: | |||
|
35 | 35 | void seriesRemoved(QSeries* series); |
|
36 | 36 | void axisAdded(QChartAxis* axis); |
|
37 | 37 | void axisRemoved(QChartAxis* axis); |
|
38 |
void axis |
|
|
38 | void axisRangeChanged(QChartAxis* axis, const QStringList& labels); | |
|
39 | 39 | void seriesDomainChanged(QSeries* series,const Domain& domain); |
|
40 | 40 | |
|
41 | 41 | private slots: |
@@ -48,7 +48,7 void ChartPresenter::createConnections() | |||
|
48 | 48 | QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*)),this,SLOT(handleAxisAdded(QChartAxis*))); |
|
49 | 49 | QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*))); |
|
50 | 50 | QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QSeries*,const Domain&))); |
|
51 |
QObject::connect(m_dataset,SIGNAL(axis |
|
|
51 | QObject::connect(m_dataset,SIGNAL(axisRangeChanged(QChartAxis*,const QStringList&)),this,SLOT(handleAxisRangeChanged(QChartAxis*,const QStringList&))); | |
|
52 | 52 | } |
|
53 | 53 | |
|
54 | 54 | |
@@ -217,9 +217,9 void ChartPresenter::handleSeriesDomainChanged(QSeries* series, const Domain& do | |||
|
217 | 217 | m_chartItems.value(series)->handleDomainChanged(domain); |
|
218 | 218 | } |
|
219 | 219 | |
|
220 |
void ChartPresenter::handleAxis |
|
|
220 | void ChartPresenter::handleAxisRangeChanged(QChartAxis* axis,const QStringList& labels) | |
|
221 | 221 | { |
|
222 |
m_axisItems.value(axis)->handle |
|
|
222 | m_axisItems.value(axis)->handleRangeChanged(axis,labels); | |
|
223 | 223 | } |
|
224 | 224 | |
|
225 | 225 | void ChartPresenter::setChartTheme(QChart::ChartTheme theme) |
@@ -52,7 +52,7 public slots: | |||
|
52 | 52 | void handleAxisAdded(QChartAxis* axis); |
|
53 | 53 | void handleAxisRemoved(QChartAxis* axis); |
|
54 | 54 | void handleSeriesDomainChanged(QSeries* series, const Domain& domain); |
|
55 |
void handleAxis |
|
|
55 | void handleAxisRangeChanged(QChartAxis* axis, const QStringList& labels); | |
|
56 | 56 | void handleGeometryChanged(); |
|
57 | 57 | signals: |
|
58 | 58 | void geometryChanged(const QRectF& rect); |
@@ -108,7 +108,7 void tst_ChartDataSet::addDomain() | |||
|
108 | 108 | |
|
109 | 109 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
110 | 110 | QSignalSpy spy1(&dataSet, |
|
111 |
SIGNAL(axis |
|
|
111 | SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
112 | 112 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
113 | 113 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
114 | 114 | QSignalSpy spy4(&dataSet, |
@@ -154,7 +154,7 void tst_ChartDataSet::addSeries() | |||
|
154 | 154 | |
|
155 | 155 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
156 | 156 | QSignalSpy spy1(&dataSet, |
|
157 |
SIGNAL(axis |
|
|
157 | SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
158 | 158 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
159 | 159 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
160 | 160 | QSignalSpy spy4(&dataSet, |
@@ -268,7 +268,7 void tst_ChartDataSet::clearDomains() | |||
|
268 | 268 | |
|
269 | 269 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
270 | 270 | QSignalSpy spy1(&dataSet, |
|
271 |
SIGNAL(axis |
|
|
271 | SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
272 | 272 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
273 | 273 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
274 | 274 | QSignalSpy spy4(&dataSet, |
@@ -326,7 +326,7 void tst_ChartDataSet::domain() | |||
|
326 | 326 | |
|
327 | 327 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
328 | 328 | QSignalSpy spy1(&dataSet, |
|
329 |
SIGNAL(axis |
|
|
329 | SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
330 | 330 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
331 | 331 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
332 | 332 | QSignalSpy spy4(&dataSet, |
@@ -403,7 +403,7 void tst_ChartDataSet::nextpreviousDomain() | |||
|
403 | 403 | |
|
404 | 404 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
405 | 405 | QSignalSpy spy1(&dataSet, |
|
406 |
SIGNAL(axis |
|
|
406 | SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
407 | 407 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
408 | 408 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
409 | 409 | QSignalSpy spy4(&dataSet, |
@@ -501,7 +501,7 void tst_ChartDataSet::removeSeries() | |||
|
501 | 501 | |
|
502 | 502 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
503 | 503 | QSignalSpy spy1(&dataSet, |
|
504 |
SIGNAL(axis |
|
|
504 | SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
505 | 505 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
506 | 506 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
507 | 507 | QSignalSpy spy4(&dataSet, |
@@ -571,7 +571,7 void tst_ChartDataSet::removeAllSeries() | |||
|
571 | 571 | } |
|
572 | 572 | |
|
573 | 573 | QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); |
|
574 |
QSignalSpy spy1(&dataSet, SIGNAL(axis |
|
|
574 | QSignalSpy spy1(&dataSet, SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); | |
|
575 | 575 | QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); |
|
576 | 576 | QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); |
|
577 | 577 | QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QSeries*, Domain const&))); |
General Comments 0
You need to be logged in to leave comments.
Login now