diff --git a/demos/chartviewer/charts/axis/multivalueaxis.cpp b/demos/chartviewer/charts/axis/multivalueaxis.cpp index 8652d1d..6b9c3f9 100644 --- a/demos/chartviewer/charts/axis/multivalueaxis.cpp +++ b/demos/chartviewer/charts/axis/multivalueaxis.cpp @@ -29,7 +29,7 @@ class MultiValueAxis: public Chart public: QString name() { - return "MultiValueAxis"; + return "AxisSet 1"; } QString category() { @@ -37,7 +37,7 @@ public: } QString subCategory() { - return QString::null; + return "MultiValueAxis"; } QChart *createChart(const DataTable &table) @@ -46,7 +46,7 @@ public: QValueAxis *axisX; QValueAxis *axisY; - chart->setTitle("MultiValueAxis"); + chart->setTitle("MultiValueAxis1"); QString name("Series"); int nameIndex = 0; diff --git a/demos/chartviewer/charts/axis/multivalueaxis2.cpp b/demos/chartviewer/charts/axis/multivalueaxis2.cpp new file mode 100644 index 0000000..588dbcc --- /dev/null +++ b/demos/chartviewer/charts/axis/multivalueaxis2.cpp @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** 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" +#include "qvalueaxis.h" +#include "qcategoryaxis.h" + +class MultiValueAxis2: public Chart +{ +public: + QString name() + { + return "AxisSet 2"; + } + QString category() + { + return QObject::tr("Axis"); + } + QString subCategory() + { + return "MultiValueAxis"; + } + + QChart *createChart(const DataTable &table) + { + QChart *chart = new QChart(); + QValueAxis *axisX; + QValueAxis *axisY; + + chart->setTitle("MultiValueAxis2"); + + QString name("Series"); + int nameIndex = 1; + foreach (DataList list, table) { + QLineSeries *series = new QLineSeries(chart); + foreach (Data data, list) + series->append(data.first); + series->setName(name + QString::number(nameIndex)); + + chart->addSeries(series); + axisX = new QValueAxis(); + axisX->setLinePenColor(series->pen().color()); + if (nameIndex % 2) + axisX->setAlignment(Qt::AlignTop); + else + axisX->setAlignment(Qt::AlignBottom); + axisY = new QValueAxis(); + axisY->setLinePenColor(series->pen().color()); + + if (nameIndex % 2) + axisY->setAlignment(Qt::AlignRight); + else + axisY->setAlignment(Qt::AlignLeft); + + chart->setAxisX(axisX, series); + chart->setAxisY(axisY, series); + nameIndex++; + } + + return chart; + } +}; + +DECLARE_CHART(MultiValueAxis2); diff --git a/demos/chartviewer/charts/axis/multivalueaxis3.cpp b/demos/chartviewer/charts/axis/multivalueaxis3.cpp new file mode 100644 index 0000000..ad0a22b --- /dev/null +++ b/demos/chartviewer/charts/axis/multivalueaxis3.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** 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" +#include "qvalueaxis.h" +#include "qcategoryaxis.h" + +class MultiValueAxis3: public Chart +{ +public: + QString name() + { + return "AxisSet 3"; + } + QString category() + { + return QObject::tr("Axis"); + } + QString subCategory() + { + return "MultiValueAxis"; + } + + QChart *createChart(const DataTable &table) + { + QChart *chart = new QChart(); + QValueAxis *axisX; + QValueAxis *axisY; + + chart->setTitle("MultiValueAxis3"); + + 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)); + + chart->addSeries(series); + axisX = new QValueAxis(); + axisX->setLinePenColor(series->pen().color()); + if (nameIndex % 2){ + axisX->setAlignment(Qt::AlignTop); + } else{ + axisX->setAlignment(Qt::AlignBottom); + } + axisX->setTitle("ValueAxis for series" + QString::number(nameIndex)); + + axisY = new QValueAxis(); + axisY->setLinePenColor(series->pen().color()); + + if (nameIndex % 2){ + axisY->setAlignment(Qt::AlignRight); + }else{ + axisY->setAlignment(Qt::AlignLeft); + } + axisY->setTitle("ValueAxis for series" + QString::number(nameIndex)); + + chart->setAxisX(axisX, series); + chart->setAxisY(axisY, series); + nameIndex++; + } + + return chart; + } +}; + +DECLARE_CHART(MultiValueAxis3); diff --git a/demos/chartviewer/charts/axis/multivalueaxis4.cpp b/demos/chartviewer/charts/axis/multivalueaxis4.cpp new file mode 100644 index 0000000..b7a1f70 --- /dev/null +++ b/demos/chartviewer/charts/axis/multivalueaxis4.cpp @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** 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" +#include "qvalueaxis.h" +#include "qcategoryaxis.h" + +class MultiValueAxis4: public Chart +{ +public: + QString name() + { + return "AxisSet 4"; + } + QString category() + { + return QObject::tr("Axis"); + } + QString subCategory() + { + return "MultiValueAxis"; + } + + QChart *createChart(const DataTable &table) + { + QChart *chart = new QChart(); + QValueAxis *axisX; + QValueAxis *axisY; + + chart->setTitle("MultiValueAxis4"); + + QString name("Series"); + int nameIndex = 1; + foreach (DataList list, table) { + QLineSeries *series = new QLineSeries(chart); + foreach (Data data, list) + series->append(data.first); + series->setName(name + QString::number(nameIndex)); + + chart->addSeries(series); + axisX = new QValueAxis(); + axisX->setLinePenColor(series->pen().color()); + axisX->setTitle("ValueAxis for series" + QString::number(nameIndex)); + if (nameIndex % 2) + axisX->setAlignment(Qt::AlignTop); + else + axisX->setAlignment(Qt::AlignBottom); + axisY = new QValueAxis(); + axisY->setLinePenColor(series->pen().color()); + axisY->setTitle("ValueAxis for series" + QString::number(nameIndex)); + + if (nameIndex % 2) + axisY->setAlignment(Qt::AlignRight); + else + axisY->setAlignment(Qt::AlignLeft); + + chart->setAxisX(axisX, series); + chart->setAxisY(axisY, series); + nameIndex++; + } + + return chart; + } +}; + +DECLARE_CHART(MultiValueAxis4); diff --git a/demos/chartviewer/charts/charts.pri b/demos/chartviewer/charts/charts.pri index f61c0f4..84d6e25 100644 --- a/demos/chartviewer/charts/charts.pri +++ b/demos/chartviewer/charts/charts.pri @@ -20,4 +20,7 @@ SOURCES += \ axis/barcategoryaxisy.cpp \ axis/datetimeaxisx.cpp \ axis/datetimeaxisy.cpp \ - axis/multivalueaxis.cpp + axis/multivalueaxis.cpp \ + axis/multivalueaxis2.cpp \ + axis/multivalueaxis3.cpp \ + axis/multivalueaxis4.cpp \ No newline at end of file