HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2292:29ed1b505c34

bugfix signals not reconnected when domain changed

Michal Klocek -

r2292:29ed1b505c34

parent child

Context file:

r2292:29ed1b505c34

src/chartdataset.cpp +8 -3

                 if(!domain->attachAxis(axis)) return false;
-                series->d_ptr->m_axes<<axis;
-                axis->d_ptr->m_series<<series;
                 if(domain!=series->d_ptr->domain()){
+                    foreach(QAbstractAxis* axis,series->d_ptr->m_axes){
+                        series->d_ptr->domain()->detachAxis(axis);
+                        domain->attachAxis(axis);
+                    }
                     series->d_ptr->setDomain(domain);
                     series->d_ptr->initializeDomain();
                 }
+                series->d_ptr->m_axes<<axis;
+                axis->d_ptr->m_series<<series;
                 series->d_ptr->initializeAxes();
                 axis->d_ptr->initializeDomain(domain);

src/domain/xlogydomain.cpp +2 -4

             bool XLogYDomain::attachAxis(QAbstractAxis* axis)
             {
-                AbstractDomain::attachAxis(axis);
                 QLogValueAxis *logAxis = qobject_cast<QLogValueAxis *>(axis);
                 if(logAxis && logAxis->orientation()==Qt::Vertical)
                     QObject::connect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleVerticalAxisBaseChanged(qreal)));
-                return true;
+                return  AbstractDomain::attachAxis(axis);
             }
             bool XLogYDomain::detachAxis(QAbstractAxis* axis)
             {
-                AbstractDomain::detachAxis(axis);
                 QLogValueAxis *logAxis = qobject_cast<QLogValueAxis *>(axis);
                 if(logAxis && logAxis->orientation()==Qt::Vertical)
                     QObject::disconnect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleVerticalAxisBaseChanged(qreal)));
-                return true;
+                return AbstractDomain::detachAxis(axis);
             }
             void XLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)

General Comments 0

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

No TODOs yet

	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