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

Fix bar category rendering for empty category...

Fix bar category rendering for empty category The category in bar category axis can be an empty string (only one category can be empty for an axis as duplicates are removed). Task-number: QTRD-2343 Change-Id: I88e0130c2caac0675573907e52f9089c24197454 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Titta Heikkala - - Load All Authors

File last commit:

r2600:1aa9b23ddd5d


                r2677:9d5038c13301

Download file

             qabstractbarseries.h
        
                    86 lines
            
             | 2.6 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / barchart / qabstractbarseries.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

      **

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** This file is part of the Qt Enterprise Charts Add-on.

        Jani Honkonen
    
Add license headers

              r794
            
      **

      ** $QT_BEGIN_LICENSE$

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** Licensees holding valid Qt Enterprise licenses may use this file in

      ** accordance with the Qt Enterprise License Agreement provided with the

        Jani Honkonen
    
Add license headers

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

      **

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

        Jani Honkonen
    
Spit&polish public headers

              r2046
            
      #ifndef QABSTRACTBARSERIES_H

      #define QABSTRACTBARSERIES_H

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      #include <qabstractseries.h>

        sauimone
    
replaced qbarcategory with qstringlist

              r377
            
      #include <QStringList>

        sauimone
    
BarGroup and Bar as ChartItems instead of GraphicItems

              r74
            
        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
      class QBarSet;

        sauimone
    
QBarSeries to QAbstractBarSeries

              r1584
            
      class QAbstractBarSeriesPrivate;

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      // Container for series

        sauimone
    
QBarSeries to QAbstractBarSeries

              r1584
            
      class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      {

        sauimone
    
Improved bar chart series

              r71
            
          Q_OBJECT

        Tero Ahola
    
Removed unnecessary bar width signal from QBarSeries

              r1487
            
          Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)

        Tero Ahola
    
Minor modifications to properties of abstract, area and bar series

              r1462
            
          Q_PROPERTY(int count READ count NOTIFY countChanged)

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

              r1429
            
          Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)

        Tero Ahola
    
Color properties to QML BarSet API

              r1302
            
        sauimone
    
made qabstractbarseries constructor protected. Updated tests

              r1587
            
      public:

        sauimone
    
QBarSeries to QAbstractBarSeries

              r1584
            
          virtual ~QAbstractBarSeries();

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
        sauimone
    
barmargin replaced with barwidth

              r1425
            
          void setBarWidth(qreal width);

          qreal barWidth() const;

        sauimone
    
bar margin setter to series

              r1283
            
        sauimone
    
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.

              r1208
            
          bool append(QBarSet *set);

          bool remove(QBarSet *set);

        sauimone
    
Implemented QBarSeries::take(), updated tests

              r1802
            
          bool take(QBarSet *set);

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

              r2104
            
          bool append(QList<QBarSet *> sets);

        Marek Rosa
    
Added insert method to QBarSeries

              r1362
            
          bool insert(int index, QBarSet *set);

        Tero Ahola
    
Minor modifications to properties of abstract, area and bar series

              r1462
            
          int count() const;

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

              r2104
            
          QList<QBarSet *> barSets() const;

        Marek Rosa
    
BarModelMapper: implemented model updated slots. Some more work needed with categories

              r1295
            
          void clear();

        Michal Klocek
    
Adds BarCategories typedef

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

              r820
            
          void setLabelsVisible(bool visible = true);

        Marek Rosa
    
Added insert method to QBarSeries

              r1362
            
          bool isLabelsVisible() const;

        sauimone
    
values visibility handling changed in barchart

              r813
            
        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
      protected:

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

              r2097
            
          explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = 0);

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
        sauimone
    
Q_SIGNALS and Q_SLOTS

              r775
            
      Q_SIGNALS:

        sauimone
    
removed double signal emitting from barseries/set

              r1563
            
          void clicked(int index, QBarSet *barset);

          void hovered(bool status, QBarSet *barset);

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

              r2600
            
          void hovered(bool status, int index, QBarSet *barset);

        Tero Ahola
    
Minor modifications to properties of abstract, area and bar series

              r1462
            
          void countChanged();

        sauimone
    
barchart signals for properties and changes

              r1353
            
          void labelsVisibleChanged();

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

              r2104
            
          void barsetsAdded(QList<QBarSet *> sets);

          void barsetsRemoved(QList<QBarSet *> sets);

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
        sauimone
    
refactoring. QStackedBarSeries and QPercentBarSeries are now derived from QBarSeries.

              r281
            
      protected:

        sauimone
    
QBarSeries to QAbstractBarSeries

              r1584
            
          Q_DECLARE_PRIVATE(QAbstractBarSeries)

        sauimone
    
refactoring internal barchart items

              r1674
            
          friend class AbstractBarChartItem;

        sauimone
    
