From 91816cf9fc5c343740d63ea92c8efaf9b6e44add 2012-02-29 13:33:51 From: Michal Klocek Date: 2012-02-29 13:33:51 Subject: [PATCH] Rename axisLabelsChanged to axisRangeChanged --- diff --git a/src/axisitem.cpp b/src/axisitem.cpp index 6843850..ac29053 100644 --- a/src/axisitem.cpp +++ b/src/axisitem.cpp @@ -117,7 +117,7 @@ void AxisItem::handleAxisUpdate(QChartAxis* axis) setShadesBrush(axis->shadesBrush()); } -void AxisItem::handleLabelsChanged(QChartAxis* axis,const QStringList& labels) +void AxisItem::handleRangeChanged(QChartAxis* axis,const QStringList& labels) { int diff = m_thicksList.size() - labels.size(); diff --git a/src/axisitem_p.h b/src/axisitem_p.h index 1d12e8a..48e8d6d 100644 --- a/src/axisitem_p.h +++ b/src/axisitem_p.h @@ -51,7 +51,7 @@ public: public slots: void handleAxisUpdate(QChartAxis* axis); //look and feel - void handleLabelsChanged(QChartAxis* axis,const QStringList& labels); //labels from dataset + void handleRangeChanged(QChartAxis* axis,const QStringList& labels); //labels from dataset void handleGeometryChanged(const QRectF& size); // geometry from presenter public: virtual void updateItems(QVector& oldLayout,QVector& newLayout); diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp index 54fc613..c6f3899 100644 --- a/src/chartdataset.cpp +++ b/src/chartdataset.cpp @@ -152,8 +152,8 @@ void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY) QStringList ylabels = createLabels(axisY,domain.m_minY,domain.m_maxY); QStringList xlabels = createLabels(axisX(),domain.m_minX,domain.m_maxX); - emit axisLabelsChanged(axisY,ylabels); - emit axisLabelsChanged(axisX(),xlabels); + emit axisRangeChanged(axisY,ylabels); + emit axisRangeChanged(axisX(),xlabels); emit seriesAdded(series); emit seriesDomainChanged(series,domain); @@ -240,11 +240,11 @@ void ChartDataSet::setDomain(int index) foreach(QSeries* series, seriesList) { emit seriesDomainChanged(series,domain); } - emit axisLabelsChanged(axis,labels); + emit axisRangeChanged(axis,labels); } QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX); - emit axisLabelsChanged(axisX(),labels); + emit axisRangeChanged(axisX(),labels); } void ChartDataSet::clearDomains(int toIndex) @@ -286,12 +286,12 @@ void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport) foreach(QSeries* series, seriesList){ emit seriesDomainChanged(series,domain); } - emit axisLabelsChanged(axis,labels); + emit axisRangeChanged(axis,labels); m_domainMap.insert(axis,domain); } QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX); - emit axisLabelsChanged(axisX(),labels); + emit axisRangeChanged(axisX(),labels); m_domainIndex++; } @@ -346,10 +346,10 @@ void ChartDataSet::handleTickChanged(QChartAxis* axis) Domain domain = m_domainMap.value(axisY()); if(axis==axisX()){ QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX); - emit axisLabelsChanged(axis,labels); + emit axisRangeChanged(axis,labels); }else{ QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY); - emit axisLabelsChanged(axis,labels); + emit axisRangeChanged(axis,labels); } } diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h index 9cdd499..75c4ab4 100644 --- a/src/chartdataset_p.h +++ b/src/chartdataset_p.h @@ -35,7 +35,7 @@ signals: void seriesRemoved(QSeries* series); void axisAdded(QChartAxis* axis); void axisRemoved(QChartAxis* axis); - void axisLabelsChanged(QChartAxis* axis, const QStringList& labels); + void axisRangeChanged(QChartAxis* axis, const QStringList& labels); void seriesDomainChanged(QSeries* series,const Domain& domain); private slots: diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp index 29b2746..dcf6c44 100644 --- a/src/chartpresenter.cpp +++ b/src/chartpresenter.cpp @@ -48,7 +48,7 @@ void ChartPresenter::createConnections() QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*)),this,SLOT(handleAxisAdded(QChartAxis*))); QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*))); QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QSeries*,const Domain&))); - QObject::connect(m_dataset,SIGNAL(axisLabelsChanged(QChartAxis*,const QStringList&)),this,SLOT(handleAxisLabelsChanged(QChartAxis*,const QStringList&))); + QObject::connect(m_dataset,SIGNAL(axisRangeChanged(QChartAxis*,const QStringList&)),this,SLOT(handleAxisRangeChanged(QChartAxis*,const QStringList&))); } @@ -217,9 +217,9 @@ void ChartPresenter::handleSeriesDomainChanged(QSeries* series, const Domain& do m_chartItems.value(series)->handleDomainChanged(domain); } -void ChartPresenter::handleAxisLabelsChanged(QChartAxis* axis,const QStringList& labels) +void ChartPresenter::handleAxisRangeChanged(QChartAxis* axis,const QStringList& labels) { - m_axisItems.value(axis)->handleLabelsChanged(axis,labels); + m_axisItems.value(axis)->handleRangeChanged(axis,labels); } void ChartPresenter::setChartTheme(QChart::ChartTheme theme) diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h index e78acaf..ef9bf81 100644 --- a/src/chartpresenter_p.h +++ b/src/chartpresenter_p.h @@ -52,7 +52,7 @@ public slots: void handleAxisAdded(QChartAxis* axis); void handleAxisRemoved(QChartAxis* axis); void handleSeriesDomainChanged(QSeries* series, const Domain& domain); - void handleAxisLabelsChanged(QChartAxis* axis, const QStringList& labels); + void handleAxisRangeChanged(QChartAxis* axis, const QStringList& labels); void handleGeometryChanged(); signals: void geometryChanged(const QRectF& rect); diff --git a/test/auto/chartdataset/tst_chartdataset.cpp b/test/auto/chartdataset/tst_chartdataset.cpp index 2bf9185..92581e3 100644 --- a/test/auto/chartdataset/tst_chartdataset.cpp +++ b/test/auto/chartdataset/tst_chartdataset.cpp @@ -108,7 +108,7 @@ void tst_ChartDataSet::addDomain() QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); QSignalSpy spy1(&dataSet, - SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, @@ -154,7 +154,7 @@ void tst_ChartDataSet::addSeries() QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); QSignalSpy spy1(&dataSet, - SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, @@ -268,7 +268,7 @@ void tst_ChartDataSet::clearDomains() QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); QSignalSpy spy1(&dataSet, - SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, @@ -326,7 +326,7 @@ void tst_ChartDataSet::domain() QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); QSignalSpy spy1(&dataSet, - SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, @@ -403,7 +403,7 @@ void tst_ChartDataSet::nextpreviousDomain() QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); QSignalSpy spy1(&dataSet, - SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, @@ -501,7 +501,7 @@ void tst_ChartDataSet::removeSeries() QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); QSignalSpy spy1(&dataSet, - SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, @@ -571,7 +571,7 @@ void tst_ChartDataSet::removeAllSeries() } QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*))); - QSignalSpy spy1(&dataSet, SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&))); + QSignalSpy spy1(&dataSet, SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&))); QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*))); QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*))); QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));