HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/chartbackground.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

             chartbackground.cpp
        
                    89 lines
            
             | 2.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / chartbackground.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

              r794
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

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

        Jani Honkonen
    
Add license headers

              r794
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        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.

        Jani Honkonen
    
Add license headers

              r794
            
      **

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

        Titta Heikkala
    
Updated license headers...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

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

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/chartbackground_p.h>

      #include <private/chartconfig_p.h>

      #include <QtGui/QPen>

      #include <QtGui/QBrush>

      #include <QtGui/QPainter>

        Tero Ahola
    
Added drop shadow effect for light themes

              r1001
            
      #include <QGraphicsDropShadowEffect>

        Michal Klocek
    
Add missing files from last commit

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Michal Klocek
    
Add missing files from last commit

              r640
            
        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
      ChartBackground::ChartBackground(QGraphicsItem *parent)

          : QGraphicsRectItem(parent),

        Miikka Heikkinen
    
Added API to set chart background roundness...

              r2549
            
            m_diameter(5),

        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
            m_dropShadow(0)

        Michal Klocek
    
Add missing files from last commit

              r640
            
      {

      }

      ChartBackground::~ChartBackground()

      {

      }

        Tero Ahola
    
Added drop shadow effect for light themes

              r1001
            
      void ChartBackground::setDropShadowEnabled(bool enabled)

      {

        Titta Heikkala
    
Fix Charts build with QT_NO_GRAPHICSEFFECT definition...

              r2624
            
      #ifdef QT_NO_GRAPHICSEFFECT

          Q_UNUSED(enabled)

      #else

        Tero Ahola
    
Added drop shadow effect for light themes

              r1001
            
          if (enabled) {

              if (!m_dropShadow) {

                  m_dropShadow = new QGraphicsDropShadowEffect();

        Tero Ahola
    
Tuned drop shadow effect

              r1014
            
      #ifdef Q_OS_MAC

                  m_dropShadow->setBlurRadius(15);

                  m_dropShadow->setOffset(0, 0);

      #elif defined(Q_OS_WIN)

                  m_dropShadow->setBlurRadius(10);

                  m_dropShadow->setOffset(0, 0);

      #else

        Tero Ahola
    
Added drop shadow effect for light themes

              r1001
            
                  m_dropShadow->setBlurRadius(10);

                  m_dropShadow->setOffset(5, 5);

        Tero Ahola
    
Tuned drop shadow effect

              r1014
            
      #endif

        Tero Ahola
    
Added drop shadow effect for light themes

              r1001
            
                  setGraphicsEffect(m_dropShadow);

              }

          } else {

              delete m_dropShadow;

              m_dropShadow = 0;

          }

        Titta Heikkala
    
Fix Charts build with QT_NO_GRAPHICSEFFECT definition...

              r2624
            
      #endif

        Tero Ahola
    
Added drop shadow effect for light themes

              r1001
            
      }

        Michal Klocek
    
Add missing files from last commit

              r640
            
      void ChartBackground::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

      {

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          Q_UNUSED(option);

          Q_UNUSED(widget);

          painter->save();

          painter->setPen(pen());

          painter->setBrush(brush());

        Miikka Heikkinen
    
Added API to set chart background roundness...

              r2549
            
          painter->drawRoundedRect(rect(), m_diameter, m_diameter);

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          painter->restore();

        Michal Klocek
    
Add missing files from last commit

              r640
            
      }

        Miikka Heikkinen
    
Added API to set chart background roundness...

              r2549
            
      qreal ChartBackground::diameter() const

        Michal Klocek
    
Add missing files from last commit

              r640
            
      {

          return m_diameter;

      }

        Miikka Heikkinen
    
Added API to set chart background roundness...

              r2549
            
      void ChartBackground::setDiameter(qreal diameter)

        Michal Klocek
    
