From 2258c9692f85a52f3c7d3052add8fde7a2293769 2012-08-29 09:04:22
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-08-29 09:04:22
Subject: [PATCH] Adds font charts to chartviewer

---

diff --git a/demos/chartviewer/charts.h b/demos/chartviewer/charts.h
index 9432934..3ab83c6 100644
--- a/demos/chartviewer/charts.h
+++ b/demos/chartviewer/charts.h
@@ -88,6 +88,6 @@ public:
     }
 };
 
-#define DECLARE_CHART(chartName) static ChartWrapper<chartName> t;
+#define DECLARE_CHART(chartName) static ChartWrapper<chartName> chartName;
 
 #endif
diff --git a/demos/chartviewer/charts/charts.pri b/demos/chartviewer/charts/charts.pri
index 6a3fa7b..790c10d 100644
--- a/demos/chartviewer/charts/charts.pri
+++ b/demos/chartviewer/charts/charts.pri
@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
-SOURCES += \ 
+SOURCES += \
+    font/font.cpp \
     xyseries/linechart.cpp \
     xyseries/scatterchart.cpp \
     xyseries/splinechart.cpp \
@@ -12,4 +13,4 @@ SOURCES += \
     barseries/horizontalpercentbarchart.cpp \
     barseries/verticalpercentbarchart.cpp \
     pieseries/piechart.cpp \
-    pieseries/donutchart.cpp
+    pieseries/donutchart.cpp 
diff --git a/demos/chartviewer/charts/font/font.cpp b/demos/chartviewer/charts/font/font.cpp
new file mode 100644
index 0000000..1162f5f
--- /dev/null
+++ b/demos/chartviewer/charts/font/font.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** 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 FontChart: public Chart
+{
+public:
+    FontChart(int fontSize):m_fontSize(fontSize){};
+    QString name() { return QObject::tr("Font") + " " + QString::number(m_fontSize); }
+    QString category()  { return QObject::tr("Font"); }
+    QString subCategory() { return QString::null; }
+
+    QChart* createChart(const DataTable& table) {
+
+           QChart* chart = new QChart();
+           chart->setTitle("Font size " + QString::number(m_fontSize));
+
+           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();
+           QFont font;
+           font.setPixelSize(m_fontSize);
+           chart->setTitleFont(font);
+           chart->axisX()->setLabelsFont(font);
+           chart->axisY()->setLabelsFont(font);
+
+           return chart;
+    }
+
+private:
+    int m_fontSize;
+
+};
+
+class FontChart5:public FontChart{
+public:
+    FontChart5():FontChart(5){};
+};
+
+class FontChart8:public FontChart{
+public:
+    FontChart8():FontChart(8){};
+};
+
+class FontChart10:public FontChart{
+public:
+    FontChart10():FontChart(10){};
+};
+
+class FontChart12:public FontChart{
+public:
+    FontChart12():FontChart(12){};
+};
+
+class FontChart15:public FontChart{
+public:
+    FontChart15():FontChart(15){};
+};
+
+class FontChart18:public FontChart{
+public:
+    FontChart18():FontChart(18){};
+};
+
+class FontChart20:public FontChart{
+public:
+    FontChart20():FontChart(20){};
+};
+
+class FontChart24:public FontChart{
+public:
+    FontChart24():FontChart(24){};
+};
+
+class FontChart28:public FontChart{
+public:
+    FontChart28():FontChart(28){};
+};
+
+DECLARE_CHART(FontChart5);
+DECLARE_CHART(FontChart8);
+DECLARE_CHART(FontChart10);
+DECLARE_CHART(FontChart12);
+DECLARE_CHART(FontChart15);
+DECLARE_CHART(FontChart18);
+DECLARE_CHART(FontChart20);
+DECLARE_CHART(FontChart24);
+DECLARE_CHART(FontChart28);