HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · demos/qmloscilloscope/datasource.h

Return empty brush/pen/font via API rather than the weird default one...

Return empty brush/pen/font via API rather than the weird default one Previously a non-initialized QPen()/QBrush()/QFont() was returned if axis/series hadn't been added to a chart yet and therefore had not been themed yet. To keep API somewhat consistent with old behavior, return non-initialized QPen()/QBrush()/QFont() instead of the weird default one in these cases. The new behavior is slightly different in that it is no longer possible to restore themed behavior by setting pen/brush/font to non-initialized one, but since there is no way to differentiate e.g. legitimate Qt::black pen from non-initialized pen, we can no longer support this behavior. Change-Id: I99f3d8853b329b5345e3073c040d8bfa8b9b75b4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2433:4d17a12f375e


                r2519:9ea7d7fe3500

Download file

             datasource.h
        
                    50 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / demos / qmloscilloscope / datasource.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      /****************************************************************************

      **

        Miikka Heikkinen
    
More copyright year changes

              r2433
            
      ** Copyright (C) 2013 Digia Plc

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

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

      **

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

      #ifndef DATASOURCE_H

      #define DATASOURCE_H

      #include <QObject>

      #include <QAbstractSeries>

        Tero Ahola
    
Disabled anti-aliasing by default in declarative impl

              r1910
            
      class QDeclarativeView;

        Tero Ahola
    
Improved oscilloscope demo functionality

              r1785
            
        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      QTCOMMERCIALCHART_USE_NAMESPACE

      class DataSource : public QObject

      {

          Q_OBJECT

      public:

        Tero Ahola
    
Disabled anti-aliasing by default in declarative impl

              r1910
            
          explicit DataSource(QDeclarativeView *appViewer, QObject *parent = 0);

        Jani Honkonen
    
coding style fixes for demos

              r2099
            
        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      signals:

        Jani Honkonen
    
coding style fixes for demos

              r2099
            
        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      public slots:

        Tero Ahola
    
Improved oscilloscope demo functionality

              r1785
            
          void generateData(int type, int rowCount, int colCount);

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
          void update(QAbstractSeries *series);

        Tero Ahola
    
Disabled anti-aliasing by default in declarative impl

              r1910
            
          void setAntialiasing(bool enabled);

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      private:

        Tero Ahola
    
Disabled anti-aliasing by default in declarative impl

              r1910
            
          QDeclarativeView *m_appViewer;

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
          QList<QList<QPointF> > m_data;

          int m_index;

      };

      #endif // DATASOURCE_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

Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	/****************************************************************************
		**
Miikka Heikkinen More copyright year changes	r2433	** Copyright (C) 2013 Digia Plc
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	** 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$
		**
		****************************************************************************/

		#ifndef DATASOURCE_H
		#define DATASOURCE_H

		#include <QObject>
		#include <QAbstractSeries>

Tero Ahola Disabled anti-aliasing by default in declarative impl	r1910	class QDeclarativeView;
Tero Ahola Improved oscilloscope demo functionality	r1785
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	QTCOMMERCIALCHART_USE_NAMESPACE

		class DataSource : public QObject
		{
		Q_OBJECT
		public:
Tero Ahola Disabled anti-aliasing by default in declarative impl	r1910	explicit DataSource(QDeclarativeView appViewer, QObject parent = 0);
Jani Honkonen coding style fixes for demos	r2099
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	signals:
Jani Honkonen coding style fixes for demos	r2099
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	public slots:
Tero Ahola Improved oscilloscope demo functionality	r1785	void generateData(int type, int rowCount, int colCount);
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	void update(QAbstractSeries *series);
Tero Ahola Disabled anti-aliasing by default in declarative impl	r1910	void setAntialiasing(bool enabled);
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783
		private:
Tero Ahola Disabled anti-aliasing by default in declarative impl	r1910	QDeclarativeView *m_appViewer;
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	QList<QList<QPointF> > m_data;
		int m_index;
		};

		#endif // DATASOURCE_H