Add missing files from last commit

              r640
            
      {

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          m_diameter = diameter;

        Miikka Heikkinen
    
Added API to set chart background roundness...

              r2549
            
          update();

        Michal Klocek
    
Add missing files from last commit

              r640
            
      }

        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

Jani Honkonen Add license headers	r794	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Jani Honkonen Add license headers	r794	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Jani Honkonen Add license headers	r794	**
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.
Jani Honkonen Add license headers	r794	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Jani Honkonen Add license headers	r794	**
		****************************************************************************/

Titta Heikkala Fix include syntax...	r2714	#include <private/chartbackground_p.h>
		#include <private/chartconfig_p.h>
		#include <QtGui/QPen>
		#include <QtGui/QBrush>
		#include <QtGui/QPainter>
Tero Ahola Added drop shadow effect for light themes	r1001	#include <QGraphicsDropShadowEffect>
Michal Klocek Add missing files from last commit	r640
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek Add missing files from last commit	r640
Jani Honkonen more coding style fixes for src-folder...	r2104	ChartBackground::ChartBackground(QGraphicsItem *parent)
		: QGraphicsRectItem(parent),
Miikka Heikkinen Added API to set chart background roundness...	r2549	m_diameter(5),
Jani Honkonen more coding style fixes for src-folder...	r2104	m_dropShadow(0)
Michal Klocek Add missing files from last commit	r640	{
		}

		ChartBackground::~ChartBackground()
		{

		}

Tero Ahola Added drop shadow effect for light themes	r1001	void ChartBackground::setDropShadowEnabled(bool enabled)
		{
Titta Heikkala Fix Charts build with QT_NO_GRAPHICSEFFECT definition...	r2624	#ifdef QT_NO_GRAPHICSEFFECT
		Q_UNUSED(enabled)
		#else
Tero Ahola Added drop shadow effect for light themes	r1001	if (enabled) {
		if (!m_dropShadow) {
		m_dropShadow = new QGraphicsDropShadowEffect();
Tero Ahola Tuned drop shadow effect	r1014	#ifdef Q_OS_MAC
		m_dropShadow->setBlurRadius(15);
		m_dropShadow->setOffset(0, 0);
		#elif defined(Q_OS_WIN)
		m_dropShadow->setBlurRadius(10);
		m_dropShadow->setOffset(0, 0);
		#else
Tero Ahola Added drop shadow effect for light themes	r1001	m_dropShadow->setBlurRadius(10);
		m_dropShadow->setOffset(5, 5);
Tero Ahola Tuned drop shadow effect	r1014	#endif
Tero Ahola Added drop shadow effect for light themes	r1001	setGraphicsEffect(m_dropShadow);
		}
		} else {
		delete m_dropShadow;
		m_dropShadow = 0;
		}
Titta Heikkala Fix Charts build with QT_NO_GRAPHICSEFFECT definition...	r2624	#endif
Tero Ahola Added drop shadow effect for light themes	r1001	}

Michal Klocek Add missing files from last commit	r640	void ChartBackground::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
		{
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	Q_UNUSED(option);
		Q_UNUSED(widget);
		painter->save();
		painter->setPen(pen());
		painter->setBrush(brush());
Miikka Heikkinen Added API to set chart background roundness...	r2549	painter->drawRoundedRect(rect(), m_diameter, m_diameter);
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	painter->restore();
Michal Klocek Add missing files from last commit	r640	}

Miikka Heikkinen Added API to set chart background roundness...	r2549	qreal ChartBackground::diameter() const
Michal Klocek Add missing files from last commit	r640	{
		return m_diameter;
		}

Miikka Heikkinen Added API to set chart background roundness...	r2549	void ChartBackground::setDiameter(qreal diameter)
Michal Klocek Add missing files from last commit	r640	{
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	m_diameter = diameter;
Miikka Heikkinen Added API to set chart background roundness...	r2549	update();
Michal Klocek Add missing files from last commit	r640	}

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