HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r400:911bb45e5e52

Adds axis setRange implementation

Michal Klocek -

r400:911bb45e5e52

parent child

Context file:

r400:911bb45e5e52

Collapse all files

example/axischart/main.cpp +4 0

                 axisX->addAxisTickLabel(0,"low");
                 axisX->addAxisTickLabel(50,"medium");
                 axisX->addAxisTickLabel(100,"High");
+                axisX->setMin(-10);
+                axisX->setMax(200);
                 QChartAxis* axisY = chartView->axisY();
                 axisY->setLabelsAngle(45);
                 axisY->addAxisTickLabel(0,"low");
                 axisY->addAxisTickLabel(50,"medium");
                 axisY->addAxisTickLabel(100,"High");
+                axisY->setMin(-10);
+                axisY->setMax(200);
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);

src/chartdataset.cpp +47 -26

                 if(!m_domainMap.contains(axisY))
                 {
                     emit axisAdded(axisY);
-                    QObject::connect(axisY,SIGNAL(minChanged(qreal)),this,SLOT(handleMinChanged(qreal)));
+                    QObject::connect(axisY,SIGNAL(rangeChanged(QChartAxis*)),this,SLOT(handleRangeChanged(QChartAxis*)));
-                    QObject::connect(axisY,SIGNAL(maxChanged(qreal)),this,SLOT(handleMaxChanged(qreal)));
                     QObject::connect(axisY,SIGNAL(ticksChanged(QChartAxis*)),this,SLOT(handleTickChanged(QChartAxis*)));
                 }
-                m_domainMap.replace(axisY,domain);
-                m_seriesMap.insert(axisY,series);
                 if(!m_axisXInitialized)
                 {
                     emit axisAdded(axisX());
-                    QObject::connect(axisX(),SIGNAL(minChanged(qreal)),this,SLOT(handleMinChanged(qreal)));
+                    QObject::connect(axisX(),SIGNAL(rangeChanged(QChartAxis*)),this,SLOT(handleRangeChanged(QChartAxis*)));
-                    QObject::connect(axisX(),SIGNAL(maxChanged(qreal)),this,SLOT(handleMaxChanged(qreal)));
                     QObject::connect(axisX(),SIGNAL(ticksChanged(QChartAxis*)),this,SLOT(handleTickChanged(QChartAxis*)));
                     m_axisXInitialized=true;
                 }
-                QStringList ylabels = createLabels(axisY,domain.m_minY,domain.m_maxY);
+                m_domainMap.replace(axisY,domain);
-                QStringList xlabels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
+                m_seriesMap.insert(axisY,series);
-                emit axisRangeChanged(axisY,ylabels);
-                emit axisRangeChanged(axisX(),xlabels);
                 emit seriesAdded(series);
-                emit seriesDomainChanged(series,domain);
+                setDomain(m_domainIndex);
             }
                     foreach(QSeries* series, seriesList) {
                         emit seriesDomainChanged(series,domain);
                     }
+                    axis->setRange(domain.m_minY,domain.m_maxY);
                     emit axisRangeChanged(axis,labels);
                 }
                 QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
+                axisX()->setRange(domain.m_minX,domain.m_maxY);
                 emit axisRangeChanged(axisX(),labels);
             }
                 foreach (QChartAxis* axis , domainList){
                     domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());
-                    QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-                    QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                    foreach(QSeries* series, seriesList){
-                        emit seriesDomainChanged(series,domain);
-                    emit axisRangeChanged(axis,labels);
                     m_domainMap.insert(axis,domain);
                 }
-                QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
+                setDomain(++m_domainIndex);
-                emit axisRangeChanged(axisX(),labels);
-                m_domainIndex++;
             }
             QChartAxis* ChartDataSet::axisY(QSeries* series) const
             }
