HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/barchart/qbarset.h

clean up INCLUDEPATH handling...

clean up INCLUDEPATH handling in the c++ module, the .pri files add their directories, so there is no point in a centralized common.pri doing it again. the qml plugin doesn't need to add any paths from the c++ module explicitly, as the QT+=charts-private implies that already. Change-Id: I263dd702e9874e4d6188ca7251a482d0df4e570b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>

Marc Mutz - - Load All Authors

File last commit:

r2871:cf15f38aab8d


                r2886:4c015da23a8e

Download file

             qbarset.h
        
                    123 lines
            
             | 3.8 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / barchart / qbarset.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Updated license headers...

              r2845
            
      /******************************************************************************

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Copyright (C) 2015 The Qt Company Ltd.

      ** Contact: http://www.qt.io/licensing/

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_BEGIN_LICENSE:COMM$

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

      ** and conditions see http://www.qt.io/terms-conditions. For further

      ** information use the contact form at http://www.qt.io/contact-us.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

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

        Jani Honkonen
    
Add license headers

              r794
            
        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
      #ifndef QBARSET_H

      #define QBARSET_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

      #include <QtGui/QPen>

      #include <QtGui/QBrush>

      #include <QtGui/QFont>

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        sauimone
    
barchart pimpl part 1

              r934
            
      class QBarSetPrivate;

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QBarSet : public QObject

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
      {

        sauimone
    
minor fix

              r240
            
          Q_OBJECT

        sauimone
    
changed barset name to label to be consistent with pie series. Series have names, barsets and pieslices have labels

              r1429
            
          Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)

          Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)

          Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)

          Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)

          Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

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

          Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)

          Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)

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

              r938
            
        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
      public:

        Marc Mutz
    
Make public headers compile with -Wzero-as-null-pointer-constant...

              r2871
            
          explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR);

        sauimone
    
barchart: doc update for hover signals

              r980
            
          virtual ~QBarSet();

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
        sauimone
    
changed barset name to label to be consistent with pie series. Series have names, barsets and pieslices have labels

              r1429
            
          void setLabel(const QString label);

          QString label() const;

        sauimone
    
barseries api change proposal (as TODOs). Support for positioning of bars to x-axis.

              r1159
            
        sauimone
    
removed barlabel. label visibility control is now per series instead of per set

              r1246
            
          void append(const qreal value);

        sauimone
    
barset append list changed to take reference

              r1500
            
          void append(const QList<qreal> &values);

        sauimone
    
barseries api change proposal (as TODOs). Support for positioning of bars to x-axis.

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

              r2104
            
          QBarSet &operator << (const qreal &value);

        sauimone
    
barseries api change proposal (as TODOs). Support for positioning of bars to x-axis.

              r1159
            
        sauimone
    
removed barlabel. label visibility control is now per series instead of per set

              r1246
            
          void insert(const int index, const qreal value);

        sauimone
    
barset: removed boolean return value from remove(index,count) function

              r1514
            
          void remove(const int index, const int count = 1);

        sauimone
    
barset: unified insert/set/remove methods

              r993
            
          void replace(const int index, const qreal value);

        sauimone
    
Removed QPointF from QBarSet

              r1580
            
          qreal at(const int index) const;

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

              r2097
            
          qreal operator [](const int index) const;

        sauimone
    
barset: unified insert/set/remove methods

              r993
            
          int count() const;

          qreal sum() const;

        sauimone
    
Drilldown example for barcharts continuing. Still some bugs

              r430
            
        sauimone
    
minor code review fixes, part n

              r763
            
          void setPen(const QPen &pen);

        sauimone
    
Fixed layout for barcharts

              r473
            
          QPen pen() const;

        sauimone
    
Added pen & brush to QBarSet

              r214
            
        sauimone
    
minor code review fixes, part n

              r763
            
          void setBrush(const QBrush &brush);

        sauimone
    
Fixed layout for barcharts

              r473
            
          QBrush brush() const;

        sauimone
    
Added pen & brush to QBarSet

              r214
            
        sauimone
    
renamed barchart floating values with labels to be consistent with piechart

              r820
            
          void setLabelBrush(const QBrush &brush);

          QBrush labelBrush() const;

          void setLabelFont(const QFont &font);

          QFont labelFont() const;

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
          QColor color();

          void setColor(QColor color);

          QColor borderColor();

          void setBorderColor(QColor color);

          QColor labelColor();

          void setLabelColor(QColor color);

        sauimone
    
barchart signals for properties and changes

              r1353
            
      Q_SIGNALS:

        sauimone
    
reintroducing clicked and hovered signals to barset. Makes some things easier on QML api

              r1490
            
          void clicked(int index);

        Titta Heikkala
    
Add hovered signal with index for bar charts...

              r2600
            
          void hovered(bool status, int index);

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
          void pressed(int index);

          void released(int index);

          void doubleClicked(int index);

        sauimone
    
barchart signals for properties and changes

              r1353
            
          void penChanged();

          void brushChanged();

          void labelChanged();

          void labelBrushChanged();

          void labelFontChanged();

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
          void colorChanged(QColor color);

          void borderColorChanged(QColor color);

          void labelColorChanged(QColor color);

        sauimone
    
barchart signals for properties and changes

              r1353
            
          void valuesAdded(int index, int count);

          void valuesRemoved(int index, int count);

          void valueChanged(int index);

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
      private:

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

              r938
            
          QScopedPointer<QBarSetPrivate> d_ptr;

        sauimone
    
barchart pimpl part 1

              r934
            
          Q_DISABLE_COPY(QBarSet)

        sauimone
    
renamed barseries files to abstractbarseries

              r1586
            
          friend class QAbstractBarSeries;

        sauimone
    
legend signal fix for barchart

              r953
            
          friend class BarLegendMarker;

        sauimone
    
refactoring internal barchart items

              r1674
            
          friend class AbstractBarChartItem;

        sauimone
    
QBarSeries to QAbstractBarSeries

              r1584
            
          friend class QAbstractBarSeriesPrivate;

        sauimone
    
Removed QPointF from QBarSet

              r1580
            
          friend class StackedBarChartItem;

          friend class PercentBarChartItem;

        sauimone
    
refactoring internal barchart items

              r1674
            
          friend class BarChartItem;

        sauimone
    
horizontal barchart & example

              r1681
            
          friend class HorizontalBarChartItem;

        sauimone
    
horizontal stacked barchart

              r1685
            
          friend class HorizontalStackedBarChartItem;

        sauimone
    
horizontal percent barchart & example

              r1688
            
          friend class HorizontalPercentBarChartItem;

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
          friend class BoxPlotChartItem;

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
      #endif // QBARSET_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

Titta Heikkala Updated license headers...	r2845	/******************************************************************************
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_BEGIN_LICENSE:COMM$
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
		** and conditions see http://www.qt.io/terms-conditions. For further
		** information use the contact form at http://www.qt.io/contact-us.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
		******************************************************************************/
