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

remove debug message...

remove debug message Change-Id: Ib7511b744ac89e9af1e81c4a6fa7428a254b23a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2845:ae12522d475c


                r2884:89121f5cadf2

Download file

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

        Titta Heikkala
    
Updated license headers...

              r2845
            
      /******************************************************************************

      **

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

      ** Contact: http://www.qt.io/licensing/

      **

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

      **

      ** $QT_BEGIN_LICENSE:COMM$

      **

      ** Commercial License Usage

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

      ** accordance with the commercial license agreement provided with the

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

      ** a written agreement between you and The Qt Company. For licensing terms

      ** and conditions see http://www.qt.io/terms-conditions. For further

      ** information use the contact form at http://www.qt.io/contact-us.

      **

      ** $QT_END_LICENSE$

      **

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

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/scatteranimation_p.h>

      #include <private/scatterchartitem_p.h>

      #include <QtCore/QDebug>

        Miikka Heikkinen
    
Further animation fixes...

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
        Titta Heikkala
    
Added possibility to set duration and easing curve for chart animation...

              r2804
            
      ScatterAnimation::ScatterAnimation(ScatterChartItem *item, int duration, QEasingCurve &curve)

          : XYAnimation(item, duration, curve)

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
      {

      }

      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();

          }

      }

        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

Titta Heikkala Updated license headers...	r2845	/******************************************************************************
		**
		** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
		**
		** This file is part of the Qt Charts module.
		**
		** $QT_BEGIN_LICENSE:COMM$
		**
		** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
		** and conditions see http://www.qt.io/terms-conditions. For further
		** information use the contact form at http://www.qt.io/contact-us.
		**
		** $QT_END_LICENSE$
		**
		******************************************************************************/
Miikka Heikkinen Further animation fixes...	r2492
Titta Heikkala Fix include syntax...	r2714	#include <private/scatteranimation_p.h>
		#include <private/scatterchartitem_p.h>
		#include <QtCore/QDebug>
Miikka Heikkinen Further animation fixes...	r2492
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Miikka Heikkinen Further animation fixes...	r2492
Titta Heikkala Added possibility to set duration and easing curve for chart animation...	r2804	ScatterAnimation::ScatterAnimation(ScatterChartItem *item, int duration, QEasingCurve &curve)
		: XYAnimation(item, duration, curve)
Miikka Heikkinen Further animation fixes...	r2492	{
		}

		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();
		}
		}

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