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

Adds templete to chartviewer to simplyfy chart type creation

Michal Klocek -

r1839:16961447933b

parent child

Context file:

r1839:16961447933b

Collapse all files

demos/chartviewer/charts.h +13 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #ifndef CHARTS_H
             #define CHARTS_H
             #include "model.h"
             #include <QList>
             #include <QString>
             #include <qchartglobal.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Chart
             {
             public:
-                Chart();
+                virtual ~Chart(){};
-                virtual ~Chart();
-                virtual void initialize();
                 virtual QChart* createChart(const DataTable& table) = 0;
                 virtual QString name() = 0;
                 virtual QString category() = 0;
                 virtual QString subCategory() = 0;
             };
             namespace Charts
             {
             typedef QList<Chart*> ChartList;
             inline ChartList& chartList()
             {
                 static ChartList list;
                 return list;
             }
             inline bool findChart(Chart* chart)
             {
                 ChartList& list = chartList();
                 if (list.contains(chart)) {
                     return true;
                 }
                 foreach (Chart* item, list) {
                     if (item->name() == chart->name() && item->category() == chart->category() && item->subCategory() == chart->subCategory()) {
                         return true;
                     }
                 }
                 return false;
             }
             inline void addChart(Chart* chart)
             {
                 ChartList& list = chartList();
                 if (!findChart(chart)) {
                     list.append(chart);
                 }
             }
             }
-            #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

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qareaseries.h"
             #include "qlineseries.h"
             class AreaChart: public Chart
             {
             public:
-                AreaChart(){
-                    initialize();
                 QString name() { return QObject::tr("AreaChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart *chart = new QChart();
                     chart->setTitle("Area chart");
                     // The lower series initialized to zero values
                     QLineSeries *lowerSeries = 0;
                     QString name("Series ");
                     int nameIndex = 0;
                     for (int i(0); i < table.count(); i++) {
                         QLineSeries *upperSeries = new QLineSeries(chart);
                         for (int j(0); j < table[i].count(); j++) {
                             Data data = table[i].at(j);
                             if (lowerSeries) {
                                 const QList<QPointF>& points = lowerSeries->points();
                                 upperSeries->append(QPointF(j, points[i].y() + data.first.y()));
                             }
                             else
                                 upperSeries->append(QPointF(j, data.first.y()));
                         }
                         QAreaSeries *area = new QAreaSeries(upperSeries, lowerSeries);
                         area->setName(name + QString::number(nameIndex));
                         nameIndex++;
                         chart->addSeries(area);
                         chart->createDefaultAxes();
                         lowerSeries = upperSeries;
                     }
                     return chart;
                 }
             };
             DECLARE_CHART(AreaChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qhorizontalbarseries.h"
             #include "qbarset.h"
             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"); }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Horizontal bar chart");
                     QHorizontalBarSeries* series = new QHorizontalBarSeries(chart);
                     for (int i(0); i < table.count(); i++) {
                         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
                         foreach (Data data, table[i])
                             *set << data.first.y();
                         series->append(set);
                     }
                     chart->addSeries(series);
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
             DECLARE_CHART(HorizontalBarChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qhorizontalstackedbarseries.h"
             #include "qbarset.h"
             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"); }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Horizontal stacked chart");
                     QHorizontalStackedBarSeries* series = new QHorizontalStackedBarSeries(chart);
                     for (int i(0); i < table.count(); i++) {
                         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
                         foreach (Data data, table[i])
                             *set << data.first.y();
                         series->append(set);
                     }
                     chart->addSeries(series);
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
             DECLARE_CHART(HorizontalStackedBarChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qlineseries.h"
             class LineChart: public Chart
             {
             public:
-                LineChart(){
-                    initialize();
                 QString name() { return QObject::tr("LineChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }
                 QChart* createChart(const DataTable& table) {
                        QChart* chart = new QChart();
                        chart->setTitle("Line chart");
                        QString name("Series ");
                        int nameIndex = 0;
                        foreach (DataList list, table) {
                            QLineSeries *series = new QLineSeries(chart);
                            foreach (Data data, list)
                                series->append(data.first);
                            series->setName(name + QString::number(nameIndex));
                            nameIndex++;
                            chart->addSeries(series);
                        }
                        chart->createDefaultAxes();
                        return chart;
                 }
             };
             DECLARE_CHART(LineChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qpieseries.h"
             class PieChart: public Chart
             {
             public:
-                PieChart(){
-                    initialize();
                 QString name() { return QObject::tr("PieChart"); }
                 QString category()  { return QString::null; }
                 QString subCategory() { return QString::null; }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Pie chart");
                     qreal pieSize = 1.0 / table.count();
                     for (int i = 0; i < table.count(); i++) {
                         QPieSeries *series = new QPieSeries(chart);
                         foreach (Data data, table[i]) {
                             QPieSlice *slice = series->append(data.second, data.first.y());
                             if (data == table[i].first()) {
                                 slice->setLabelVisible();
                                 slice->setExploded();
                             }
                         }
                         qreal hPos = (pieSize / 2) + (i / (qreal) table.count());
                         series->setPieSize(pieSize);
                         series->setHorizontalPosition(hPos);
                         series->setVerticalPosition(0.5);
                         chart->addSeries(series);
                     }
                     return chart;
                 }
             };
             DECLARE_CHART(PieChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qscatterseries.h"
             class ScatterChart: public Chart
             {
             public:
-                ScatterChart(){
-                    initialize();
                 QString name() { return QObject::tr("ScatterChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Scatter chart");
                     QString name("Series ");
                     int nameIndex = 0;
                     foreach (DataList list, table) {
                         QScatterSeries *series = new QScatterSeries(chart);
                         foreach (Data data, list)
                             series->append(data.first);
                         series->setName(name + QString::number(nameIndex));
                         nameIndex++;
                         chart->addSeries(series);
                     }
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
             DECLARE_CHART(ScatterChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qsplineseries.h"
             class SplineChart: public Chart
             {
             public:
-                SplineChart(){
-                    initialize();
                 QString name() { return QObject::tr("SplineChart"); }
                 QString category()  { return QObject::tr("XYSeries"); }
                 QString subCategory() { return QString::null; }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Spline chart");
                     QString name("Series ");
                     int nameIndex = 0;
                     foreach (DataList list, table) {
                         QSplineSeries *series = new QSplineSeries(chart);
                         foreach (Data data, list)
                             series->append(data.first);
                         series->setName(name + QString::number(nameIndex));
                         nameIndex++;
                         chart->addSeries(series);
                     }
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
             DECLARE_CHART(SplineChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qbarseries.h"
             #include "qbarset.h"
             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"); }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Vertical bar chart");
                     QBarSeries* series = new QBarSeries(chart);
                     for (int i(0); i < table.count(); i++) {
                         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
                         foreach (Data data, table[i])
                             *set << data.first.y();
                         series->append(set);
                     }
                     chart->addSeries(series);
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
             DECLARE_CHART(VerticalBarChart)

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** 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$
             **
             ****************************************************************************/
             #include "charts.h"
             #include "qchart.h"
             #include "qstackedbarseries.h"
             #include "qbarset.h"
             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"); }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
                     chart->setTitle("Stacked bar chart");
                     QStackedBarSeries* series = new QStackedBarSeries(chart);
                     for (int i(0); i < table.count(); i++) {
                         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
                         foreach (Data data, table[i])
                             *set << data.first.y();
                         series->append(set);
                     }
                     chart->addSeries(series);
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
             DECLARE_CHART(VerticalStackedBarChart)

demos/chartviewer/chartviewer.pro +1 -1

             !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
             include(charts/charts.pri)
             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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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