HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/domain/xypolardomain.cpp

Check that areaseries is actually in chart before trying to update....

Check that areaseries is actually in chart before trying to update. When a line series is used both as a series on chart and as an area series boundary, but not at the same time, animation can sometimes get confused as to what series to update if the area series is removed from the chart and the line series is added to the chart while a series animation is running. Task-number: QTRD-3445 Change-Id: Ia3d72d3ceba784b6e162b2c9b678acdc3e3ffcac Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2800:891ed0097501

Download file

             xypolardomain.cpp
        
                    182 lines
            
             | 4.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / domain / xypolardomain.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** Copyright (C) 2015 The Qt Company Ltd

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** For any questions to The Qt Company, please use contact form at http://qt.io

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** Licensees holding valid commercial license for Qt may use this file in

      ** accordance with the Qt License Agreement provided with the Software

      ** or, alternatively, in accordance with the terms contained in a written

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** agreement between you and The Qt Company.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

      ** If you have questions regarding the use of this file, please use

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** contact form at http://qt.io

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

      ****************************************************************************/

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/xypolardomain_p.h>

      #include <private/qabstractaxis_p.h>

      #include <QtCore/QtMath>

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      XYPolarDomain::XYPolarDomain(QObject *parent)

          : PolarDomain(parent)

      {

      }

      XYPolarDomain::~XYPolarDomain()

      {

      }

      void XYPolarDomain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)

      {

          bool axisXChanged = false;

          bool axisYChanged = false;

          if (!qFuzzyCompare(m_minX, minX) || !qFuzzyCompare(m_maxX, maxX)) {

              m_minX = minX;

              m_maxX = maxX;

              axisXChanged = true;

              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;

              if (!m_signalsBlocked)

                  emit rangeVerticalChanged(m_minY, m_maxY);

          }

          if (axisXChanged || axisYChanged)

              emit updated();

      }

      void XYPolarDomain::zoomIn(const QRectF &rect)

      {

        Miikka Heikkinen
    
Added QChart::zoomReset() and QChart::isZoomed()...

              r2545
            
          storeZoomReset();

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          qreal dx = spanX() / m_size.width();

          qreal dy = spanY() / m_size.height();

          qreal maxX = m_maxX;

          qreal minX = m_minX;

          qreal minY = m_minY;

          qreal maxY = m_maxY;

          maxX = minX + dx * rect.right();

          minX = minX + dx * rect.left();

          minY = maxY - dy * rect.bottom();

          maxY = maxY - dy * rect.top();

          setRange(minX, maxX, minY, maxY);

      }

      void XYPolarDomain::zoomOut(const QRectF &rect)

      {

        Miikka Heikkinen
    
Added QChart::zoomReset() and QChart::isZoomed()...

              r2545
            
          storeZoomReset();

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          qreal dx = spanX() / rect.width();

          qreal dy = spanY() / rect.height();

          qreal maxX = m_maxX;

          qreal minX = m_minX;

          qreal minY = m_minY;

          qreal maxY = m_maxY;

          minX = maxX - dx * rect.right();

          maxX = minX + dx * m_size.width();

          maxY = minY + dy * rect.bottom();

          minY = maxY - dy * m_size.height();

          setRange(minX, maxX, minY, maxY);

      }

      void XYPolarDomain::move(qreal dx, qreal dy)

      {

          // One unit scrolls one degree angular and one pixel radial

          qreal x = spanX() / 360.0;

          qreal y = spanY() / m_radius;

          qreal maxX = m_maxX;

          qreal minX = m_minX;

          qreal minY = m_minY;

          qreal maxY = m_maxY;

          if (dx != 0) {

              minX = minX + x * dx;

              maxX = maxX + x * dx;

          }

          if (dy != 0) {

              minY = minY + y * dy;

              maxY = maxY + y * dy;

          }

          setRange(minX, maxX, minY, maxY);

      }

      QPointF XYPolarDomain::calculateDomainPoint(const QPointF &point) const

      {

          if (point == m_center)

              return QPointF(0.0, m_minX);

          QLineF line(m_center, point);

          qreal a = 90.0 - line.angle();

          if (a < 0.0)

              a += 360.0;

          a = ((a / 360.0) * (m_maxX - m_minX)) + m_minX;

          qreal r = m_minY + ((m_maxY - m_minY) * (line.length() / m_radius));

          return QPointF(a, r);

      }

      qreal XYPolarDomain::toAngularCoordinate(qreal value, bool &ok) const

      {

          ok = true;

          qreal f = (value - m_minX) / (m_maxX - m_minX);

          return f * 360.0;

      }

      qreal XYPolarDomain::toRadialCoordinate(qreal value, bool &ok) const

      {

          ok = true;

          if (value < m_minY)

              value = m_minY;

          // Dont limit the max. The drawing should clip the stuff that goes out of the grid

          qreal f = (value - m_minY) / (m_maxY - m_minY);

          return f * m_radius;

      }

      // operators

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYPolarDomain &domain1, const XYPolarDomain &domain2)

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      {

          return (qFuzzyCompare(domain1.m_maxX, domain2.m_maxX)

                  && qFuzzyCompare(domain1.m_maxY, domain2.m_maxY)

                  && qFuzzyCompare(domain1.m_minX, domain2.m_minX)

                  && qFuzzyCompare(domain1.m_minY, domain2.m_minY));

      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XYPolarDomain &domain1, const XYPolarDomain &domain2)

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      {

          return !(domain1 == domain2);

      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain)

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      {

        Titta Heikkala
    
Fix Chart build when QT_NO_TEXTSTREAM is defined...

              r2620
            
      #ifdef QT_NO_TEXTSTREAM

          Q_UNUSED(domain)

      #else

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size;

        Titta Heikkala
    
Fix Chart build when QT_NO_TEXTSTREAM is defined...

              r2620
            
      #endif

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          return dbg.maybeSpace();

      }

      #include "moc_xypolardomain_p.cpp"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

	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

Miikka Heikkinen Add Polar chart support...	r2483	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Miikka Heikkinen Add Polar chart support...	r2483	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2740	** Licensees holding valid commercial license for Qt may use this file in
		** accordance with the Qt License Agreement provided with the Software
		** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala Copyright header changes...	r2776	** agreement between you and The Qt Company.
Miikka Heikkinen Add Polar chart support...	r2483	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Miikka Heikkinen Add Polar chart support...	r2483	**
		****************************************************************************/

Titta Heikkala Fix include syntax...	r2714	#include <private/xypolardomain_p.h>
		#include <private/qabstractaxis_p.h>
		#include <QtCore/QtMath>
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Miikka Heikkinen Add Polar chart support...	r2483
		XYPolarDomain::XYPolarDomain(QObject *parent)
		: PolarDomain(parent)
		{
		}

		XYPolarDomain::~XYPolarDomain()
		{
		}

		void XYPolarDomain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)
		{
		bool axisXChanged = false;
		bool axisYChanged = false;

		if (!qFuzzyCompare(m_minX, minX) \|\| !qFuzzyCompare(m_maxX, maxX)) {
		m_minX = minX;
		m_maxX = maxX;
		axisXChanged = true;
		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;
		if (!m_signalsBlocked)
		emit rangeVerticalChanged(m_minY, m_maxY);
		}

		if (axisXChanged \|\| axisYChanged)
		emit updated();
		}


		void XYPolarDomain::zoomIn(const QRectF &rect)
		{
Miikka Heikkinen Added QChart::zoomReset() and QChart::isZoomed()...	r2545	storeZoomReset();
Miikka Heikkinen Add Polar chart support...	r2483	qreal dx = spanX() / m_size.width();
		qreal dy = spanY() / m_size.height();

		qreal maxX = m_maxX;
		qreal minX = m_minX;
		qreal minY = m_minY;
		qreal maxY = m_maxY;

		maxX = minX + dx * rect.right();
		minX = minX + dx * rect.left();
		minY = maxY - dy * rect.bottom();
		maxY = maxY - dy * rect.top();

		setRange(minX, maxX, minY, maxY);
		}

		void XYPolarDomain::zoomOut(const QRectF &rect)
		{
Miikka Heikkinen Added QChart::zoomReset() and QChart::isZoomed()...	r2545	storeZoomReset();
Miikka Heikkinen Add Polar chart support...	r2483	qreal dx = spanX() / rect.width();
		qreal dy = spanY() / rect.height();

		qreal maxX = m_maxX;
		qreal minX = m_minX;
		qreal minY = m_minY;
		qreal maxY = m_maxY;

		minX = maxX - dx * rect.right();
		maxX = minX + dx * m_size.width();
		maxY = minY + dy * rect.bottom();
		minY = maxY - dy * m_size.height();

		setRange(minX, maxX, minY, maxY);
		}

		void XYPolarDomain::move(qreal dx, qreal dy)
		{
		// One unit scrolls one degree angular and one pixel radial
		qreal x = spanX() / 360.0;
		qreal y = spanY() / m_radius;

		qreal maxX = m_maxX;
		qreal minX = m_minX;
		qreal minY = m_minY;
		qreal maxY = m_maxY;

		if (dx != 0) {
		minX = minX + x * dx;
		maxX = maxX + x * dx;
		}
		if (dy != 0) {
		minY = minY + y * dy;
		maxY = maxY + y * dy;
		}
		setRange(minX, maxX, minY, maxY);
		}

		QPointF XYPolarDomain::calculateDomainPoint(const QPointF &point) const
		{
		if (point == m_center)
		return QPointF(0.0, m_minX);

		QLineF line(m_center, point);
		qreal a = 90.0 - line.angle();
		if (a < 0.0)
		a += 360.0;
		a = ((a / 360.0) * (m_maxX - m_minX)) + m_minX;
		qreal r = m_minY + ((m_maxY - m_minY) * (line.length() / m_radius));
		return QPointF(a, r);
		}

		qreal XYPolarDomain::toAngularCoordinate(qreal value, bool &ok) const
		{
		ok = true;
		qreal f = (value - m_minX) / (m_maxX - m_minX);
		return f * 360.0;
		}

		qreal XYPolarDomain::toRadialCoordinate(qreal value, bool &ok) const
		{
		ok = true;
		if (value < m_minY)
		value = m_minY;

		// Dont limit the max. The drawing should clip the stuff that goes out of the grid
		qreal f = (value - m_minY) / (m_maxY - m_minY);

		return f * m_radius;
		}

		// operators

