HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/xychart/qxyseries.h

Fix label truncate issues with multiple axes...

Fix label truncate issues with multiple axes If there were multiple axes on single side of the chart, the axes wider/higher than average never got their preferred size, causing labels to truncate. Fixed by calculating the required squeeze ratio instead of just blindly using even fraction of available space. Task-number: QTRD-1897 Reviewed-by: Mika Salmela

Marek Rosa - - Load All Authors

File last commit:

r2255:31c21c535136


                r2411:6fca0e6f42a3

Download file

             qxyseries.h
        
                    96 lines
            
             | 2.7 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / xychart / qxyseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

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

      **

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

      **

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

        Michal Klocek
    
Fixes header guard style issues

              r969
            
      #ifndef QXYSERIES_H

      #define QXYSERIES_H

        Michal Klocek
    
Add missing files from previous commit

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

              r697
            
      #include <qchartglobal.h>

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      #include <qabstractseries.h>

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      #include <QPen>

      #include <QBrush>

        Marek Rosa
    
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include

              r877
            
      class QModelIndex;

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

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

              r938
            
      class QXYSeriesPrivate;

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
      class QXYModelMapper;

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

              r938
            
        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

        Tero Ahola
    
Added data getter for XY series; example for customizing the looks

              r491
            
          Q_OBJECT

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

              r1481
            
          Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)

          Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

        Tero Ahola
    
Now using only one declarative model

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

              r470
            
      protected:

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      public:

        Michal Klocek
    
Fix protected desturctor in xyseries

              r1268
            
          ~QXYSeries();

        Jani Honkonen
    
rename functions add() -> append()

              r796
            
          void append(qreal x, qreal y);

          void append(const QPointF &point);

        Michal Klocek
    
Fixes and improvments to series API...

              r1057
            
          void append(const QList<QPointF> &points);

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          void replace(qreal oldX, qreal oldY, qreal newX, qreal newY);

          void replace(const QPointF &oldPoint, const QPointF &newPoint);

        Michal Klocek
    
Adds missing scatter intercation implementation...

              r541
            
          void remove(qreal x, qreal y);

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          void remove(const QPointF &point);

        Marek Rosa
    
XYModelMapper slots for model signals implemented

              r1256
            
          void insert(int index, const QPointF &point);

          void clear();

        Tero Ahola
    
Added data getter for XY series; example for customizing the looks

              r491
            
          int count() const;

        Michal Klocek
    
Fixes and improvments to series API...

              r1057
            
          QList<QPointF> points() const;

        Tero Ahola
    
Added data getter for XY series; example for customizing the looks

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

              r2104
            
          QXYSeries &operator << (const QPointF &point);

          QXYSeries &operator << (const QList<QPointF> &points);

        Tero Ahola
    
Added data getter for XY series; example for customizing the looks

              r491
            
        Tero Ahola
    
Color and border color properties of XYSeries

              r1537
            
          virtual void setPen(const QPen &pen);

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

              r938
            
          QPen pen() const;

        Tero Ahola
    
Color and border color properties of XYSeries

              r1537
            
          virtual void setBrush(const QBrush &brush);

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

              r938
            
          QBrush brush() const;

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

              r1481
            
          virtual void setColor(const QColor &color);

          virtual QColor color() const;

        Tero Ahola
    
Default to true in boolean setters

              r987
            
          void setPointsVisible(bool visible = true);

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

              r938
            
          bool pointsVisible() const;

        Michal Klocek
    
Spline series windows compilation fix

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

              r1783
            
          void replace(QList<QPointF> points);

        sauimone
    
Q_SIGNALS and Q_SLOTS

              r775
            
      Q_SIGNALS:

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          void clicked(const QPointF &point);

        Marek Rosa
    
Added hovered signal to QLineSeries. Updated callout example

              r2255
            
          void hovered(const QPointF &point, bool state);

        Marek Rosa
    
XYModelMapper slots for series signals implemented

              r1262
            
          void pointReplaced(int index);

          void pointRemoved(int index);

          void pointAdded(int index);

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

              r1481
            
          void colorChanged(QColor color);

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

              r1783
            
          void pointsReplaced();

        Michal Klocek
    
Add missing files from previous commit

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

              r938
            
      private:

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

              r1222
            
          Q_DECLARE_PRIVATE(QXYSeries)

          Q_DISABLE_COPY(QXYSeries)

        sauimone
    
added QXYLegendMarker

              r2175
            
          friend class QXYLegendMarkerPrivate;

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

              r938
            
          friend class XYLegendMarker;

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
          friend class XYChart;

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

        Jani Honkonen
    
Spit&polish public headers

              r2046
            
      #endif // QXYSERIES_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	/****************************************************************************
		**
		** 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$
		**
		****************************************************************************/

