HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/legend/qlegendmarker_p.h

Fix crash when changing the values to empty model with logarithmic axis...

Fix crash when changing the values to empty model with logarithmic axis One zero or negative value invalidates the whole layout for logarithmic axes, but this wasn't taken into account when replacing the points. Task-number: QTRD-1914 Reviewed-by: Mika Salmela

Michal Klocek - - Load All Authors

File last commit:

r2407:d108889b4c99


                r2427:b3d485323aa9

Download file

             qlegendmarker_p.h
        
                    87 lines
            
             | 2.2 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / legend / qlegendmarker_p.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        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
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 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$

      **

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

      //  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.

      #ifndef QLEGENDMARKERPRIVATE_H

      #define QLEGENDMARKERPRIVATE_H

      #include "qchartglobal.h"

      #include <QGraphicsObject>

      #include <QBrush>

      #include <QPen>

      #include <QGraphicsSimpleTextItem>

      #include <QGraphicsLayoutItem>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Revert "TODOs removed from code. Undo me after release"...

              r2407
            
      // TODO: check these

        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
            
      class QAbstractSeries;

      class QAreaSeries;

      class QXYSeries;

      class QBarSet;

      class QAbstractBarSeries;

      class QPieSlice;

      class QLegend;

      class QPieSeries;

      class QLegendMarker;

        sauimone
    
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker

              r2164
            
      class LegendMarkerItem;

        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
            
        sauimone
    
legendmarker private is just QObject

              r2165
            
      class QLegendMarkerPrivate : public QObject

        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
            
      {

          Q_OBJECT

      public:

        sauimone
    
removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction

              r2171
            
          explicit QLegendMarkerPrivate(QLegendMarker *q, QLegend *legend);

        sauimone
    
QPieLegenmarkerPrivate added

              r2166
            
          virtual ~QLegendMarkerPrivate();

        sauimone
    
layout work started

              r2168
            
        sauimone
    
cleaning up todos

              r2192
            
          // Helper for now. (or declare LegendLayout as friend)

        sauimone
    
refactoring

              r2167
            
          LegendMarkerItem* item() const { return m_item; }

        sauimone
    
Better handling for new or removed markers

              r2182
            
          virtual QAbstractSeries* series() = 0;

          virtual QObject* relatedObject() = 0;

        sauimone
    
fix to QTRD-1674: layout is not calculated correctly after the change in the text of legend marker

              r2194
            
          void invalidateLegend();

        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
            
      public Q_SLOTS:

        sauimone
    
fixed crash in legendmarker when calling update from private constructor

              r2227
            
          virtual void updated() = 0;

        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
            
        sauimone
    
refactoring

              r2167
            
      protected:

        sauimone
    
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker

              r2164
            
          LegendMarkerItem *m_item;

        sauimone
    
optional series parameter to markers function. code style fixes

              r2193
            
          QLegend *m_legend;

        sauimone
    
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker

              r2164
            
        sauimone
    
refactoring

              r2167
            
      private:

          QLegendMarker *q_ptr;

        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
            
        sauimone
    
Legend can now handle clicked and do scrolling

              r2183
            
          friend class QLegendPrivate;

          friend class LegendMarkerItem;

        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
            
          Q_DECLARE_PUBLIC(QLegendMarker)

      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // QLEGENDMARKERPRIVATE_H

	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

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	/****************************************************************************
		**
		** Copyright (C) 2012 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$
		**
		****************************************************************************/

		// 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.

		#ifndef QLEGENDMARKERPRIVATE_H
		#define QLEGENDMARKERPRIVATE_H

		#include "qchartglobal.h"
		#include <QGraphicsObject>
		#include <QBrush>
		#include <QPen>
		#include <QGraphicsSimpleTextItem>
		#include <QGraphicsLayoutItem>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Revert "TODOs removed from code. Undo me after release"...	r2407	// TODO: check these
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	class QAbstractSeries;
		class QAreaSeries;
		class QXYSeries;
		class QBarSet;
		class QAbstractBarSeries;
		class QPieSlice;
		class QLegend;
		class QPieSeries;

		class QLegendMarker;
sauimone added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker	r2164	class LegendMarkerItem;
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
sauimone legendmarker private is just QObject	r2165	class QLegendMarkerPrivate : public QObject
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	{
		Q_OBJECT
		public:
sauimone removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction	r2171	explicit QLegendMarkerPrivate(QLegendMarker q, QLegend legend);
sauimone QPieLegenmarkerPrivate added	r2166	virtual ~QLegendMarkerPrivate();
sauimone layout work started	r2168
sauimone cleaning up todos	r2192	// Helper for now. (or declare LegendLayout as friend)
sauimone refactoring	r2167	LegendMarkerItem* item() const { return m_item; }

sauimone Better handling for new or removed markers	r2182	virtual QAbstractSeries* series() = 0;
		virtual QObject* relatedObject() = 0;

sauimone fix to QTRD-1674: layout is not calculated correctly after the change in the text of legend marker	r2194	void invalidateLegend();

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	public Q_SLOTS:
sauimone fixed crash in legendmarker when calling update from private constructor	r2227	virtual void updated() = 0;
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
sauimone refactoring	r2167	protected:
sauimone added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker	r2164	LegendMarkerItem *m_item;
sauimone optional series parameter to markers function. code style fixes	r2193	QLegend *m_legend;
sauimone added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker	r2164
sauimone refactoring	r2167	private:
		QLegendMarker *q_ptr;
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
sauimone Legend can now handle clicked and do scrolling	r2183	friend class QLegendPrivate;
		friend class LegendMarkerItem;
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	Q_DECLARE_PUBLIC(QLegendMarker)
		};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // QLEGENDMARKERPRIVATE_H