HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2288:a12d6a605fab

Fix domain switching

Michal Klocek -

r2288:a12d6a605fab

parent child

Context file:

r2288:a12d6a605fab

Collapse all files

src/chartdataset.cpp +22 -5

                 if(type == AbstractDomain::UndefinedDomain) return false;
                 if(domain->type()!=type){
                     domain =  createDomain(type);
                 }
                 series->d_ptr->m_axes<<axis;
                 axis->d_ptr->m_series<<series;
+                if(domain!=series->d_ptr->domain()){
                     series->d_ptr->setDomain(domain);
                     series->d_ptr->initializeDomain();
+                }
                 series->d_ptr->initializeAxes();
                 axis->d_ptr->initializeDomain(domain);
             AbstractDomain::DomainType ChartDataSet::selectDomain(QList<QAbstractAxis*> axes)
             {
                 enum Type {
+                    Undefined = 0,
                     LogType = 0x1,
                     ValueType = 0x2
                 };
-                int horizontal(ValueType);
+                int horizontal(Undefined);
-                int vertical(ValueType);
+                int vertical(Undefined);
                 foreach(QAbstractAxis* axis, axes)
                 {
                     switch(axis->type()) {
                         case QAbstractAxis::AxisTypeLogValue:
-                            axis->orientation()==Qt::Horizontal?horizontal:vertical|=LogType;
+                        if(axis->orientation()==Qt::Horizontal) {
+                            horizontal|=LogType;
+                        }
+                        if(axis->orientation()==Qt::Vertical) {
+                            vertical|=LogType;
+                        }
                         break;
                         case QAbstractAxis::AxisTypeValue:
                         case QAbstractAxis::AxisTypeBarCategory:
                         case QAbstractAxis::AxisTypeCategory:
                         case QAbstractAxis::AxisTypeDateTime:
-                            axis->orientation()==Qt::Horizontal?horizontal:vertical|=ValueType;
+                        if(axis->orientation()==Qt::Horizontal) {
+                            horizontal|=ValueType;
+                        }
+                        if(axis->orientation()==Qt::Vertical) {
+                            vertical|=ValueType;
+                        }
                         break;
                         default:
                         qWarning()<<"Undefined type";
                     }
                 }
+                if(vertical==Undefined) vertical=ValueType;
+                if(horizontal==Undefined) horizontal=ValueType;
                 if(vertical==ValueType && horizontal== ValueType) {
                     return AbstractDomain::XYDomain;
                 }

src/chartpresenter.cpp 0 -4

             void ChartPresenter::handleAxisAdded(QAbstractAxis *axis)
             {
-                qDebug()<<__FUNCTION__;
                 axis->d_ptr->initializeGraphics(rootItem());
                 axis->d_ptr->initializeAnimations(m_options);
                 ChartAxis *item = axis->d_ptr->axisItem();
             void ChartPresenter::handleAxisRemoved(QAbstractAxis *axis)
             {
-                qDebug()<<__FUNCTION__;
                 ChartAxis *item  = axis->d_ptr->m_item.take();
                 item->hide();
                 item->disconnect();
             void ChartPresenter::handleSeriesAdded(QAbstractSeries *series)
             {
-                qDebug()<<__FUNCTION__;
                 series->d_ptr->initializeGraphics(rootItem());
                 series->d_ptr->initializeAnimations(m_options);
                 ChartItem *chart = series->d_ptr->chartItem();
             void ChartPresenter::handleSeriesRemoved(QAbstractSeries *series)
             {
-                qDebug()<<__FUNCTION__;
                 ChartItem *chart  = series->d_ptr->m_item.take();
                 chart->hide();
                 chart->disconnect();

src/domain/logxlogydomain.cpp +2 0

                     axisXChanged = true;
                     m_logMinX = log10(m_minX) / log10(m_logBaseX);
                     m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
+                    if(!m_signalsBlocked)
                     emit rangeHorizontalChanged(m_minX, m_maxX);
                 }
                     axisYChanged = true;
                     m_logMinY = log10(m_minY) / log10(m_logBaseY);
                     m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
+                    if(!m_signalsBlocked)
                     emit rangeVerticalChanged(m_minY, m_maxY);
                 }

src/domain/logxydomain.cpp +2 -1

                     axisXChanged = true;
                     m_logMinX = log10(m_minX) / log10(m_logBaseX);
                     m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
+                    if(!m_signalsBlocked)
                     emit rangeHorizontalChanged(m_minX, m_maxX);
                 }
                     m_minY = minY;
                     m_maxY = maxY;
                     axisYChanged = true;
+                    if(!m_signalsBlocked)
                     emit rangeVerticalChanged(m_minY, m_maxY);
                 }

src/domain/xlogydomain.cpp +2 0

                     m_minX = minX;
                     m_maxX = maxX;
                     axisXChanged = true;
+                    if(!m_signalsBlocked)
                     emit rangeHorizontalChanged(m_minX, m_maxX);
                 }
                     axisYChanged = true;
                     m_logMinY = log10(m_minY) / log10(m_logBaseY);
                     m_logMaxY = log10(m_maxY) / log10(m_logBaseY);
+                    if(!m_signalsBlocked)
                     emit rangeVerticalChanged(m_minY, m_maxY);
                 }

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