Jani Honkonen Add license headers	r794
sauimone proof of concept implementation for barset and barcategory	r169	#ifndef QBARSET_H
		#define QBARSET_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
		#include <QtGui/QPen>
		#include <QtGui/QBrush>
		#include <QtGui/QFont>
sauimone proof of concept implementation for barset and barcategory	r169
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
sauimone barchart pimpl part 1	r934	class QBarSetPrivate;
sauimone proof of concept implementation for barset and barcategory	r169
Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QBarSet : public QObject
sauimone proof of concept implementation for barset and barcategory	r169	{
sauimone minor fix	r240	Q_OBJECT
sauimone changed barset name to label to be consistent with pie series. Series have names, barsets and pieslices have labels	r1429	Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
		Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
		Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
		Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
		Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
		Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
		Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
Michal Klocek Adds big fat pimpl to series classes...	r938
sauimone proof of concept implementation for barset and barcategory	r169	public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR);
sauimone barchart: doc update for hover signals	r980	virtual ~QBarSet();
sauimone proof of concept implementation for barset and barcategory	r169
sauimone changed barset name to label to be consistent with pie series. Series have names, barsets and pieslices have labels	r1429	void setLabel(const QString label);
		QString label() const;
sauimone barseries api change proposal (as TODOs). Support for positioning of bars to x-axis.	r1159
sauimone removed barlabel. label visibility control is now per series instead of per set	r1246	void append(const qreal value);
sauimone barset append list changed to take reference	r1500	void append(const QList<qreal> &values);
sauimone barseries api change proposal (as TODOs). Support for positioning of bars to x-axis.	r1159
Jani Honkonen more coding style fixes for src-folder...	r2104	QBarSet &operator << (const qreal &value);
sauimone barseries api change proposal (as TODOs). Support for positioning of bars to x-axis.	r1159
sauimone removed barlabel. label visibility control is now per series instead of per set	r1246	void insert(const int index, const qreal value);
sauimone barset: removed boolean return value from remove(index,count) function	r1514	void remove(const int index, const int count = 1);
sauimone barset: unified insert/set/remove methods	r993	void replace(const int index, const qreal value);
sauimone Removed QPointF from QBarSet	r1580	qreal at(const int index) const;
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	qreal operator [](const int index) const;
sauimone barset: unified insert/set/remove methods	r993	int count() const;
		qreal sum() const;