-            void ChartDataSet::handleMinChanged(qreal min)
+            void ChartDataSet::handleRangeChanged(QChartAxis* axis)
             {
+                qreal min = axis->min();
+                qreal max = axis->max();
+                if(axis==axisX()) {
-            void ChartDataSet::handleMaxChanged(qreal max)
+                    m_domainIndex=0;
+                    clearDomains(m_domainIndex);
+                    QList<QChartAxis*> domainList = m_domainMap.uniqueKeys();
+                    foreach (QChartAxis* axis , domainList) {
+                        Q_ASSERT(m_domainMap.values(axis).size()==1);
+                        Domain domain = m_domainMap.value(axis);
+                        domain.m_minX=min;
+                        domain.m_maxX=max;
+                        m_domainMap.replace(axis,domain);
+                    }
+                }
+                else {
+                    QList<Domain> domains = m_domainMap.values(axis);
+                    m_domainMap.remove(axis);
+                    for(int i=0;i<domains.size();i++)
+                    {
+                        domains[i].m_minY=min;
+                        domains[i].m_maxY=max;
+                    }
+                    for(int j=domains.size()-1; j>=0;j--)
+                    m_domainMap.insert(axis,domains.at(j));
+                }
+                setDomain(m_domainIndex);
             }
             void ChartDataSet::handleTickChanged(QChartAxis* axis)
             {
-                Domain domain = m_domainMap.value(axisY());
                 if(axis==axisX()){
+                    Domain domain = m_domainMap.value(axisY());
                     QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);
                     emit axisRangeChanged(axis,labels);
                 }else{
+                    Domain domain = m_domainMap.value(axis);
                     QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
                     emit axisRangeChanged(axis,labels);
                 }

src/chartdataset_p.h +1 -2

                 void seriesDomainChanged(QSeries* series,const Domain& domain);
             private slots:
-            	void handleMinChanged(qreal min);
+            	void handleRangeChanged(QChartAxis*);
-            	void handleMaxChanged(qreal max);
             	void handleTickChanged(QChartAxis*);
             private:

src/linechart/qlineseries.cpp +1 -1

             */
             /*!
-                \fn void QLineSeries::updated(int index)
+                \fn void QLineSeries::updated()
                 \brief \internal
             */

src/qchartaxis.cpp +36 -12

             */
             /*!
+                \fn void QChartAxis::rangeChanged(QChartAxis*)
+                \brief \internal
+            */
+            /*!
+                \fn void QChartAxis::updateRange(qreal min, qreal max)
+                \brief \internal \a min \a max
+            */
+            /*!
                 Constructs new axis object which is a child of \a parent. Ownership is taken by
                 QChatView or QChart when axis added.
             */
             }
             /*!
-              Sets \a min value on the axis.
+             Sets \a min value on the axis.
              */
             void QChartAxis::setMin(qreal min)
             {
-            	if(m_min!=min){
+                if(m_min!=min) {
-            		m_min=min;
+                    m_min=min;
-            		emit minChanged(m_min);
+                    emit rangeChanged(this);
+                }
             }
             /*!
-              Sets \a max value on the axis.
+             Sets \a max value on the axis.
              */
             void QChartAxis::setMax(qreal max)
             {
-            	if(m_max!=max){
+                if(m_max!=max) {
-            		m_max=max;
+                   m_max=max;
-            		emit maxChanged(m_max);
+                   emit rangeChanged(this);
+                }
             }
             /*!
              */
             void QChartAxis::setRange(qreal min, qreal max)
             {
-            	setMin(min);
+                setMin(min);
-            	setMax(max);
+                setMax(max);
+            }
+            void QChartAxis::updateRange(qreal min, qreal max)
+            {
+                if(m_max!=max){
+                    emit maxChanged(max);
+                }
+                if(m_min!=min){
+                    emit minChanged(min);
+                }
+                m_max=max;
+                m_min=min;
             }
             /*!

src/qchartaxis.h +4 0

                 QString axisTickLabel(qreal value) const ;
                 void clearAxisTickLabels();
+                //internal
+                void updateRange(qreal min, qreal max);
             signals:
             	void minChanged(qreal min);
             	void maxChanged(qreal max);
             //private signal
             	void update(QChartAxis*);
+            	void rangeChanged(QChartAxis*);
             	void ticksChanged(QChartAxis*);
             private:

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