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

0

demos/chartviewer/charts.h +13 -6

              class Chart
              {
              public:
-                 Chart();
-                 virtual ~Chart();
-                 virtual void initialize();
+                 virtual ~Chart(){};
                  virtual QChart* createChart(const DataTable& table) = 0;
                  virtual QString name() = 0;
                  virtual QString category() = 0;
              }
              }
-             #define DECLARE_CHART(chartName) static chartName t;
+             template <class T>
+             class ChartWrapper
+             {
+             public:
+                 QSharedPointer<T> chart;
+                 ChartWrapper() : chart(new T)
+                 {
+                     Charts::addChart(chart.data());
+                 }
+             };
+             #define DECLARE_CHART(chartName) static ChartWrapper<chartName> t;
              #endif

0

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; }

0

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"); }

0

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"); }

0

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; }

0

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; }

0

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; }

0

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; }

0

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"); }

0

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"); }

0

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

0

demos/chartviewer/charts.cpp removed 0 -29

1

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