sauimone Drilldown example for barcharts continuing. Still some bugs	r430
sauimone minor code review fixes, part n	r763	void setPen(const QPen &pen);
sauimone Fixed layout for barcharts	r473	QPen pen() const;
sauimone Added pen & brush to QBarSet	r214
sauimone minor code review fixes, part n	r763	void setBrush(const QBrush &brush);
sauimone Fixed layout for barcharts	r473	QBrush brush() const;
sauimone Added pen & brush to QBarSet	r214
sauimone renamed barchart floating values with labels to be consistent with piechart	r820	void setLabelBrush(const QBrush &brush);
		QBrush labelBrush() const;

		void setLabelFont(const QFont &font);
		QFont labelFont() const;

Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	QColor color();
		void setColor(QColor color);

		QColor borderColor();
		void setBorderColor(QColor color);

		QColor labelColor();
		void setLabelColor(QColor color);

sauimone barchart signals for properties and changes	r1353	Q_SIGNALS:
sauimone reintroducing clicked and hovered signals to barset. Makes some things easier on QML api	r1490	void clicked(int index);
Titta Heikkala Add hovered signal with index for bar charts...	r2600	void hovered(bool status, int index);
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739	void pressed(int index);
		void released(int index);
		void doubleClicked(int index);
sauimone barchart signals for properties and changes	r1353	void penChanged();
		void brushChanged();
		void labelChanged();
		void labelBrushChanged();
		void labelFontChanged();
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	void colorChanged(QColor color);
		void borderColorChanged(QColor color);
		void labelColorChanged(QColor color);
sauimone barchart signals for properties and changes	r1353
		void valuesAdded(int index, int count);
		void valuesRemoved(int index, int count);
		void valueChanged(int index);

sauimone Barset and barcategory implememtation. Updated test application	r171	private:
Michal Klocek Adds big fat pimpl to series classes...	r938	QScopedPointer<QBarSetPrivate> d_ptr;
sauimone barchart pimpl part 1	r934	Q_DISABLE_COPY(QBarSet)
sauimone renamed barseries files to abstractbarseries	r1586	friend class QAbstractBarSeries;
sauimone legend signal fix for barchart	r953	friend class BarLegendMarker;
sauimone refactoring internal barchart items	r1674	friend class AbstractBarChartItem;
sauimone QBarSeries to QAbstractBarSeries	r1584	friend class QAbstractBarSeriesPrivate;
sauimone Removed QPointF from QBarSet	r1580	friend class StackedBarChartItem;
		friend class PercentBarChartItem;
sauimone refactoring internal barchart items	r1674	friend class BarChartItem;
sauimone horizontal barchart & example	r1681	friend class HorizontalBarChartItem;
sauimone horizontal stacked barchart	r1685	friend class HorizontalStackedBarChartItem;
sauimone horizontal percent barchart & example	r1688	friend class HorizontalPercentBarChartItem;
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	friend class BoxPlotChartItem;
sauimone proof of concept implementation for barset and barcategory	r169	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
sauimone proof of concept implementation for barset and barcategory	r169
		#endif // QBARSET_H