Titta Heikkala Qt Charts project file structure change...	r2712	bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYPolarDomain &domain1, const XYPolarDomain &domain2)
Miikka Heikkinen Add Polar chart support...	r2483	{
		return (qFuzzyCompare(domain1.m_maxX, domain2.m_maxX)
		&& qFuzzyCompare(domain1.m_maxY, domain2.m_maxY)
		&& qFuzzyCompare(domain1.m_minX, domain2.m_minX)
		&& qFuzzyCompare(domain1.m_minY, domain2.m_minY));
		}


Titta Heikkala Qt Charts project file structure change...	r2712	bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XYPolarDomain &domain1, const XYPolarDomain &domain2)
Miikka Heikkinen Add Polar chart support...	r2483	{
		return !(domain1 == domain2);
		}


Titta Heikkala Qt Charts project file structure change...	r2712	QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain)
Miikka Heikkinen Add Polar chart support...	r2483	{
Titta Heikkala Fix Chart build when QT_NO_TEXTSTREAM is defined...	r2620	#ifdef QT_NO_TEXTSTREAM
		Q_UNUSED(domain)
		#else
Miikka Heikkinen Add Polar chart support...	r2483	dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size;
Titta Heikkala Fix Chart build when QT_NO_TEXTSTREAM is defined...	r2620	#endif
Miikka Heikkinen Add Polar chart support...	r2483	return dbg.maybeSpace();
		}

		#include "moc_xypolardomain_p.cpp"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE