HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2289:d4cb0061d8bc

Bugfix resize event during zoomin

Michal Klocek -

r2289:d4cb0061d8bc

parent child

Context file:

r2289:d4cb0061d8bc

Collapse all files

src/chartdataset.cpp +7 -8

                  QList<AbstractDomain*> domains;
                  foreach(QAbstractSeries *s, m_seriesList) {
                      AbstractDomain* domain = s->d_ptr->domain();
-                     s->d_ptr->m_domain->blockAxisSignals(true);
+                     s->d_ptr->m_domain->blockRangeSignals(true);
                      domains<<domain;
                  }
                      domain->zoomIn(rect);
                  foreach(AbstractDomain *domain, domains)
-                     domain->blockAxisSignals(false);
+                     domain->blockRangeSignals(false);
              }
              void ChartDataSet::zoomOutDomain(const QRectF &rect)
                  QList<AbstractDomain*> domains;
                  foreach(QAbstractSeries *s, m_seriesList) {
                      AbstractDomain* domain = s->d_ptr->domain();
-                     s->d_ptr->m_domain->blockAxisSignals(true);
+                     s->d_ptr->m_domain->blockRangeSignals(true);
                      domains<<domain;
                  }
                      domain->zoomOut(rect);
                  foreach(AbstractDomain *domain, domains)
-                     domain->blockAxisSignals(false);
+                     domain->blockRangeSignals(false);
              }
              void ChartDataSet::scrollDomain(qreal dx, qreal dy)
              {
                  QList<AbstractDomain*> domains;
                  foreach(QAbstractSeries *s, m_seriesList) {
-                     AbstractDomain* domain = s->d_ptr->m_domain.data();
-                     if(domains.contains(domain)) continue;
-                     s->d_ptr->m_domain->blockAxisSignals(true);
+                     AbstractDomain* domain = s->d_ptr->domain();
+                     s->d_ptr->m_domain->blockRangeSignals(true);
                      domains<<domain;
                  }
                      domain->move(dx, dy);
                  foreach(AbstractDomain *domain, domains)
-                     domain->blockAxisSignals(false);
+                     domain->blockRangeSignals(false);
              }
              QList<QAbstractAxis*> ChartDataSet::axes() const

src/domain/abstractdomain.cpp +11 -7

                    m_maxX(0),
                    m_minY(0),
                    m_maxY(0),
-                   m_axisSignalsBlocked(false)
+                   m_signalsBlocked(false)
              {
              }
              void AbstractDomain::handleVerticalAxisRangeChanged(qreal min, qreal max)
              {
-                 if(!m_axisSignalsBlocked)
-                     setRangeY(min, max);
+                 setRangeY(min, max);
              }
              void AbstractDomain::handleHorizontalAxisRangeChanged(qreal min, qreal max)
              {
-                 if(!m_axisSignalsBlocked)
-                     setRangeX(min, max);
+                 setRangeX(min, max);
              }
-             void AbstractDomain::blockAxisSignals(bool block)
+             void AbstractDomain::blockRangeSignals(bool block)
              {
-                 m_axisSignalsBlocked=block;
+                 if(m_signalsBlocked!=block){
+                     m_signalsBlocked=block;
+                     if(!block) {
+                         emit rangeHorizontalChanged(m_minX,m_maxX);
+                         emit rangeVerticalChanged(m_minY,m_maxY);
+                     }
+                 }
              }
              //algorithm defined by Paul S.Heckbert GraphicalGems I

src/domain/abstractdomain_p.h +3 -3

                  qreal spanY() const;
                  bool isEmpty() const;
-                 void blockAxisSignals(bool block);
-                 bool axisSignalsBlocked() const { return m_axisSignalsBlocked; }
+                 void blockRangeSignals(bool block);
+                 bool rangeSignalsBlocked() const { return m_signalsBlocked; }
                  friend bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const AbstractDomain &domain1, const AbstractDomain &domain2);
                  friend bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1, const AbstractDomain &domain2);
                  qreal m_minY;
                  qreal m_maxY;
                  QSizeF m_size;
-                 bool m_axisSignalsBlocked;
+                 bool m_signalsBlocked;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/domain/xydomain.cpp +4 -2

                      m_minX = minX;
                      m_maxX = maxX;
                      axisXChanged = true;
-                     emit rangeHorizontalChanged(m_minX, m_maxX);
+                     if(!m_signalsBlocked)
+                         emit rangeHorizontalChanged(m_minX, m_maxX);
                  }
                  if (!qFuzzyCompare(m_minY, minY) || !qFuzzyCompare(m_maxY, maxY)) {
                      m_minY = minY;
                      m_maxY = maxY;
                      axisYChanged = true;
-                     emit rangeVerticalChanged(m_minY, m_maxY);
+                     if(!m_signalsBlocked)
+                         emit rangeVerticalChanged(m_minY, m_maxY);
                  }
                  if (axisXChanged || axisYChanged)

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