HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/scatterchart/qscatterseries.h

Fix vanishing labels for first and last ticks....

Fix vanishing labels for first and last ticks. Extra space must be reserved by layout for the axes that have wide labels for first or last tick. Changed the logic how axis sizeHint is interpreted to make the previously irrelevant height or width (depending on orientation) of the sizeHint to indicate how far the widest label extends past the first/last tick, and adjust the grid size accordingly in layout. Reviewed-by: Mika Salmela

Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d


                r2443:5b27b7b1d72a

RC2_1.2.1

Download file

             qscatterseries.h
        
                    73 lines
            
             | 2.2 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / scatterchart / qscatterseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

              r794
            
      /****************************************************************************

      **

        Miikka Heikkinen
    
Fixed the copyright year 2012 -> 2013

              r2432
            
      ** Copyright (C) 2013 Digia Plc

        Jani Honkonen
    
Add license headers

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

      **

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

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      #ifndef QSCATTERSERIES_H

      #define QSCATTERSERIES_H

        Jani Honkonen
    
Change includes in public headers from #include "xxx" -> #include <xxx>

              r697
            
      #include <qchartglobal.h>

      #include <qxyseries.h>

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

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

              r938
            
        Tero Ahola
    
Integrated scatter type series...

              r42
            
      class QScatterSeriesPrivate;

        Michal Klocek
    
Refactor scatter chart to fit the other classes...

              r470
            
      class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      {

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          Q_OBJECT

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

          Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)

          Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape)

          Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize)

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          Q_ENUMS(MarkerShape)

        Tero Ahola
    
Scatter series marker visuals

              r195
            
      public:

          enum MarkerShape {

        Michal Klocek
    
Adds missing scatter intercation implementation...

              r541
            
              MarkerShapeCircle,

              MarkerShapeRectangle

        Tero Ahola
    
Scatter series marker visuals

              r195
            
          };

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      public:

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

              r938
            
          explicit QScatterSeries(QObject *parent = 0);

        Tero Ahola
    
Integrated scatter type series...

              r42
            
          ~QScatterSeries();

        Michal Klocek
    
Fixes to API , QSeriesType -> SeriesType , add missing getters

              r1107
            
          QAbstractSeries::SeriesType type() const;

        Tero Ahola
    
Color and border color properties of XYSeries

              r1537
            
          void setPen(const QPen &pen);

          void setBrush(const QBrush &brush);

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          void setColor(const QColor &color);

          QColor color() const;

          void setBorderColor(const QColor &color);

          QColor borderColor() const;

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          MarkerShape markerShape() const;

          void setMarkerShape(MarkerShape shape);

          qreal markerSize() const;

          void setMarkerSize(qreal size);

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
        Tero Ahola
    
Added notifiers for scatter properties

              r1349
            
      Q_SIGNALS:

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          void colorChanged(QColor color);

          void borderColorChanged(QColor color);

        Tero Ahola
    
Added notifiers for scatter properties

              r1349
            
        Tero Ahola
    
Integrated scatter type series...

              r42
            
      private:

        Tero Ahola
    
QML weather example to use data API instead of model

              r1222
            
          Q_DECLARE_PRIVATE(QScatterSeries)

          Q_DISABLE_COPY(QScatterSeries)

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

              r938
            
          friend class ScatterChartItem;

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

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

Jani Honkonen Add license headers	r794	/****************************************************************************
		**
Miikka Heikkinen Fixed the copyright year 2012 -> 2013	r2432	** Copyright (C) 2013 Digia Plc
Jani Honkonen Add license headers	r794	** 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$
		**
		****************************************************************************/

Tero Ahola Integrated scatter type series...	r42	#ifndef QSCATTERSERIES_H
		#define QSCATTERSERIES_H

Jani Honkonen Change includes in public headers from #include "xxx" -> #include <xxx>	r697	#include <qchartglobal.h>
		#include <qxyseries.h>
Tero Ahola Integrated scatter type series...	r42
		QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek Adds big fat pimpl to series classes...	r938
Tero Ahola Integrated scatter type series...	r42	class QScatterSeriesPrivate;

Michal Klocek Refactor scatter chart to fit the other classes...	r470	class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries
Tero Ahola Integrated scatter type series...	r42	{
Tero Ahola Scatter customization to QML api	r1276	Q_OBJECT
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
		Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
		Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape)
		Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize)
Tero Ahola Scatter customization to QML api	r1276	Q_ENUMS(MarkerShape)
Tero Ahola Scatter series marker visuals	r195
		public:
		enum MarkerShape {
Michal Klocek Adds missing scatter intercation implementation...	r541	MarkerShapeCircle,
		MarkerShapeRectangle
Tero Ahola Scatter series marker visuals	r195	};

Tero Ahola Integrated scatter type series...	r42	public:
Michal Klocek Adds big fat pimpl to series classes...	r938	explicit QScatterSeries(QObject *parent = 0);
Tero Ahola Integrated scatter type series...	r42	~QScatterSeries();
Michal Klocek Fixes to API , QSeriesType -> SeriesType , add missing getters	r1107	QAbstractSeries::SeriesType type() const;
Tero Ahola Color and border color properties of XYSeries	r1537	void setPen(const QPen &pen);
		void setBrush(const QBrush &brush);
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void setColor(const QColor &color);
		QColor color() const;
		void setBorderColor(const QColor &color);
		QColor borderColor() const;
Tero Ahola Scatter customization to QML api	r1276	MarkerShape markerShape() const;
		void setMarkerShape(MarkerShape shape);
		qreal markerSize() const;
		void setMarkerSize(qreal size);
Tero Ahola Modifying QScatterSeries API	r179
Tero Ahola Added notifiers for scatter properties	r1349	Q_SIGNALS:
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void colorChanged(QColor color);
		void borderColorChanged(QColor color);
Tero Ahola Added notifiers for scatter properties	r1349
Tero Ahola Integrated scatter type series...	r42	private:
Tero Ahola QML weather example to use data API instead of model	r1222	Q_DECLARE_PRIVATE(QScatterSeries)
		Q_DISABLE_COPY(QScatterSeries)
Michal Klocek Adds big fat pimpl to series classes...	r938	friend class ScatterChartItem;
Tero Ahola Integrated scatter type series...	r42	};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // QSCATTERSERIES_H