Moved manual tests to separate directory.

This allows publishing autotests. Git export attributes changed
accordingly.

Change-Id: I6db2eb52dabdb8f12e0bc2a992a873abfa15b1a5
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

.gitattributes

@@ -2,5 +2,4 @@
 .gitignore              export-ignore
 .gitattributes          export-ignore
 .commit-template        export-ignore
-tests                   export-ignore
 tools                   export-ignore

tests/.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes          export-ignore
+manual                  export-ignore

tests/manual/boxplottester/boxplottester.pro

@@ -1,4 +1,4 @@
-!include( ../tests.pri ) {
+!include( ../../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 

tests/manual/chartviewer/chartviewer.pro

@@ -1,4 +1,6 @@
-!include( ../tests.pri ):error( "Couldn't find the tests.pri file!" )
+!include( ../../tests.pri ) {
+    error( "Couldn't find the test.pri file!" )
+}
 include(charts/charts.pri)
 TARGET = chartviewer
 QT += opengl

tests/manual/chartwidgettest/chartwidgettest.pro

@@ -1,4 +1,4 @@
-!include( ../tests.pri ) {
+!include( ../../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 

tests/manual/chartwidgettest/dataseriedialog.cpp

@@ -1,189 +1,189 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise 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 "dataseriedialog.h"
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QLabel>
-#include <QtCore/QDebug>
-
-DataSerieDialog::DataSerieDialog(QWidget *parent) :
-    QDialog(parent)
-{
-    QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
-    QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
-    connect(b, SIGNAL(clicked()), this, SLOT(accept()));
-    b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
-    connect(b, SIGNAL(clicked()), this, SLOT(reject()));
-
-    QGridLayout *grid = new QGridLayout();
-
-    m_seriesTypeSelector = seriesTypeSelector();
-    m_columnCountSelector = columnCountSelector();
-    m_rowCountSelector = rowCountSelector();
-    m_dataCharacteristicsSelector = dataCharacteristicsSelector();
-
-    grid->addWidget(m_seriesTypeSelector, 0, 0);
-    grid->addWidget(m_columnCountSelector, 0, 1);
-    grid->addWidget(m_rowCountSelector, 1, 1);
-    grid->addWidget(m_dataCharacteristicsSelector, 1, 0);
-    m_labelsSelector = new QCheckBox("Labels defined");
-    m_labelsSelector->setChecked(true);
-    grid->addWidget(m_labelsSelector, 2, 0);
-    grid->addWidget(addSeriesBox, 3, 1);
-
-    setLayout(grid);
-}
-
-QGroupBox *DataSerieDialog::seriesTypeSelector()
-{
-    QVBoxLayout *layout = new QVBoxLayout();
-
-    QRadioButton *line = new QRadioButton("Line");
-    line->setChecked(true);
-    layout->addWidget(line);
-    layout->addWidget(new QRadioButton("Area"));
-    layout->addWidget(new QRadioButton("Pie"));
-    layout->addWidget(new QRadioButton("Bar"));
-    layout->addWidget(new QRadioButton("Stacked bar"));
-    layout->addWidget(new QRadioButton("Percent bar"));
-    layout->addWidget(new QRadioButton("Scatter"));
-    layout->addWidget(new QRadioButton("Spline"));
-
-    QGroupBox *groupBox = new QGroupBox("Series type");
-    groupBox->setLayout(layout);
-    selectRadio(groupBox, 0);
-
-    return groupBox;
-}
-
-QGroupBox *DataSerieDialog::columnCountSelector()
-{
-    QVBoxLayout *layout = new QVBoxLayout();
-
-    QRadioButton *radio = new QRadioButton("1");
-    radio->setChecked(true);
-    layout->addWidget(radio);
-    layout->addWidget(new QRadioButton("2"));
-    layout->addWidget(new QRadioButton("3"));
-    layout->addWidget(new QRadioButton("4"));
-    layout->addWidget(new QRadioButton("5"));
-    layout->addWidget(new QRadioButton("8"));
-    layout->addWidget(new QRadioButton("10"));
-    layout->addWidget(new QRadioButton("100"));
-
-    QGroupBox *groupBox = new QGroupBox("Column count");
-    groupBox->setLayout(layout);
-    selectRadio(groupBox, 0);
-
-    return groupBox;
-}
-
-QGroupBox *DataSerieDialog::rowCountSelector()
-{
-    QVBoxLayout *layout = new QVBoxLayout();
-
-    layout->addWidget(new QRadioButton("1"));
-    QRadioButton *radio = new QRadioButton("10");
-    radio->setChecked(true);
-    layout->addWidget(radio);
-    layout->addWidget(new QRadioButton("50"));
-    layout->addWidget(new QRadioButton("100"));
-    layout->addWidget(new QRadioButton("1000"));
-    layout->addWidget(new QRadioButton("10000"));
-    layout->addWidget(new QRadioButton("100000"));
-    layout->addWidget(new QRadioButton("1000000"));
-
-    QGroupBox *groupBox = new QGroupBox("Row count");
-    groupBox->setLayout(layout);
-    selectRadio(groupBox, 0);
-
-    return groupBox;
-}
-
-QGroupBox *DataSerieDialog::dataCharacteristicsSelector()
-{
-    QVBoxLayout *layout = new QVBoxLayout();
-
-    layout->addWidget(new QRadioButton("Linear"));
-    layout->addWidget(new QRadioButton("Constant"));
-    layout->addWidget(new QRadioButton("Random"));
-    layout->addWidget(new QRadioButton("Sin"));
-    layout->addWidget(new QRadioButton("Sin + random"));
-
-    QGroupBox *groupBox = new QGroupBox("Data Characteristics");
-    groupBox->setLayout(layout);
-    selectRadio(groupBox, 0);
-
-    return groupBox;
-}
-
-void DataSerieDialog::accept()
-{
-    accepted(radioSelection(m_seriesTypeSelector),
-             radioSelection(m_columnCountSelector).toInt(),
-             radioSelection(m_rowCountSelector).toInt(),
-             radioSelection(m_dataCharacteristicsSelector),
-             m_labelsSelector->isChecked());
-    QDialog::accept();
-}
-
-void DataSerieDialog::selectRadio(QGroupBox *groupBox, int defaultSelection)
-{
-    QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
-    Q_ASSERT(layout);
-    Q_ASSERT(layout->count());
-
-    QLayoutItem *item = 0;
-    if (defaultSelection == -1) {
-        item = layout->itemAt(0);
-    } else if (layout->count() > defaultSelection) {
-        item = layout->itemAt(defaultSelection);
-    }
-    Q_ASSERT(item);
-    QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
-    Q_ASSERT(radio);
-    radio->setChecked(true);
-}
-
-QString DataSerieDialog::radioSelection(QGroupBox *groupBox)
-{
-    QString selection;
-    QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
-    Q_ASSERT(layout);
-
-    for (int i(0); i < layout->count(); i++) {
-        QLayoutItem *item = layout->itemAt(i);
-        Q_ASSERT(item);
-        QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
-        Q_ASSERT(radio);
-        if (radio->isChecked()) {
-            selection = radio->text();
-            break;
-        }
-    }
-
-    qDebug() << "radioSelection: " << selection;
-    return selection;
-}
+/****************************************************************************
+**
+** Copyright (C) 2014 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 Enterprise Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise 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 "dataseriedialog.h"
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QLabel>
+#include <QtCore/QDebug>
+
+DataSerieDialog::DataSerieDialog(QWidget *parent) :
+    QDialog(parent)
+{
+    QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
+    QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
+    connect(b, SIGNAL(clicked()), this, SLOT(accept()));
+    b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
+    connect(b, SIGNAL(clicked()), this, SLOT(reject()));
+
+    QGridLayout *grid = new QGridLayout();
+
+    m_seriesTypeSelector = seriesTypeSelector();
+    m_columnCountSelector = columnCountSelector();
+    m_rowCountSelector = rowCountSelector();
+    m_dataCharacteristicsSelector = dataCharacteristicsSelector();
+
+    grid->addWidget(m_seriesTypeSelector, 0, 0);
+    grid->addWidget(m_columnCountSelector, 0, 1);
+    grid->addWidget(m_rowCountSelector, 1, 1);
+    grid->addWidget(m_dataCharacteristicsSelector, 1, 0);
+    m_labelsSelector = new QCheckBox("Labels defined");
+    m_labelsSelector->setChecked(true);
+    grid->addWidget(m_labelsSelector, 2, 0);
+    grid->addWidget(addSeriesBox, 3, 1);
+
+    setLayout(grid);
+}
+
+QGroupBox *DataSerieDialog::seriesTypeSelector()
+{
+    QVBoxLayout *layout = new QVBoxLayout();
+
+    QRadioButton *line = new QRadioButton("Line");
+    line->setChecked(true);
+    layout->addWidget(line);
+    layout->addWidget(new QRadioButton("Area"));
+    layout->addWidget(new QRadioButton("Pie"));
+    layout->addWidget(new QRadioButton("Bar"));
+    layout->addWidget(new QRadioButton("Stacked bar"));
+    layout->addWidget(new QRadioButton("Percent bar"));
+    layout->addWidget(new QRadioButton("Scatter"));
+    layout->addWidget(new QRadioButton("Spline"));
+
+    QGroupBox *groupBox = new QGroupBox("Series type");
+    groupBox->setLayout(layout);
+    selectRadio(groupBox, 0);
+
+    return groupBox;
+}
+
+QGroupBox *DataSerieDialog::columnCountSelector()
+{
+    QVBoxLayout *layout = new QVBoxLayout();
+
+    QRadioButton *radio = new QRadioButton("1");
+    radio->setChecked(true);
+    layout->addWidget(radio);
+    layout->addWidget(new QRadioButton("2"));
+    layout->addWidget(new QRadioButton("3"));
+    layout->addWidget(new QRadioButton("4"));
+    layout->addWidget(new QRadioButton("5"));
+    layout->addWidget(new QRadioButton("8"));
+    layout->addWidget(new QRadioButton("10"));
+    layout->addWidget(new QRadioButton("100"));
+
+    QGroupBox *groupBox = new QGroupBox("Column count");
+    groupBox->setLayout(layout);
+    selectRadio(groupBox, 0);
+
+    return groupBox;
+}
+
+QGroupBox *DataSerieDialog::rowCountSelector()
+{
+    QVBoxLayout *layout = new QVBoxLayout();
+
+    layout->addWidget(new QRadioButton("1"));
+    QRadioButton *radio = new QRadioButton("10");
+    radio->setChecked(true);
+    layout->addWidget(radio);
+    layout->addWidget(new QRadioButton("50"));
+    layout->addWidget(new QRadioButton("100"));
+    layout->addWidget(new QRadioButton("1000"));
+    layout->addWidget(new QRadioButton("10000"));
+    layout->addWidget(new QRadioButton("100000"));
+    layout->addWidget(new QRadioButton("1000000"));
+
+    QGroupBox *groupBox = new QGroupBox("Row count");
+    groupBox->setLayout(layout);
+    selectRadio(groupBox, 0);
+
+    return groupBox;
+}
+
+QGroupBox *DataSerieDialog::dataCharacteristicsSelector()
+{
+    QVBoxLayout *layout = new QVBoxLayout();
+
+    layout->addWidget(new QRadioButton("Linear"));
+    layout->addWidget(new QRadioButton("Constant"));
+    layout->addWidget(new QRadioButton("Random"));
+    layout->addWidget(new QRadioButton("Sin"));
+    layout->addWidget(new QRadioButton("Sin + random"));
+
+    QGroupBox *groupBox = new QGroupBox("Data Characteristics");
+    groupBox->setLayout(layout);
+    selectRadio(groupBox, 0);
+
+    return groupBox;
+}
+
+void DataSerieDialog::accept()
+{
+    accepted(radioSelection(m_seriesTypeSelector),
+             radioSelection(m_columnCountSelector).toInt(),
+             radioSelection(m_rowCountSelector).toInt(),
+             radioSelection(m_dataCharacteristicsSelector),
+             m_labelsSelector->isChecked());
+    QDialog::accept();
+}
+
+void DataSerieDialog::selectRadio(QGroupBox *groupBox, int defaultSelection)
+{
+    QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
+    Q_ASSERT(layout);
+    Q_ASSERT(layout->count());
+
+    QLayoutItem *item = 0;
+    if (defaultSelection == -1) {
+        item = layout->itemAt(0);
+    } else if (layout->count() > defaultSelection) {
+        item = layout->itemAt(defaultSelection);
+    }
+    Q_ASSERT(item);
+    QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
+    Q_ASSERT(radio);
+    radio->setChecked(true);
+}
+
+QString DataSerieDialog::radioSelection(QGroupBox *groupBox)
+{
+    QString selection;
+    QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
+    Q_ASSERT(layout);
+
+    for (int i(0); i < layout->count(); i++) {
+        QLayoutItem *item = layout->itemAt(i);
+        Q_ASSERT(item);
+        QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
+        Q_ASSERT(radio);
+        if (radio->isChecked()) {
+            selection = radio->text();
+            break;
+        }
+    }
+
+    qDebug() << "radioSelection: " << selection;
+    return selection;
+}

tests/manual/chartwidgettest/dataseriedialog.h

@@ -1,55 +1,55 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise 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 DATASERIEDIALOG_H
-#define DATASERIEDIALOG_H
-
-#include <QtWidgets/QDialog>
-
-class QGroupBox;
-class QCheckBox;
-
-class DataSerieDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit DataSerieDialog(QWidget *parent = 0);
-
-signals:
-    void accepted(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsDefined);
-
-public slots:
-    void accept();
-
-private:
-    QGroupBox *seriesTypeSelector();
-    QGroupBox *columnCountSelector();
-    QGroupBox *rowCountSelector();
-    QGroupBox *dataCharacteristicsSelector();
-    void selectRadio(QGroupBox *groupBox, int defaultSelection);
-    QString radioSelection(QGroupBox *groupBox);
-    QGroupBox *m_seriesTypeSelector;
-    QGroupBox *m_columnCountSelector;
-    QGroupBox *m_rowCountSelector;
-    QCheckBox *m_labelsSelector;
-    QGroupBox *m_dataCharacteristicsSelector;
-};
-
-#endif // DATASERIEDIALOG_H
+/****************************************************************************
+**
+** Copyright (C) 2014 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 Enterprise Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise 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 DATASERIEDIALOG_H
+#define DATASERIEDIALOG_H
+
+#include <QtWidgets/QDialog>
+
+class QGroupBox;
+class QCheckBox;
+
+class DataSerieDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit DataSerieDialog(QWidget *parent = 0);
+
+signals:
+    void accepted(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsDefined);
+
+public slots:
+    void accept();
+
+private:
+    QGroupBox *seriesTypeSelector();
+    QGroupBox *columnCountSelector();
+    QGroupBox *rowCountSelector();
+    QGroupBox *dataCharacteristicsSelector();
+    void selectRadio(QGroupBox *groupBox, int defaultSelection);
+    QString radioSelection(QGroupBox *groupBox);
+    QGroupBox *m_seriesTypeSelector;
+    QGroupBox *m_columnCountSelector;
+    QGroupBox *m_rowCountSelector;
+    QCheckBox *m_labelsSelector;
+    QGroupBox *m_dataCharacteristicsSelector;
+};
+
+#endif // DATASERIEDIALOG_H

tests/manual/chartwidgettest/mainwidget.cpp

@@ -1,380 +1,380 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise 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 "mainwidget.h"
-#include "dataseriedialog.h"
-#include <QtCharts/QChartView>
-#include <QtCharts/QPieSeries>
-#include <QtCharts/QScatterSeries>
-#include <QtCharts/QLineSeries>
-#include <QtCharts/QAreaSeries>
-#include <QtCharts/QSplineSeries>
-#include <QtCharts/QBarSet>
-#include <QtCharts/QBarSeries>
-#include <QtCharts/QStackedBarSeries>
-#include <QtCharts/QPercentBarSeries>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QMessageBox>
-#include <cmath>
-#include <QtCore/QDebug>
-#include <QtGui/QStandardItemModel>
-#include <QtCharts/QBarCategoryAxis>
-#include <QtOpenGL/QGLWidget>
-
-QT_CHARTS_USE_NAMESPACE
-
-MainWidget::MainWidget(QWidget *parent) :
-    QWidget(parent),
-    m_addSerieDialog(0),
-    m_chart(0)
-{
-    m_chart = new QChart();
-
-    // Grid layout for the controls for configuring the chart widget
-    QGridLayout *grid = new QGridLayout();
-    QPushButton *addSeriesButton = new QPushButton("Add series");
-    connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
-    grid->addWidget(addSeriesButton, 0, 1);
-    initBackroundCombo(grid);
-    initScaleControls(grid);
-    initThemeCombo(grid);
-    initCheckboxes(grid);
-
-    // add row with empty label to make all the other rows static
-    grid->addWidget(new QLabel(""), grid->rowCount(), 0);
-    grid->setRowStretch(grid->rowCount() - 1, 1);
-
-    // Create chart view with the chart
-    m_chartView = new QChartView(m_chart, this);
-    m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
-
-    // Another grid layout as a main layout
-    QGridLayout *mainLayout = new QGridLayout();
-    mainLayout->addLayout(grid, 0, 0);
-    mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
-    setLayout(mainLayout);
-}
-
-// Combo box for selecting the chart's background
-void MainWidget::initBackroundCombo(QGridLayout *grid)
-{
-    QComboBox *backgroundCombo = new QComboBox(this);
-    backgroundCombo->addItem("Color");
-    backgroundCombo->addItem("Gradient");
-    backgroundCombo->addItem("Image");
-    connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(backgroundChanged(int)));
-
-    grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
-    grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
-}
-
-// Scale related controls (auto-scale vs. manual min-max values)
-void MainWidget::initScaleControls(QGridLayout *grid)
-{
-    m_autoScaleCheck = new QCheckBox("Automatic scaling");
-    connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
-    // Allow setting also non-sense values (like -2147483648 and 2147483647)
-    m_xMinSpin = new QSpinBox();
-    m_xMinSpin->setMinimum(INT_MIN);
-    m_xMinSpin->setMaximum(INT_MAX);
-    m_xMinSpin->setValue(0);
-    connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
-    m_xMaxSpin = new QSpinBox();
-    m_xMaxSpin->setMinimum(INT_MIN);
-    m_xMaxSpin->setMaximum(INT_MAX);
-    m_xMaxSpin->setValue(10);
-    connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
-    m_yMinSpin = new QSpinBox();
-    m_yMinSpin->setMinimum(INT_MIN);
-    m_yMinSpin->setMaximum(INT_MAX);
-    m_yMinSpin->setValue(0);
-    connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
-    m_yMaxSpin = new QSpinBox();
-    m_yMaxSpin->setMinimum(INT_MIN);
-    m_yMaxSpin->setMaximum(INT_MAX);
-    m_yMaxSpin->setValue(10);
-    connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
-
-    grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
-    grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
-    grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
-    grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
-    grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
-    grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
-    grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
-    grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
-    grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
-
-    m_autoScaleCheck->setChecked(true);
-}
-
-// Combo box for selecting theme
-void MainWidget::initThemeCombo(QGridLayout *grid)
-{
-    QComboBox *chartTheme = new QComboBox();
-    chartTheme->addItem("Default");
-    chartTheme->addItem("Light");
-    chartTheme->addItem("Blue Cerulean");
-    chartTheme->addItem("Dark");
-    chartTheme->addItem("Brown Sand");
-    chartTheme->addItem("Blue NCS");
-    chartTheme->addItem("High Contrast");
-    chartTheme->addItem("Blue Icy");
-    chartTheme->addItem("Qt");
-    connect(chartTheme, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(changeChartTheme(int)));
-    grid->addWidget(new QLabel("Chart theme:"), 8, 0);
-    grid->addWidget(chartTheme, 8, 1);
-}
-
-// Different check boxes for customizing chart
-void MainWidget::initCheckboxes(QGridLayout *grid)
-{
-    // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
-    QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
-//    connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
-    zoomCheckBox->setChecked(true);
-    grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
-
-    QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias");
-    connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool)));
-    aliasCheckBox->setChecked(false);
-    grid->addWidget(aliasCheckBox, grid->rowCount(), 0);
-
-    QCheckBox *openGLCheckBox = new QCheckBox("Use QGLWidget");
-    connect(openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(openGLToggled(bool)));
-    openGLCheckBox->setChecked(false);
-    grid->addWidget(openGLCheckBox, grid->rowCount(), 0);
-}
-
-void MainWidget::antiAliasToggled(bool enabled)
-{
-    m_chartView->setRenderHint(QPainter::Antialiasing, enabled);
-}
-
-void MainWidget::openGLToggled(bool enabled)
-{
-    if (enabled) {
-        QGLFormat f = QGLFormat::defaultFormat();
-        f.setSampleBuffers(true);
-        f.setSamples(4);
-        QGLFormat::setDefaultFormat(f);
-        QGLWidget *g = new QGLWidget();
-        m_chartView->setViewport(g);
-    } else {
-        m_chartView->setViewport(0);
-    }
-}
-
-void MainWidget::addSeries()
-{
-    if (!m_addSerieDialog) {
-        m_addSerieDialog = new DataSerieDialog(this);
-        connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)),
-                this, SLOT(addSeries(QString,int,int,QString,bool)));
-    }
-    m_addSerieDialog->exec();
-}
-
-QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics)
-{
-    QList<RealList> testData;
-    for (int j(0); j < columnCount; j++) {
-        QList <qreal> newColumn;
-        for (int i(0); i < rowCount; i++) {
-            if (dataCharacteristics == "Sin") {
-                newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100));
-            } else if (dataCharacteristics == "Sin + random") {
-                newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
-            } else if (dataCharacteristics == "Random") {
-                newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX);
-            } else if (dataCharacteristics == "Linear") {
-                //newColumn.append(i * (j + 1.0));
-                // TODO: temporary hack to make pie work; prevent zero values:
-                newColumn.append(i * (j + 1.0) + 0.1);
-            } else { // "constant"
-                newColumn.append((j + 1.0));
-            }
-        }
-        testData.append(newColumn);
-    }
-    return testData;
-}
-
-QStringList MainWidget::generateLabels(int count)
-{
-    QStringList result;
-    for (int i(0); i < count; i++)
-        result.append("label" + QString::number(i));
-    return result;
-}
-
-void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled)
-{
-    qDebug() << "addSeries: " << seriesName
-             << " columnCount: " << columnCount
-             << " rowCount: " << rowCount
-             << " dataCharacteristics: " << dataCharacteristics
-             << " labels enabled: " << labelsEnabled;
-    m_defaultSeriesName = seriesName;
-
-    QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
-
-    // Line series and scatter series use similar data
-    if (seriesName == "Line") {
-        for (int j(0); j < data.count(); j ++) {
-            QList<qreal> column = data.at(j);
-            QLineSeries *series = new QLineSeries();
-            series->setName("line" + QString::number(j));
-            for (int i(0); i < column.count(); i++)
-                series->append(i, column.at(i));
-            m_chart->addSeries(series);
-        }
-    } else 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->append(i, column.at(i));
-            QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
-            areaSeries->setName("area" + QString::number(j));
-            m_chart->addSeries(areaSeries);
-        }
-    } else if (seriesName == "Scatter") {
-        for (int j(0); j < data.count(); j++) {
-            QList<qreal> column = data.at(j);
-            QScatterSeries *series = new QScatterSeries();
-            series->setName("scatter" + QString::number(j));
-            for (int i(0); i < column.count(); i++)
-                series->append(i, column.at(i));
-            m_chart->addSeries(series);
-        }
-    } else if (seriesName == "Pie") {
-        QStringList labels = generateLabels(rowCount);
-        for (int j(0); j < data.count(); j++) {
-            QPieSeries *series = new QPieSeries();
-            QList<qreal> column = data.at(j);
-            for (int i(0); i < column.count(); i++)
-                series->append(labels.at(i), column.at(i));
-            m_chart->addSeries(series);
-        }
-    } else if (seriesName == "Bar"
-               || seriesName == "Stacked bar"
-               || seriesName == "Percent bar") {
-        QStringList category;
-        QStringList labels = generateLabels(rowCount);
-        foreach (QString label, labels)
-            category << label;
-        QAbstractBarSeries* series = 0;
-        if (seriesName == "Bar") {
-            series = new QBarSeries(this);
-            QBarCategoryAxis* axis = new QBarCategoryAxis();
-            axis->append(category);
-            m_chart->setAxisX(axis,series);
-        } else if (seriesName == "Stacked bar") {
-            series = new QStackedBarSeries(this);
-            QBarCategoryAxis* axis = new QBarCategoryAxis();
-            axis->append(category);
-            m_chart->setAxisX(axis,series);
-        } else {
-            series = new QPercentBarSeries(this);
-            QBarCategoryAxis* axis = new QBarCategoryAxis();
-            axis->append(category);
-            m_chart->setAxisX(axis,series);
-        }
-
-        for (int j(0); j < data.count(); j++) {
-            QList<qreal> column = data.at(j);
-            QBarSet *set = new QBarSet("set" + QString::number(j));
-            for (int i(0); i < column.count(); i++)
-                *set << column.at(i);
-            series->append(set);
-        }
-
-        m_chart->addSeries(series);
-    } else if (seriesName == "Spline") {
-        for (int j(0); j < data.count(); j ++) {
-            QList<qreal> column = data.at(j);
-            QSplineSeries *series = new QSplineSeries();
-            series->setName("spline" + QString::number(j));
-            for (int i(0); i < column.count(); i++)
-                series->append(i, column.at(i));
-            m_chart->addSeries(series);
-        }
-    }
-    m_chart->createDefaultAxes();
-}
-
-void MainWidget::backgroundChanged(int itemIndex)
-{
-    qDebug() << "backgroundChanged: " << itemIndex;
-}
-
-void MainWidget::autoScaleChanged(int value)
-{
-    if (value) {
-        // TODO: enable auto scaling
-    } else {
-        // TODO: set scaling manually (and disable auto scaling)
-    }
-
-    m_xMinSpin->setEnabled(!value);
-    m_xMaxSpin->setEnabled(!value);
-    m_yMinSpin->setEnabled(!value);
-    m_yMaxSpin->setEnabled(!value);
-}
-
-void MainWidget::xMinChanged(int value)
-{
-    qDebug() << "xMinChanged: " << value;
-}
-
-void MainWidget::xMaxChanged(int value)
-{
-    qDebug() << "xMaxChanged: " << value;
-}
-
-void MainWidget::yMinChanged(int value)
-{
-    qDebug() << "yMinChanged: " << value;
-}
-
-void MainWidget::yMaxChanged(int value)
-{
-    qDebug() << "yMaxChanged: " << value;
-}
-
-void MainWidget::changeChartTheme(int themeIndex)
-{
-    qDebug() << "changeChartTheme: " << themeIndex;
-    if (themeIndex == 0)
-        m_chart->setTheme(QChart::ChartThemeLight);
-    else
-        m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
-}
+/****************************************************************************
+**
+** Copyright (C) 2014 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 Enterprise Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise 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 "mainwidget.h"
+#include "dataseriedialog.h"
+#include <QtCharts/QChartView>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QPercentBarSeries>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpacerItem>
+#include <QtWidgets/QMessageBox>
+#include <cmath>
+#include <QtCore/QDebug>
+#include <QtGui/QStandardItemModel>
+#include <QtCharts/QBarCategoryAxis>
+#include <QtOpenGL/QGLWidget>
+
+QT_CHARTS_USE_NAMESPACE
+
+MainWidget::MainWidget(QWidget *parent) :
+    QWidget(parent),
+    m_addSerieDialog(0),
+    m_chart(0)
+{
+    m_chart = new QChart();
+
+    // Grid layout for the controls for configuring the chart widget
+    QGridLayout *grid = new QGridLayout();
+    QPushButton *addSeriesButton = new QPushButton("Add series");
+    connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
+    grid->addWidget(addSeriesButton, 0, 1);
+    initBackroundCombo(grid);
+    initScaleControls(grid);
+    initThemeCombo(grid);
+    initCheckboxes(grid);
+
+    // add row with empty label to make all the other rows static
+    grid->addWidget(new QLabel(""), grid->rowCount(), 0);
+    grid->setRowStretch(grid->rowCount() - 1, 1);
+
+    // Create chart view with the chart
+    m_chartView = new QChartView(m_chart, this);
+    m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
+
+    // Another grid layout as a main layout
+    QGridLayout *mainLayout = new QGridLayout();
+    mainLayout->addLayout(grid, 0, 0);
+    mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
+    setLayout(mainLayout);
+}
+
+// Combo box for selecting the chart's background
+void MainWidget::initBackroundCombo(QGridLayout *grid)
+{
+    QComboBox *backgroundCombo = new QComboBox(this);
+    backgroundCombo->addItem("Color");
+    backgroundCombo->addItem("Gradient");
+    backgroundCombo->addItem("Image");
+    connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(backgroundChanged(int)));
+
+    grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
+    grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
+}
+
+// Scale related controls (auto-scale vs. manual min-max values)
+void MainWidget::initScaleControls(QGridLayout *grid)
+{
+    m_autoScaleCheck = new QCheckBox("Automatic scaling");
+    connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
+    // Allow setting also non-sense values (like -2147483648 and 2147483647)
+    m_xMinSpin = new QSpinBox();
+    m_xMinSpin->setMinimum(INT_MIN);
+    m_xMinSpin->setMaximum(INT_MAX);
+    m_xMinSpin->setValue(0);
+    connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
+    m_xMaxSpin = new QSpinBox();
+    m_xMaxSpin->setMinimum(INT_MIN);
+    m_xMaxSpin->setMaximum(INT_MAX);
+    m_xMaxSpin->setValue(10);
+    connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
+    m_yMinSpin = new QSpinBox();
+    m_yMinSpin->setMinimum(INT_MIN);
+    m_yMinSpin->setMaximum(INT_MAX);
+    m_yMinSpin->setValue(0);
+    connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
+    m_yMaxSpin = new QSpinBox();
+    m_yMaxSpin->setMinimum(INT_MIN);
+    m_yMaxSpin->setMaximum(INT_MAX);
+    m_yMaxSpin->setValue(10);
+    connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
+
+    grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
+    grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
+    grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
+    grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
+    grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
+    grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
+    grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
+    grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
+    grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
+
+    m_autoScaleCheck->setChecked(true);
+}
+
+// Combo box for selecting theme
+void MainWidget::initThemeCombo(QGridLayout *grid)
+{
+    QComboBox *chartTheme = new QComboBox();
+    chartTheme->addItem("Default");
+    chartTheme->addItem("Light");
+    chartTheme->addItem("Blue Cerulean");
+    chartTheme->addItem("Dark");
+    chartTheme->addItem("Brown Sand");
+    chartTheme->addItem("Blue NCS");
+    chartTheme->addItem("High Contrast");
+    chartTheme->addItem("Blue Icy");
+    chartTheme->addItem("Qt");
+    connect(chartTheme, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(changeChartTheme(int)));
+    grid->addWidget(new QLabel("Chart theme:"), 8, 0);
+    grid->addWidget(chartTheme, 8, 1);
+}
+
+// Different check boxes for customizing chart
+void MainWidget::initCheckboxes(QGridLayout *grid)
+{
+    // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
+    QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
+//    connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
+    zoomCheckBox->setChecked(true);
+    grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
+
+    QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias");
+    connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool)));
+    aliasCheckBox->setChecked(false);
+    grid->addWidget(aliasCheckBox, grid->rowCount(), 0);
+
+    QCheckBox *openGLCheckBox = new QCheckBox("Use QGLWidget");
+    connect(openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(openGLToggled(bool)));
+    openGLCheckBox->setChecked(false);
+    grid->addWidget(openGLCheckBox, grid->rowCount(), 0);
+}
+
+void MainWidget::antiAliasToggled(bool enabled)
+{
+    m_chartView->setRenderHint(QPainter::Antialiasing, enabled);
+}
+
+void MainWidget::openGLToggled(bool enabled)
+{
+    if (enabled) {
+        QGLFormat f = QGLFormat::defaultFormat();
+        f.setSampleBuffers(true);
+        f.setSamples(4);
+        QGLFormat::setDefaultFormat(f);
+        QGLWidget *g = new QGLWidget();
+        m_chartView->setViewport(g);
+    } else {
+        m_chartView->setViewport(0);
+    }
+}
+
+void MainWidget::addSeries()
+{
+    if (!m_addSerieDialog) {
+        m_addSerieDialog = new DataSerieDialog(this);
+        connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)),
+                this, SLOT(addSeries(QString,int,int,QString,bool)));
+    }
+    m_addSerieDialog->exec();
+}
+
+QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics)
+{
+    QList<RealList> testData;
+    for (int j(0); j < columnCount; j++) {
+        QList <qreal> newColumn;
+        for (int i(0); i < rowCount; i++) {
+            if (dataCharacteristics == "Sin") {
+                newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100));
+            } else if (dataCharacteristics == "Sin + random") {
+                newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
+            } else if (dataCharacteristics == "Random") {
+                newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX);
+            } else if (dataCharacteristics == "Linear") {
+                //newColumn.append(i * (j + 1.0));
+                // TODO: temporary hack to make pie work; prevent zero values:
+                newColumn.append(i * (j + 1.0) + 0.1);
+            } else { // "constant"
+                newColumn.append((j + 1.0));
+            }
+        }
+        testData.append(newColumn);
+    }
+    return testData;
+}
+
+QStringList MainWidget::generateLabels(int count)
+{
+    QStringList result;
+    for (int i(0); i < count; i++)
+        result.append("label" + QString::number(i));
+    return result;
+}
+
+void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled)
+{
+    qDebug() << "addSeries: " << seriesName
+             << " columnCount: " << columnCount
+             << " rowCount: " << rowCount
+             << " dataCharacteristics: " << dataCharacteristics
+             << " labels enabled: " << labelsEnabled;
+    m_defaultSeriesName = seriesName;
+
+    QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
+
+    // Line series and scatter series use similar data
+    if (seriesName == "Line") {
+        for (int j(0); j < data.count(); j ++) {
+            QList<qreal> column = data.at(j);
+            QLineSeries *series = new QLineSeries();
+            series->setName("line" + QString::number(j));
+            for (int i(0); i < column.count(); i++)
+                series->append(i, column.at(i));
+            m_chart->addSeries(series);
+        }
+    } else 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->append(i, column.at(i));
+            QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
+            areaSeries->setName("area" + QString::number(j));
+            m_chart->addSeries(areaSeries);
+        }
+    } else if (seriesName == "Scatter") {
+        for (int j(0); j < data.count(); j++) {
+            QList<qreal> column = data.at(j);
+            QScatterSeries *series = new QScatterSeries();
+            series->setName("scatter" + QString::number(j));
+            for (int i(0); i < column.count(); i++)
+                series->append(i, column.at(i));
+            m_chart->addSeries(series);
+        }
+    } else if (seriesName == "Pie") {
+        QStringList labels = generateLabels(rowCount);
+        for (int j(0); j < data.count(); j++) {
+            QPieSeries *series = new QPieSeries();
+            QList<qreal> column = data.at(j);
+            for (int i(0); i < column.count(); i++)
+                series->append(labels.at(i), column.at(i));
+            m_chart->addSeries(series);
+        }
+    } else if (seriesName == "Bar"
+               || seriesName == "Stacked bar"
+               || seriesName == "Percent bar") {
+        QStringList category;
+        QStringList labels = generateLabels(rowCount);
+        foreach (QString label, labels)
+            category << label;
+        QAbstractBarSeries* series = 0;
+        if (seriesName == "Bar") {
+            series = new QBarSeries(this);
+            QBarCategoryAxis* axis = new QBarCategoryAxis();
+            axis->append(category);
+            m_chart->setAxisX(axis,series);
+        } else if (seriesName == "Stacked bar") {
+            series = new QStackedBarSeries(this);
+            QBarCategoryAxis* axis = new QBarCategoryAxis();
+            axis->append(category);
+            m_chart->setAxisX(axis,series);
+        } else {
+            series = new QPercentBarSeries(this);
+            QBarCategoryAxis* axis = new QBarCategoryAxis();
+            axis->append(category);
+            m_chart->setAxisX(axis,series);
+        }
+
+        for (int j(0); j < data.count(); j++) {
+            QList<qreal> column = data.at(j);
+            QBarSet *set = new QBarSet("set" + QString::number(j));
+            for (int i(0); i < column.count(); i++)
+                *set << column.at(i);
+            series->append(set);
+        }
+
+        m_chart->addSeries(series);
+    } else if (seriesName == "Spline") {
+        for (int j(0); j < data.count(); j ++) {
+            QList<qreal> column = data.at(j);
+            QSplineSeries *series = new QSplineSeries();
+            series->setName("spline" + QString::number(j));
+            for (int i(0); i < column.count(); i++)
+                series->append(i, column.at(i));
+            m_chart->addSeries(series);
+        }
+    }
+    m_chart->createDefaultAxes();
+}
+
+void MainWidget::backgroundChanged(int itemIndex)
+{
+    qDebug() << "backgroundChanged: " << itemIndex;
+}
+
+void MainWidget::autoScaleChanged(int value)
+{
+    if (value) {
+        // TODO: enable auto scaling
+    } else {
+        // TODO: set scaling manually (and disable auto scaling)
+    }
+
+    m_xMinSpin->setEnabled(!value);
+    m_xMaxSpin->setEnabled(!value);
+    m_yMinSpin->setEnabled(!value);
+    m_yMaxSpin->setEnabled(!value);
+}
+
+void MainWidget::xMinChanged(int value)
+{
+    qDebug() << "xMinChanged: " << value;
+}
+
+void MainWidget::xMaxChanged(int value)
+{
+    qDebug() << "xMaxChanged: " << value;
+}
+
+void MainWidget::yMinChanged(int value)
+{
+    qDebug() << "yMinChanged: " << value;
+}
+
+void MainWidget::yMaxChanged(int value)
+{
+    qDebug() << "yMaxChanged: " << value;
+}
+
+void MainWidget::changeChartTheme(int themeIndex)
+{
+    qDebug() << "changeChartTheme: " << themeIndex;
+    if (themeIndex == 0)
+        m_chart->setTheme(QChart::ChartThemeLight);
+    else
+        m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
+}

tests/manual/chartwidgettest/mainwidget.h

@@ -1,80 +1,80 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise 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 MAINWIDGET_H
-#define MAINWIDGET_H
-
-#include <QtCharts/QChartGlobal>
-#include <QtCharts/QChart>
-#include <QtCharts/QChartView>
-#include <QtWidgets/QWidget>
-
-class QSpinBox;
-class QCheckBox;
-class QGridLayout;
-
-QT_CHARTS_USE_NAMESPACE
-
-#define RealList QList<qreal>
-class DataSerieDialog;
-
-class MainWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit MainWidget(QWidget *parent = 0);
-
-signals:
-
-private:
-    void initBackroundCombo(QGridLayout *grid);
-    void initScaleControls(QGridLayout *grid);
-    void initThemeCombo(QGridLayout *grid);
-    void initCheckboxes(QGridLayout *grid);
-
-private slots:
-    void addSeries();
-    void addSeries(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled);
-    void backgroundChanged(int itemIndex);
-    void autoScaleChanged(int value);
-    void xMinChanged(int value);
-    void xMaxChanged(int value);
-    void yMinChanged(int value);
-    void yMaxChanged(int value);
-    void antiAliasToggled(bool enabled);
-    void openGLToggled(bool enabled);
-    void changeChartTheme(int themeIndex);
-    QList<RealList> generateTestData(int columnCount, int rowCount, QString dataCharacteristics);
-    QStringList generateLabels(int count);
-
-private:
-    DataSerieDialog *m_addSerieDialog;
-    QChart *m_chart;
-    QChartView *m_chartView;
-    QCheckBox *m_autoScaleCheck;
-    QSpinBox *m_xMinSpin;
-    QSpinBox *m_xMaxSpin;
-    QSpinBox *m_yMinSpin;
-    QSpinBox *m_yMaxSpin;
-    QString m_defaultSeriesName;
-    QGridLayout *m_scatterLayout;
-};
-
-#endif // MAINWIDGET_H
+/****************************************************************************
+**
+** Copyright (C) 2014 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 Enterprise Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise 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 MAINWIDGET_H
+#define MAINWIDGET_H
+
+#include <QtCharts/QChartGlobal>
+#include <QtCharts/QChart>
+#include <QtCharts/QChartView>
+#include <QtWidgets/QWidget>
+
+class QSpinBox;
+class QCheckBox;
+class QGridLayout;
+
+QT_CHARTS_USE_NAMESPACE
+
+#define RealList QList<qreal>
+class DataSerieDialog;
+
+class MainWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit MainWidget(QWidget *parent = 0);
+
+signals:
+
+private:
+    void initBackroundCombo(QGridLayout *grid);
+    void initScaleControls(QGridLayout *grid);
+    void initThemeCombo(QGridLayout *grid);
+    void initCheckboxes(QGridLayout *grid);
+
+private slots:
+    void addSeries();
+    void addSeries(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled);
+    void backgroundChanged(int itemIndex);
+    void autoScaleChanged(int value);
+    void xMinChanged(int value);
+    void xMaxChanged(int value);
+    void yMinChanged(int value);
+    void yMaxChanged(int value);
+    void antiAliasToggled(bool enabled);
+    void openGLToggled(bool enabled);
+    void changeChartTheme(int themeIndex);
+    QList<RealList> generateTestData(int columnCount, int rowCount, QString dataCharacteristics);
+    QStringList generateLabels(int count);
+
+private:
+    DataSerieDialog *m_addSerieDialog;
+    QChart *m_chart;
+    QChartView *m_chartView;
+    QCheckBox *m_autoScaleCheck;
+    QSpinBox *m_xMinSpin;
+    QSpinBox *m_xMaxSpin;
+    QSpinBox *m_yMinSpin;
+    QSpinBox *m_yMaxSpin;
+    QString m_defaultSeriesName;
+    QGridLayout *m_scatterLayout;
+};
+
+#endif // MAINWIDGET_H

tests/manual/manual.pro

@@ -0,0 +1,18 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+    presenterchart \
+    polarcharttest \
+    boxplottester
+
+contains(QT_CONFIG, opengl) {
+    SUBDIRS +=  chartwidgettest \
+                wavechart \
+                chartviewer
+} else {
+    message("OpenGL not available. Some test apps are disabled")
+}
+
+qtHaveModule(quick) {
+    SUBDIRS += qmlchartproperties \
+               qmlchartaxis
+}

tests/manual/polarcharttest/polarcharttest.pro

@@ -1,4 +1,4 @@
-!include( ../tests.pri ) {
+!include( ../../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 

tests/manual/presenterchart/presenterchart.pro

@@ -1,6 +1,7 @@
-!include( ../tests.pri ) {
- error( "Couldn't find the examples.pri file!" )
+!include( ../../tests.pri ) {
+    error( "Couldn't find the test.pri file!" )
 }
+
 TARGET = presenterchart
 HEADERS += chartview.h
 SOURCES += main.cpp chartview.cpp