barchart PIMPL part 2. Cleaning up leftovers in public api

              r962
            
          friend class PercentBarChartItem;

          friend class StackedBarChartItem;

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

              r2548
            
          friend class BoxPlotChartItem;

        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;

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

              r2519
            
          friend class BarSet;

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

        Jani Honkonen
    
Spit&polish public headers

              r2046
            
      #endif // QABSTRACTBARSERIES_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
		**
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** This file is part of the Qt Enterprise Charts Add-on.
Jani Honkonen Add license headers	r794	**
		** $QT_BEGIN_LICENSE$
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
Jani Honkonen Add license headers	r794	** 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$
		**
		****************************************************************************/

Jani Honkonen Spit&polish public headers	r2046	#ifndef QABSTRACTBARSERIES_H
		#define QABSTRACTBARSERIES_H
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
Tero Ahola Renamed QSeries to QAbstractSeries	r988	#include <qabstractseries.h>
sauimone replaced qbarcategory with qstringlist	r377	#include <QStringList>
sauimone BarGroup and Bar as ChartItems instead of GraphicItems	r74
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone removed barchartseriesbase. functionality is now in model	r172	class QBarSet;
sauimone QBarSeries to QAbstractBarSeries	r1584	class QAbstractBarSeriesPrivate;
sauimone removed barchartseriesbase. functionality is now in model	r172
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	// Container for series
sauimone QBarSeries to QAbstractBarSeries	r1584	class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
sauimone Improved bar chart series	r71	Q_OBJECT
Tero Ahola Removed unnecessary bar width signal from QBarSeries	r1487	Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
Tero Ahola Minor modifications to properties of abstract, area and bar series	r1462	Q_PROPERTY(int count READ count NOTIFY countChanged)
sauimone changed barset name to label to be consistent with pie series. Series have names, barsets and pieslices have labels	r1429	Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
Tero Ahola Color properties to QML BarSet API	r1302
sauimone made qabstractbarseries constructor protected. Updated tests	r1587	public:
sauimone QBarSeries to QAbstractBarSeries	r1584	virtual ~QAbstractBarSeries();
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
sauimone barmargin replaced with barwidth	r1425	void setBarWidth(qreal width);
		qreal barWidth() const;
sauimone bar margin setter to series	r1283
sauimone Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.	r1208	bool append(QBarSet *set);
		bool remove(QBarSet *set);
sauimone Implemented QBarSeries::take(), updated tests	r1802	bool take(QBarSet *set);
Jani Honkonen more coding style fixes for src-folder...	r2104	bool append(QList<QBarSet *> sets);
Marek Rosa Added insert method to QBarSeries	r1362	bool insert(int index, QBarSet *set);
Tero Ahola Minor modifications to properties of abstract, area and bar series	r1462	int count() const;
Jani Honkonen more coding style fixes for src-folder...	r2104	QList<QBarSet *> barSets() const;
Marek Rosa BarModelMapper: implemented model updated slots. Some more work needed with categories	r1295	void clear();
Michal Klocek Adds BarCategories typedef	r703
sauimone renamed barchart floating values with labels to be consistent with piechart	r820	void setLabelsVisible(bool visible = true);
Marek Rosa Added insert method to QBarSeries	r1362	bool isLabelsVisible() const;
sauimone values visibility handling changed in barchart	r813
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	protected:
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = 0);
Michal Klocek Refactor to use qseries private for implmentation interface...	r943
sauimone Q_SIGNALS and Q_SLOTS	r775	Q_SIGNALS:
sauimone removed double signal emitting from barseries/set	r1563	void clicked(int index, QBarSet *barset);
		void hovered(bool status, QBarSet *barset);
Titta Heikkala Add hovered signal with index for bar charts...	r2600	void hovered(bool status, int index, QBarSet *barset);
Tero Ahola Minor modifications to properties of abstract, area and bar series	r1462	void countChanged();
sauimone barchart signals for properties and changes	r1353	void labelsVisibleChanged();

Jani Honkonen more coding style fixes for src-folder...	r2104	void barsetsAdded(QList<QBarSet *> sets);
		void barsetsRemoved(QList<QBarSet *> sets);
sauimone Barset and barcategory implememtation. Updated test application	r171
sauimone refactoring. QStackedBarSeries and QPercentBarSeries are now derived from QBarSeries.	r281	protected:
sauimone QBarSeries to QAbstractBarSeries	r1584	Q_DECLARE_PRIVATE(QAbstractBarSeries)
sauimone refactoring internal barchart items	r1674	friend class AbstractBarChartItem;
sauimone barchart PIMPL part 2. Cleaning up leftovers in public api	r962	friend class PercentBarChartItem;
		friend class StackedBarChartItem;
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	friend class BoxPlotChartItem;
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;
Miikka Heikkinen Return empty brush/pen/font via API rather than the weird default one...	r2519	friend class BarSet;
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	};

		QTCOMMERCIALCHART_END_NAMESPACE

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