HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r468:baa18f282b3d

Line and area series in chartwidgettest

Tero Ahola -

r468:baa18f282b3d

parent child

Context file:

r468:baa18f282b3d

Collapse all files

test/chartwidgettest/mainwidget.cpp +20 -8

             #include "mainwidget.h"
             #include "dataseriedialog.h"
-            #include "qpieseries.h"
+            #include <qpieseries.h>
-            #include "qscatterseries.h"
+            #include <qscatterseries.h>
             #include <qlineseries.h>
-            #include "qsplineseries.h"
+            #include <qareaseries.h>
+            #include <qsplineseries.h>
             #include <qbarset.h>
             #include <qbarseries.h>
             #include <qstackedbarseries.h>
                 QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
                 // Line series and scatter series use similar data
-                if (seriesName.contains("qline", Qt::CaseInsensitive)) {
+                if (seriesName == "Line") {
                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QLineSeries *series = new QLineSeries();
                         m_chartView->addSeries(series);
                         setCurrentSeries(series);
                     }
-                } else if (seriesName.contains("scatter", Qt::CaseInsensitive)) {
+                } if (seriesName == "Area") {
+                    // TODO: lower series for the area?
+                    for (int j(0); j < data.count(); j ++) {
+                        QList<qreal> column = data.at(j);
+                        QLineSeries *lineSeries = new QLineSeries();
+                        for (int i(0); i < column.count(); i++) {
+                            lineSeries->add(i, column.at(i));
+                        }
+                        QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
+                        m_chartView->addSeries(areaSeries);
+                        setCurrentSeries(areaSeries);
+                    }
+                } else if (seriesName == "Scatter") {
                     for (int j(0); j < data.count(); j++) {
                         QList<qreal> column = data.at(j);
                         QScatterSeries *series = new QScatterSeries();
                         m_chartView->addSeries(series);
                         setCurrentSeries(series);
                     }
-                } else if (seriesName.contains("pie", Qt::CaseInsensitive)) {
+                } else if (seriesName == "Pie") {
                     QStringList labels = generateLabels(rowCount);
                     for (int j(0); j < data.count(); j++) {
                         QPieSeries *series = new QPieSeries();
                     series->setSeparatorsEnabled(false);
                     m_chartView->addSeries(series);
                     setCurrentSeries(series);
+                } else if (seriesName == "Spline") {
-                else if (seriesName.contains("spline", Qt::CaseInsensitive)) {
                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QSplineSeries *series = new QSplineSeries();

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