HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/animations/scatteranimation.cpp

Remove opengl dependency from oscilloscope demos....

Remove opengl dependency from oscilloscope demos. These demos do not actually use opengl for anything, so no need for the dependency. This dependency also breaks the demos in android. Change-Id: I4da2a83f11fddd416034821d233f0543ee0900ed Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2492:5a6d23b6b72f


                r2525:5407eb4cd85a

Download file

             scatteranimation.cpp
        
                    50 lines
            
             | 1.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / scatteranimation.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
      /****************************************************************************

       **

       ** Copyright (C) 2013 Digia Plc

       ** All rights reserved.

       ** For any questions to Digia, please use contact form at http://qt.digia.com

       **

       ** This file is part of the Qt Commercial Charts Add-on.

       **

       ** $QT_BEGIN_LICENSE$

       ** Licensees holding valid Qt Commercial licenses may use this file in

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

       ** Software or, alternatively, in accordance with the terms contained in

       ** a written agreement between you and Digia.

       **

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

       ** contact form at http://qt.digia.com

       ** $QT_END_LICENSE$

       **

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

      #include "scatteranimation_p.h"

      #include "scatterchartitem_p.h"

      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      ScatterAnimation::ScatterAnimation(ScatterChartItem *item)

          : XYAnimation(item)

      {

      }

      ScatterAnimation::~ScatterAnimation()

      {

      }

      void ScatterAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)

      {

          XYAnimation::updateState(newState, oldState);

          if (oldState == QAbstractAnimation::Running && newState == QAbstractAnimation::Stopped

              && animationType() == RemovePointAnimation) {

              // Removing a point from scatter chart will keep extra marker item after animation stops.

              // Also, if the removed point was not the last one in series, points after the removed one

              // will report wrong coordinates when clicked. To fix these issues, update geometry after

              // point removal animation has finished.

              chartItem()->updateGeometry();

          }

      }

      QTCOMMERCIALCHART_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 Further animation fixes...	r2492	/****************************************************************************
		**
		** Copyright (C) 2013 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

		#include "scatteranimation_p.h"
		#include "scatterchartitem_p.h"
		#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		ScatterAnimation::ScatterAnimation(ScatterChartItem *item)
		: XYAnimation(item)
		{
		}

		ScatterAnimation::~ScatterAnimation()
		{
		}

		void ScatterAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
		{
		XYAnimation::updateState(newState, oldState);

		if (oldState == QAbstractAnimation::Running && newState == QAbstractAnimation::Stopped
		&& animationType() == RemovePointAnimation) {
		// Removing a point from scatter chart will keep extra marker item after animation stops.
		// Also, if the removed point was not the last one in series, points after the removed one
		// will report wrong coordinates when clicked. To fix these issues, update geometry after
		// point removal animation has finished.
		chartItem()->updateGeometry();
		}
		}

		QTCOMMERCIALCHART_END_NAMESPACE