Michal Klocek Fixes header guard style issues	r969	#ifndef QXYSERIES_H
		#define QXYSERIES_H
Michal Klocek Add missing files from previous commit	r466
Jani Honkonen Change includes in public headers from #include "xxx" -> #include <xxx>	r697	#include <qchartglobal.h>
Tero Ahola Renamed QSeries to QAbstractSeries	r988	#include <qabstractseries.h>
Michal Klocek Add missing files from previous commit	r466	#include <QPen>
		#include <QBrush>

Marek Rosa BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include	r877	class QModelIndex;

Michal Klocek Add missing files from previous commit	r466	QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Adds big fat pimpl to series classes...	r938	class QXYSeriesPrivate;
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	class QXYModelMapper;
Michal Klocek Adds big fat pimpl to series classes...	r938
Tero Ahola Renamed QSeries to QAbstractSeries	r988	class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries
Michal Klocek Add missing files from previous commit	r466	{
Tero Ahola Added data getter for XY series; example for customizing the looks	r491	Q_OBJECT
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
		Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
Tero Ahola Now using only one declarative model	r1169
Michal Klocek Refactor scatter chart to fit the other classes...	r470	protected:
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);
Michal Klocek Add missing files from previous commit	r466
		public:
Michal Klocek Fix protected desturctor in xyseries	r1268	~QXYSeries();
Jani Honkonen rename functions add() -> append()	r796	void append(qreal x, qreal y);
		void append(const QPointF &point);
Michal Klocek Fixes and improvments to series API...	r1057	void append(const QList<QPointF> &points);
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	void replace(qreal oldX, qreal oldY, qreal newX, qreal newY);
		void replace(const QPointF &oldPoint, const QPointF &newPoint);
Michal Klocek Adds missing scatter intercation implementation...	r541	void remove(qreal x, qreal y);
sauimone minor code review issues. indent, spaces, brackets etc.	r743	void remove(const QPointF &point);
Marek Rosa XYModelMapper slots for model signals implemented	r1256	void insert(int index, const QPointF &point);
		void clear();
Tero Ahola Added data getter for XY series; example for customizing the looks	r491
		int count() const;
Michal Klocek Fixes and improvments to series API...	r1057	QList<QPointF> points() const;
Tero Ahola Added data getter for XY series; example for customizing the looks	r491
Jani Honkonen more coding style fixes for src-folder...	r2104	QXYSeries &operator << (const QPointF &point);
		QXYSeries &operator << (const QList<QPointF> &points);
Tero Ahola Added data getter for XY series; example for customizing the looks	r491
Tero Ahola Color and border color properties of XYSeries	r1537	virtual void setPen(const QPen &pen);
Michal Klocek Adds big fat pimpl to series classes...	r938	QPen pen() const;

Tero Ahola Color and border color properties of XYSeries	r1537	virtual void setBrush(const QBrush &brush);
Michal Klocek Adds big fat pimpl to series classes...	r938	QBrush brush() const;

Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	virtual void setColor(const QColor &color);
		virtual QColor color() const;

Tero Ahola Default to true in boolean setters	r987	void setPointsVisible(bool visible = true);
Michal Klocek Adds big fat pimpl to series classes...	r938	bool pointsVisible() const;
Michal Klocek Spline series windows compilation fix	r467
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	void replace(QList<QPointF> points);

sauimone Q_SIGNALS and Q_SLOTS	r775	Q_SIGNALS:
sauimone minor code review issues. indent, spaces, brackets etc.	r743	void clicked(const QPointF &point);
Marek Rosa Added hovered signal to QLineSeries. Updated callout example	r2255	void hovered(const QPointF &point, bool state);
Marek Rosa XYModelMapper slots for series signals implemented	r1262	void pointReplaced(int index);
		void pointRemoved(int index);
		void pointAdded(int index);
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void colorChanged(QColor color);
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	void pointsReplaced();
Michal Klocek Add missing files from previous commit	r466
Michal Klocek Adds big fat pimpl to series classes...	r938	private:
Tero Ahola QML weather example to use data API instead of model	r1222	Q_DECLARE_PRIVATE(QXYSeries)
		Q_DISABLE_COPY(QXYSeries)
sauimone added QXYLegendMarker	r2175	friend class QXYLegendMarkerPrivate;
Michal Klocek Adds big fat pimpl to series classes...	r938	friend class XYLegendMarker;
Michal Klocek Refactor xychartitem -> xychart	r1218	friend class XYChart;
Michal Klocek Add missing files from previous commit	r466	};

		QTCOMMERCIALCHART_END_NAMESPACE

Jani Honkonen Spit&polish public headers	r2046	#endif // QXYSERIES_H