HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r399:91816cf9fc5c

Rename axisLabelsChanged to axisRangeChanged

Michal Klocek -

r399:91816cf9fc5c

parent child

Context file:

r399:91816cf9fc5c

Collapse all files

src/axisitem.cpp +1 -1

                 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();

src/axisitem_p.h +1 -1

             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<qreal>& oldLayout,QVector<qreal>& newLayout);

src/chartdataset.cpp +8 -8

                 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 axisRangeChanged(axisY,ylabels);
-                emit axisLabelsChanged(axisX(),xlabels);
+                emit axisRangeChanged(axisX(),xlabels);
                 emit seriesAdded(series);
                 emit seriesDomainChanged(series,domain);
                     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)
                     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++;
             }
                 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);
                 }
             }

src/chartdataset_p.h +1 -1

                 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:

src/chartpresenter.cpp +3 -3

                 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&)));
             }
                 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)

src/chartpresenter_p.h +1 -1

                 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);

test/auto/chartdataset/tst_chartdataset.cpp +7 -7

             	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,
             	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,
             	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,
             	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,
             	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,
             	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,
                 }
                 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&)));

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages