HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r383:0e6beaefdebb

merge fix

Marek Rosa -

r383:0e6beaefdebb

parent child

Context file:

r383:0e6beaefdebb

src/barchart/qpercentbarseries.cpp created 644 +36 0

@@ -0,0 +1,36
	1	#include "qpercentbarseries.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	/*!
	6	\class QPercentBarSeries
	7	\brief part of QtCommercial chart API.
	8
	9	QPercentBarSeries represents a series of data shown as bars. Each bar of QBarSet is shown as percentage
	10	of all bars in category. One QPercentBarSeries can contain multible QBarSet data sets.
	11	QBarSeries groups the data from sets to categories, which are defined by QStringList.
	12
	13	\mainclass
	14
	15	\sa QBarSet, QStackedBarSeries, QBarSeries
	16	*/
	17
	18	/*!
	19	\fn virtual QSeriesType QPercentBarSeries::type() const
	20	\brief Returns type of series.
	21	\sa QSeries, QSeriesType
	22	*/
	23
	24	/*!
	25	Constructs empty QPercentBarSeries. Parameter \a category defines the categories for chart.
	26	QPercentBarSeries is QObject which is a child of a \a parent.
	27	*/
	28	QPercentBarSeries::QPercentBarSeries(QStringList categories, QObject *parent)
	29	: QBarSeries(categories, parent)
	30	{
	31	}
	32
	33	#include "moc_qpercentbarseries.cpp"
	34
	35	QTCOMMERCIALCHART_END_NAMESPACE
	36

src/barchart/qpercentbarseries.h created 644 +21 0

@@ -0,0 +1,21
	1	#ifndef PERCENTBARSERIES_H
	2	#define PERCENTBARSERIES_H
	3
	4	#include <QStringList>
	5	#include "qbarseries.h"
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries
	10	{
	11	Q_OBJECT
	12	public:
	13	QPercentBarSeries(QStringList categories, QObject* parent=0);
	14
	15	virtual QSeriesType type() const { return QSeries::SeriesTypePercentBar; }
	16	};
	17
	18	QTCOMMERCIALCHART_END_NAMESPACE
	19
	20
	21	#endif // PERCENTBARSERIES_H

src/barchart/qstackedbarseries.cpp created 644 +36 0

@@ -0,0 +1,36
	1	#include "qstackedbarseries.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	/*!
	6	\class QStackedBarSeries
	7	\brief part of QtCommercial chart API.
	8
	9	QStackedBarSeries represents a series of data shown as bars. All bars in same category are
	10	stacked on top of each other. One QStackedBarSeries can contain multible QBarSet data sets.
	11	QStackedBarSeries groups the data from sets to categories, which are defined by QStringList.
	12
	13	\mainclass
	14
	15	\sa QBarSet, QPercentBarSeries, QBarSeries
	16	*/
	17
	18	/*!
	19	\fn virtual QSeriesType QStackedBarSeries::type() const
	20	\brief Returns type of series.
	21	\sa QSeries, QSeriesType
	22	*/
	23
	24	/*!
	25	Constructs empty QStackedBarSeries. Parameter \a category defines the categories for chart.
	26	QStackedBarSeries is QObject which is a child of a \a parent.
	27	*/
	28	QStackedBarSeries::QStackedBarSeries(QStringList categories, QObject *parent)
	29	: QBarSeries(categories, parent)
	30	{
	31	}
	32
	33	#include "moc_qstackedbarseries.cpp"
	34
	35	QTCOMMERCIALCHART_END_NAMESPACE
	36

src/barchart/qstackedbarseries.h created 644 +20 0

@@ -0,0 +1,20
	1	#ifndef STACKEDBARSERIES_H
	2	#define STACKEDBARSERIES_H
	3
	4	#include <QStringList>
	5	#include "qbarseries.h"
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries
	10	{
	11	Q_OBJECT
	12	public:
	13	QStackedBarSeries(QStringList categories, QObject* parent=0);
	14
	15	virtual QSeriesType type() const { return QSeries::SeriesTypeStackedBar; }
	16	};
	17
	18	QTCOMMERCIALCHART_END_NAMESPACE
	19
	20	#endif // STACKEDBARSERIES_H

charts.pro +2 -2

             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
-            unix:QMAKE_DISTCLEAN += -r build bin doc/html
+            unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
-            win32:QMAKE_DISTCLEAN += /Q /s build bin doc\\html
+            win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
             # install feature file
             feature.path = $$[QT_INSTALL_DATA]/mkspecs/features

doc/images/chartview_example.jpg binary modified 0 0