HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1839:16961447933b

demos/chartviewer/charts.h +13 -6

@@ -35,11 +35,7 QTCOMMERCIALCHART_USE_NAMESPACE
35	class Chart	35	class Chart
36	{	36	{
37	public:	37	public:
38	Chart();	38	virtual ~Chart(){};
39
40	virtual ~Chart();
41
42	virtual void initialize();
43	virtual QChart* createChart(const DataTable& table) = 0;	39	virtual QChart* createChart(const DataTable& table) = 0;
44	virtual QString name() = 0;	40	virtual QString name() = 0;
45	virtual QString category() = 0;	41	virtual QString category() = 0;
@@ -81,6 +77,17 inline void addChart(Chart* chart)
81	}	77	}
82	}	78	}
83		79
84	#define DECLARE_CHART(chartName) static chartName t;	80	template <class T>
		81	class ChartWrapper
		82	{
		83	public:
		84	QSharedPointer<T> chart;
		85	ChartWrapper() : chart(new T)
		86	{
		87	Charts::addChart(chart.data());
		88	}
		89	};
		90
		91	#define DECLARE_CHART(chartName) static ChartWrapper<chartName> t;
85		92
86	#endif	93	#endif

demos/chartviewer/charts/areachart.cpp 0 -5

             class AreaChart: public Chart
             {
             public:
-                AreaChart(){
-                    initialize();
                 QString name() { return QObject::tr("AreaChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }

demos/chartviewer/charts/horizontalbarchart.cpp 0 -5

             class HorizontalBarChart: public Chart
             {
             public:
-                HorizontalBarChart(){
-                    initialize();
                 QString name() { return QObject::tr("HorizontalBarChart"); }
                 QString category()  { return QObject::tr("BarSeries"); }
                 QString subCategory() { return QObject::tr("Vertical"); }

demos/chartviewer/charts/horizontalstackedbarchart.cpp 0 -5

             class HorizontalStackedBarChart: public Chart
             {
             public:
-                HorizontalStackedBarChart(){
-                    initialize();
                 QString name() { return QObject::tr("HorizontalStackedBarChart"); }
                 QString category()  { return QObject::tr("BarSeries"); }
                 QString subCategory() { return QObject::tr("Vertical"); }

demos/chartviewer/charts/linechart.cpp 0 -5

             class LineChart: public Chart
             {
             public:
-                LineChart(){
-                    initialize();
                 QString name() { return QObject::tr("LineChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }

demos/chartviewer/charts/piechart.cpp 0 -5

             class PieChart: public Chart
             {
             public:
-                PieChart(){
-                    initialize();
                 QString name() { return QObject::tr("PieChart"); }
                 QString category()  { return QString::null; }
                 QString subCategory() { return QString::null; }

demos/chartviewer/charts/scatterchart.cpp 0 -5

             class ScatterChart: public Chart
             {
             public:
-                ScatterChart(){
-                    initialize();
                 QString name() { return QObject::tr("ScatterChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }

demos/chartviewer/charts/splinechart.cpp 0 -5

             class SplineChart: public Chart
             {
             public:
-                SplineChart(){
-                    initialize();
                 QString name() { return QObject::tr("SplineChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }

demos/chartviewer/charts/verticalbarchart.cpp 0 -5

             class VerticalBarChart: public Chart
             {
             public:
-                VerticalBarChart(){
-                    initialize();
                 QString name() { return QObject::tr("VerticalBarChart"); }
                 QString category()  { return QObject::tr("BarSeries"); }
                 QString subCategory() { return QObject::tr("Vertical"); }

demos/chartviewer/charts/verticalstackedbarchart.cpp 0 -5

             class VerticalStackedBarChart: public Chart
             {
             public:
-                VerticalStackedBarChart(){
-                    initialize();
                 QString name() { return QObject::tr("VerticalStackedBarChart"); }
                 QString category()  { return QObject::tr("BarSeries"); }
                 QString subCategory() { return QObject::tr("Vertical"); }

demos/chartviewer/chartviewer.pro +1 -1

             TARGET = chartviewer
             QT += opengl
             INCLUDEPATH += .
-            SOURCES += main.cpp window.cpp view.cpp charts.cpp
+            SOURCES += main.cpp window.cpp view.cpp
             HEADERS += window.h view.h charts.h model.h

demos/chartviewer/charts.cpp removed 0 -29

NO CONTENT: file was removed

	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