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

Fix Charts build when quick module is not build...

Fix Charts build when quick module is not build The QML side of Charts should not be built when Qt quick module is not present. Change-Id: Id48fe3c50f365ad195c90da6364d27afd97b90e2 Task-number: QTRD-3273 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2714:929d943d1aab


                r2724:c26fb372333d

Download file

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

        Miikka Heikkinen
    
Further animation fixes...

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

       **

        Titta Heikkala
    
Update copyright year...

              r2688
            
       ** Copyright (C) 2014 Digia Plc

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
       ** All rights reserved.

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

       **

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

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

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
       **

       ** $QT_BEGIN_LICENSE$

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
       ** Licensees holding valid Qt Enterprise licenses may use this file in

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

        Miikka Heikkinen
    
Further animation fixes...

              r2492
            
       ** 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$

       **

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

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

          }

      }

        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 Further animation fixes...	r2492	/****************************************************************************
		**
Titta Heikkala Update copyright year...	r2688	** Copyright (C) 2014 Digia Plc
Miikka Heikkinen Further animation fixes...	r2492	** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** This file is part of the Qt Enterprise Charts Add-on.
Miikka Heikkinen Further animation fixes...	r2492	**
		** $QT_BEGIN_LICENSE$
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
Miikka Heikkinen Further animation fixes...	r2492	** 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$
		**
		****************************************************************************/

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

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