HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/areachart/qareaseries_p.h

Fix crash when removing pie series from chart...

Fix crash when removing pie series from chart Connections cleanup in PieChartItem destructor didn't account for the possibility of series already having been destroyed. Changed m_series to QPointer so that it'll notice when series gets destroyed, and also added cleaning of slices to series destructor. Task-number: QTRD-1946 Change-Id: I651347bfcfbe7cd78dd26220a811fea5c8071fce Reviewed-by: Mika Salmela Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d


                r2475:9e35a3a169ed

Download file

             qareaseries_p.h
        
                    72 lines
            
             | 2.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / areachart / qareaseries_p.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      /****************************************************************************

      **

        Miikka Heikkinen
    
Fixed the copyright year 2012 -> 2013

              r2432
            
      ** Copyright (C) 2013 Digia Plc

        Michal Klocek
    
Adds big fat pimpl to series classes...

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

      **

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

      //  W A R N I N G

      //  -------------

      //

      // This file is not part of the QtCommercial Chart API.  It exists purely as an

      // implementation detail.  This header file may change from version to

      // version without notice, or even be removed.

      //

      // We mean it.

        Michal Klocek
    
Fixes header guard style issues

              r969
            
      #ifndef QAREASERIES_P_H

      #define QAREASERIES_P_H

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      #include "qabstractseries_p.h"

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      class QAreaSeries;

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      class QAreaSeriesPrivate: public QAbstractSeriesPrivate

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      {

          Q_OBJECT

      public:

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

              r2104
            
          QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries *q);

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
        Michal Klocek
    
Refactors internals...

              r2273
            
          void initializeDomain();

          void initializeAxes();

          void initializeGraphics(QGraphicsItem* parent);

          void initializeTheme(int index, ChartTheme* theme, bool forced = false);

          void initializeAnimations(QChart::AnimationOptions options);

          QList<QLegendMarker *> createLegendMarkers(QLegend *legend);

        sauimone
    
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit

              r2163
            
        Michal Klocek
    
Adds axis domain intialization

              r1695
            
          QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;

        Michal Klocek
    
Refactors internals...

              r2273
            
          QAbstractAxis* createDefaultAxis(Qt::Orientation) const;

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      Q_SIGNALS:

          void updated();

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
      protected:

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          QBrush m_brush;

          QPen m_pen;

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

              r2104
            
          QLineSeries *m_upperSeries;

          QLineSeries *m_lowerSeries;

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          bool m_pointsVisible;

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
      private:

          Q_DECLARE_PUBLIC(QAreaSeries);

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif

	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

Michal Klocek Adds big fat pimpl to series classes...	r938	/****************************************************************************
		**
Miikka Heikkinen Fixed the copyright year 2012 -> 2013	r2432	** Copyright (C) 2013 Digia Plc
Michal Klocek Adds big fat pimpl to series classes...	r938	** 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$
		**
		****************************************************************************/

		// W A R N I N G
		// -------------
		//
		// This file is not part of the QtCommercial Chart API. It exists purely as an
		// implementation detail. This header file may change from version to
		// version without notice, or even be removed.
		//
		// We mean it.

Michal Klocek Fixes header guard style issues	r969	#ifndef QAREASERIES_P_H
		#define QAREASERIES_P_H
Michal Klocek Adds big fat pimpl to series classes...	r938
Tero Ahola Renamed QSeries to QAbstractSeries	r988	#include "qabstractseries_p.h"
Michal Klocek Adds big fat pimpl to series classes...	r938
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		class QAreaSeries;

Tero Ahola Renamed QSeries to QAbstractSeries	r988	class QAreaSeriesPrivate: public QAbstractSeriesPrivate
Michal Klocek Adds big fat pimpl to series classes...	r938	{
		Q_OBJECT

		public:
Jani Honkonen more coding style fixes for src-folder...	r2104	QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lowerSeries, QAreaSeries *q);
Michal Klocek Adds big fat pimpl to series classes...	r938
Michal Klocek Refactors internals...	r2273	void initializeDomain();
		void initializeAxes();
		void initializeGraphics(QGraphicsItem* parent);
		void initializeTheme(int index, ChartTheme* theme, bool forced = false);
		void initializeAnimations(QChart::AnimationOptions options);

		QList<QLegendMarker > createLegendMarkers(QLegend legend);
sauimone Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit	r2163
Michal Klocek Adds axis domain intialization	r1695	QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
Michal Klocek Refactors internals...	r2273	QAbstractAxis* createDefaultAxis(Qt::Orientation) const;
Michal Klocek Refactor to use qseries private for implmentation interface...	r943
Michal Klocek Adds big fat pimpl to series classes...	r938	Q_SIGNALS:
		void updated();

Michal Klocek Refactor to use qseries private for implmentation interface...	r943	protected:
Michal Klocek Adds big fat pimpl to series classes...	r938	QBrush m_brush;
		QPen m_pen;
Jani Honkonen more coding style fixes for src-folder...	r2104	QLineSeries *m_upperSeries;
		QLineSeries *m_lowerSeries;
Michal Klocek Adds big fat pimpl to series classes...	r938	bool m_pointsVisible;
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	private:
		Q_DECLARE_PUBLIC(QAreaSeries);
Michal Klocek Adds big fat pimpl to series classes...	r938	};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif