Fixed issues from Improve examples task

Task-number: QTRD-2239

+ Moved extra-full examples to tests
+ Removed extra functionality from widget and scatterchart examples
+ Changed bars default to bevelbar
+ Changed default label style to nobackground

Change-Id: Idffba7a44d5b54dbaf36d7cdbfe616b78e0d4073
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

6 files changed, 42 insertions, 736 deletions

diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index b0135ef3..ceecbc69 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -24,7 +24,6 @@
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QCheckBox>
-#include <QSlider>
 #include <QComboBox>
 #include <QFontComboBox>
 #include <QLabel>
@@ -43,7 +42,7 @@ int main(int argc, char **argv)
     QSize screenSize = chart->screen()->size();
 
     QWidget *container = QWidget::createWindowContainer(chart);
-    container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 2));
+    container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 1.5));
     container->setMaximumSize(screenSize);
     container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     container->setFocusPolicy(Qt::StrongFocus);
@@ -65,39 +64,6 @@ int main(int argc, char **argv)
     QPushButton *cameraButton = new QPushButton(widget);
     cameraButton->setText(QStringLiteral("Change camera preset"));
 
-    QPushButton *clearButton = new QPushButton(widget);
-    clearButton->setText(QStringLiteral("Clear chart"));
-
-    QPushButton *addOneButton = new QPushButton(widget);
-    addOneButton->setText(QStringLiteral("Add item"));
-
-    QPushButton *addBunchButton = new QPushButton(widget);
-    addBunchButton->setText(QStringLiteral("Add bunch of items"));
-
-    QPushButton *insertOneButton = new QPushButton(widget);
-    insertOneButton->setText(QStringLiteral("Insert item"));
-
-    QPushButton *insertBunchButton = new QPushButton(widget);
-    insertBunchButton->setText(QStringLiteral("Insert bunch of items"));
-
-    QPushButton *changeOneButton = new QPushButton(widget);
-    changeOneButton->setText(QStringLiteral("Change selected item"));
-
-    QPushButton *changeBunchButton = new QPushButton(widget);
-    changeBunchButton->setText(QStringLiteral("Change bunch of items"));
-
-    QPushButton *removeOneButton = new QPushButton(widget);
-    removeOneButton->setText(QStringLiteral("Remove selected item"));
-
-    QPushButton *removeBunchButton = new QPushButton(widget);
-    removeBunchButton->setText(QStringLiteral("Remove bunch of items"));
-
-    QPushButton *setSelectedItemButton = new QPushButton(widget);
-    setSelectedItemButton->setText(QStringLiteral("Select/deselect item 3"));
-
-    QPushButton *startTimerButton = new QPushButton(widget);
-    startTimerButton->setText(QStringLiteral("Start/stop timer"));
-
     QCheckBox *backgroundCheckBox = new QCheckBox(widget);
     backgroundCheckBox->setText(QStringLiteral("Show background"));
     backgroundCheckBox->setChecked(true);
@@ -117,70 +83,27 @@ int main(int argc, char **argv)
     shadowQuality->setCurrentIndex(3);
 
     QFontComboBox *fontList = new QFontComboBox(widget);
-
-    QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, widget);
-    fontSizeSlider->setTickInterval(1);
-    fontSizeSlider->setMinimum(1);
-    fontSizeSlider->setValue(30);
-    fontSizeSlider->setMaximum(200);
+    fontList->setCurrentFont(QFont("Arial"));
 
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
     vLayout->addWidget(cameraButton, 0, Qt::AlignTop);
-    vLayout->addWidget(clearButton, 0, Qt::AlignTop);
-    vLayout->addWidget(addOneButton, 0, Qt::AlignTop);
-    vLayout->addWidget(addBunchButton, 0, Qt::AlignTop);
-    vLayout->addWidget(insertOneButton, 0, Qt::AlignTop);
-    vLayout->addWidget(insertBunchButton, 0, Qt::AlignTop);
-    vLayout->addWidget(changeOneButton, 0, Qt::AlignTop);
-    vLayout->addWidget(changeBunchButton, 0, Qt::AlignTop);
-    vLayout->addWidget(removeOneButton, 0, Qt::AlignTop);
-    vLayout->addWidget(removeBunchButton, 0, Qt::AlignTop);
-    vLayout->addWidget(setSelectedItemButton, 0, Qt::AlignTop);
-    vLayout->addWidget(startTimerButton, 0, Qt::AlignTop);
     vLayout->addWidget(backgroundCheckBox);
     vLayout->addWidget(gridCheckBox);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
     vLayout->addWidget(shadowQuality);
     vLayout->addWidget(new QLabel(QStringLiteral("Change font")));
-    vLayout->addWidget(fontList);
-    vLayout->addWidget(new QLabel(QStringLiteral("Adjust font size")));
-    vLayout->addWidget(fontSizeSlider, 1, Qt::AlignTop);
+    vLayout->addWidget(fontList, 1, Qt::AlignTop);
 
     widget->show();
 
     ScatterDataModifier *modifier = new ScatterDataModifier(chart);
 
-    QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier,
-                     &ScatterDataModifier::changeFontSize);
-
     QObject::connect(styleButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeStyle);
     QObject::connect(cameraButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changePresetCamera);
-    QObject::connect(clearButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::clear);
-    QObject::connect(addOneButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::addOne);
-    QObject::connect(addBunchButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::addBunch);
-    QObject::connect(insertOneButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::insertOne);
-    QObject::connect(insertBunchButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::insertBunch);
-    QObject::connect(changeOneButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::changeOne);
-    QObject::connect(changeBunchButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::changeBunch);
-    QObject::connect(removeOneButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::removeOne);
-    QObject::connect(removeBunchButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::removeBunch);
-    QObject::connect(setSelectedItemButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::selectItem);
-    QObject::connect(startTimerButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::startStopTimer);
     QObject::connect(themeButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeTheme);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
@@ -192,8 +115,6 @@ int main(int argc, char **argv)
                      &QComboBox::setCurrentIndex);
     QObject::connect(chart, &Q3DScatter::shadowQualityChanged, modifier,
                      &ScatterDataModifier::shadowQualityUpdatedByVisual);
-    QObject::connect(chart, &Q3DScatter::selectedItemIndexChanged, modifier,
-                     &ScatterDataModifier::handleSelectionChange);
 
     QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
                      &ScatterDataModifier::changeFont);
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index aab230f2..bcb10e92 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -22,14 +22,13 @@
 #include <qmath.h>
 using namespace QtDataVis3D;
 
-//#define RANDOM_SCATTER
+//#define RANDOM_SCATTER // Uncomment this to switch to random scatter
 
 const int numberOfItems = 10000;
 
 ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     : m_chart(scatter),
-      m_fontSize(30.0f),
-      m_selectedItem(-1)
+      m_fontSize(40.0f)
 {
     QFont font = m_chart->font();
     font.setPointSize(m_fontSize);
@@ -45,8 +44,6 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     QScatterDataProxy *proxy = new QScatterDataProxy;
     proxy->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel");
     m_chart->setActiveDataProxy(proxy);
-
-    connect(&m_timer, &QTimer::timeout, this, &ScatterDataModifier::timeout);
 }
 
 ScatterDataModifier::~ScatterDataModifier()
@@ -150,14 +147,6 @@ void ScatterDataModifier::changeFont(const QFont &font)
     m_chart->setFont(newFont);
 }
 
-void ScatterDataModifier::changeFontSize(int fontsize)
-{
-    m_fontSize = fontsize;
-    QFont font = m_chart->font();
-    font.setPointSize(m_fontSize);
-    m_chart->setFont(font);
-}
-
 void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 {
     int quality = int(sq);
@@ -165,145 +154,6 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s
     emit shadowQualityChanged(quality);
 }
 
-void ScatterDataModifier::clear()
-{
-    m_chart->activeDataProxy()->resetArray(0);
-    qDebug() << m_loopCounter << "Cleared array";
-}
-
-void ScatterDataModifier::addOne()
-{
-    QScatterDataItem item(randVector());
-    int addIndex = m_chart->activeDataProxy()->addItem(item);
-    qDebug() << m_loopCounter << "added one to index:" << addIndex << "array size:" << m_chart->activeDataProxy()->array()->size();
-}
-
-void ScatterDataModifier::addBunch()
-{
-    QScatterDataArray items(100);
-    for (int i = 0; i < items.size(); i++)
-        items[i].setPosition(randVector());
-    int addIndex = m_chart->activeDataProxy()->addItems(items);
-    qDebug() << m_loopCounter << "added bunch to index:" << addIndex << "array size:" << m_chart->activeDataProxy()->array()->size();
-}
-
-void ScatterDataModifier::insertOne()
-{
-    QScatterDataItem item(randVector());
-    m_chart->activeDataProxy()->insertItem(0, item);
-    qDebug() << m_loopCounter << "Inserted one, array size:" << m_chart->activeDataProxy()->array()->size();
-}
-
-void ScatterDataModifier::insertBunch()
-{
-    QScatterDataArray items(100);
-    for (int i = 0; i < items.size(); i++)
-        items[i].setPosition(randVector());
-    m_chart->activeDataProxy()->insertItems(0, items);
-    qDebug() << m_loopCounter << "Inserted bunch, array size:" << m_chart->activeDataProxy()->array()->size();
-}
-
-void ScatterDataModifier::changeOne()
-{
-    if (m_selectedItem >= 0 && m_chart->activeDataProxy()->array()->size()) {
-        QScatterDataItem item(randVector());
-        m_chart->activeDataProxy()->setItem(m_selectedItem, item);
-        qDebug() << m_loopCounter << "Changed one, array size:" << m_chart->activeDataProxy()->array()->size();
-    }
-}
-
-void ScatterDataModifier::changeBunch()
-{
-    if (m_chart->activeDataProxy()->array()->size()) {
-        int amount = qMin(m_chart->activeDataProxy()->array()->size(), 100);
-        QScatterDataArray items(amount);
-        for (int i = 0; i < items.size(); i++)
-            items[i].setPosition(randVector());
-        m_chart->activeDataProxy()->setItems(0, items);
-        qDebug() << m_loopCounter << "Changed bunch, array size:" << m_chart->activeDataProxy()->array()->size();
-    }
-}
-
-void ScatterDataModifier::removeOne()
-{
-    if (m_selectedItem >= 0) {
-        m_chart->activeDataProxy()->removeItems(m_selectedItem, 1);
-        qDebug() << m_loopCounter << "Removed one, array size:" << m_chart->activeDataProxy()->array()->size();
-    }
-}
-
-void ScatterDataModifier::removeBunch()
-{
-    m_chart->activeDataProxy()->removeItems(0, 100);
-    qDebug() << m_loopCounter << "Removed bunch, array size:" << m_chart->activeDataProxy()->array()->size();
-}
-
-void ScatterDataModifier::timeout()
-{
-    int doWhat = rand() % 8;
-    if (!(rand() % 100))
-        doWhat = -1;
-
-    switch (doWhat) {
-    case 0:
-        addOne();
-        break;
-    case 1:
-        addBunch();
-        break;
-    case 2:
-        insertOne();
-        break;
-    case 3:
-        insertBunch();
-        break;
-    case 4:
-        changeOne();
-        break;
-    case 5:
-        changeBunch();
-        break;
-    case 6:
-        removeOne();
-        break;
-    case 7:
-        removeBunch();
-        break;
-    default:
-        clear();
-        break;
-    }
-
-    m_loopCounter++;
-}
-
-void ScatterDataModifier::startStopTimer()
-{
-    if (m_timer.isActive()) {
-        m_timer.stop();
-    } else {
-        clear();
-        m_loopCounter = 0;
-        m_timer.start(0);
-    }
-}
-
-void ScatterDataModifier::selectItem()
-{
-    int targetItem(3);
-    int noSelection(-1);
-    if (m_selectedItem != targetItem)
-        m_chart->setSelectedItemIndex(targetItem);
-    else
-        m_chart->setSelectedItemIndex(noSelection);
-}
-
-void ScatterDataModifier::handleSelectionChange(int index)
-{
-    m_selectedItem = index;
-    qDebug() << "Selected item index:" << index;
-}
-
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
     QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h
index 4412af99..9e01f0dc 100644
--- a/examples/scatterchart/scatterchart.h
+++ b/examples/scatterchart/scatterchart.h
@@ -20,10 +20,7 @@
 #define SCATTERDATAMODIFIER_H
 
 #include <QtDataVis3D/q3dscatter.h>
-
-#include <QFont>
-#include <QDebug>
-#include <QTimer>
+#include <QtGui/QFont>
 
 using namespace QtDataVis3D;
 
@@ -48,19 +45,6 @@ public:
 public slots:
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
-    void clear();
-    void addOne();
-    void addBunch();
-    void insertOne();
-    void insertBunch();
-    void changeOne();
-    void changeBunch();
-    void removeOne();
-    void removeBunch();
-    void timeout();
-    void startStopTimer();
-    void selectItem();
-    void handleSelectionChange(int index);
 
 signals:
     void shadowQualityChanged(int quality);
@@ -69,9 +53,6 @@ private:
     QVector3D randVector();
     Q3DScatter *m_chart;
     int m_fontSize;
-    QTimer m_timer;
-    int m_loopCounter;
-    int m_selectedItem;
 };
 
 #endif
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 106fd2d6..017961cb 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -28,71 +28,22 @@ const QString celsiusString = QString(QChar(0xB0)) + "C";
 
 ChartModifier::ChartModifier(Q3DBars *barchart)
     : m_chart(barchart),
-      m_columnCount(21),
-      m_rowCount(21),
       m_xRotation(0.0f),
       m_yRotation(0.0f),
-      m_static(true),
-      m_barThicknessRatio(1.0),
-      m_barSpacingX(0.1f),
-      m_barSpacingZ(0.1f),
       m_fontSize(20),
       m_segments(4),
       m_subSegments(3),
       m_minval(-20.0), // TODO Barchart Y-axis currently only properly supports zero-centered ranges
       m_maxval(20.0),
-      m_selectedBarPos(-1, -1),
-      m_autoAdjustingAxis(new QValueAxis),
-      m_fixedRangeAxis(new QValueAxis),
       m_temperatureAxis(new QValueAxis),
       m_yearAxis(new QCategoryAxis),
       m_monthAxis(new QCategoryAxis),
-      m_genericRowAxis(new QCategoryAxis),
-      m_genericColumnAxis(new QCategoryAxis),
-      m_temperatureData(new QBarDataProxy),
-      m_genericData(new QBarDataProxy),
-      m_currentAxis(m_fixedRangeAxis)
+      m_temperatureData(new QBarDataProxy)
 {
-    // Don't set any styles or specifications, start from defaults
-    // Generate generic labels
-    QStringList genericRowLabels;
-    QStringList genericColumnLabels;
-    for (int i = 0; i < 200; i++) {
-        if (i % 5)
-            genericRowLabels << QString();
-        else
-            genericRowLabels << QStringLiteral("Row %1").arg(i);
-    }
-    for (int i = 0; i < 200; i++) {
-        if (i % 5)
-            genericColumnLabels << QString();
-        else
-            genericColumnLabels << QStringLiteral("Column %1").arg(i);
-    }
-
     m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December";
     m_years << "2006" << "2007" << "2008" << "2009" << "2010" << "2011" << "2012";
 
-    QString labelFormat(QStringLiteral("%.3f"));
-    QString axisTitle("Generic Value");
-
-    m_autoAdjustingAxis->setLabelFormat(labelFormat);
-    m_autoAdjustingAxis->setTitle(axisTitle);
-    m_autoAdjustingAxis->setSegmentCount(m_segments * 2);
-    m_autoAdjustingAxis->setSubSegmentCount(1);
-    m_autoAdjustingAxis->setAutoAdjustRange(true);
-
-    m_fixedRangeAxis->setLabelFormat(labelFormat);
-    m_fixedRangeAxis->setTitle(axisTitle);
-    m_fixedRangeAxis->setSegmentCount(m_segments);
-    m_fixedRangeAxis->setSubSegmentCount(m_subSegments);
-    m_fixedRangeAxis->setRange(0.0, 100.0);
-
-    m_genericRowAxis->setTitle("Generic Row");
-    m_genericRowAxis->setCategoryLabels(genericRowLabels);
-
-    m_genericColumnAxis->setTitle("Generic Column");
-    m_genericColumnAxis->setCategoryLabels(genericColumnLabels);
+    m_chart->setBackgroundVisible(false);
 
     m_temperatureAxis->setTitle("Average temperature");
     m_temperatureAxis->setSegmentCount(m_segments);
@@ -106,24 +57,20 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
     m_monthAxis->setTitle("Month");
     m_monthAxis->setCategoryLabels(m_months);
 
-    m_chart->addAxis(m_autoAdjustingAxis);
-    m_chart->addAxis(m_fixedRangeAxis);
     m_chart->addAxis(m_temperatureAxis);
     m_chart->addAxis(m_yearAxis);
     m_chart->addAxis(m_monthAxis);
-    m_chart->addAxis(m_genericRowAxis);
-    m_chart->addAxis(m_genericColumnAxis);
 
     m_chart->setShadowQuality(QDataVis::ShadowSoftMedium);
 
     m_temperatureData->setItemLabelFormat(QStringLiteral("@valueTitle for @colLabel @rowLabel: @valueLabel"));
-    m_genericData->setItemLabelFormat(QStringLiteral("@valueTitle for (@rowIdx, @colIdx): @valueLabel"));
 
     m_chart->addDataProxy(m_temperatureData);
-    m_chart->addDataProxy(m_genericData);
 
     m_chart->setFont(QFont("Times Roman", 20));
 
+    m_chart->setSelectionMode(QDataVis::ModeItem);
+
     resetTemperatureData();
 }
 
@@ -134,92 +81,19 @@ ChartModifier::~ChartModifier()
 
 void ChartModifier::start()
 {
-    restart(false);
-}
-
-void ChartModifier::restart(bool dynamicData)
-{
-    m_static = !dynamicData;
-
-    if (m_static) {
-        m_chart->setActiveDataProxy(m_temperatureData);
-
-        m_chart->setTitle(QStringLiteral("Average temperatures in Oulu, Finland (2006-2012)"));
-
-        m_chart->setValueAxis(m_temperatureAxis);
-        m_chart->setRowAxis(m_yearAxis);
-        m_chart->setColumnAxis(m_monthAxis);
-
-        m_chart->setDataWindow(m_years.size(), m_months.size());
-        m_chart->setSelectionMode(QDataVis::ModeItem);
-    } else {
-        m_chart->setActiveDataProxy(m_genericData);
-
-        m_chart->setTitle(QStringLiteral("Generic data"));
-
-        m_chart->setValueAxis(m_currentAxis);
-        m_chart->setRowAxis(m_genericRowAxis);
-        m_chart->setColumnAxis(m_genericColumnAxis);
-
-        m_chart->setDataWindow(m_rowCount, m_columnCount);
-        m_chart->setSelectionMode(QDataVis::ModeItem);
-    }
-}
-
-void ChartModifier::selectBar()
-{
-    QPoint targetBar(5, 5);
-    QPoint noSelection(-1, -1);
-    if (m_selectedBarPos != targetBar)
-        m_chart->setSelectedBarPos(targetBar);
-    else
-        m_chart->setSelectedBarPos(noSelection);
-}
+    m_chart->setActiveDataProxy(m_temperatureData);
 
-void ChartModifier::swapAxis()
-{
-    static int counter = 0;
-    int state = ++counter % 3;
-
-    if (state == 0) {
-        m_currentAxis = m_fixedRangeAxis;
-        qDebug() << "Fixed range axis";
-    } else if (state == 1) {
-        m_currentAxis = m_autoAdjustingAxis;
-        qDebug() << "Automatic range axis";
-    } else {
-        m_currentAxis = 0;
-        qDebug() << "default axis";
-    }
+    m_chart->setTitle(QStringLiteral("Average temperatures in Oulu, Finland (2006-2012)"));
 
-    m_chart->setValueAxis(m_currentAxis);
-}
+    m_chart->setValueAxis(m_temperatureAxis);
+    m_chart->setRowAxis(m_yearAxis);
+    m_chart->setColumnAxis(m_monthAxis);
 
-void ChartModifier::releaseAxes()
-{
-    // Releases all axes - results in default axes for all dimensions.
-    // Axes reset when the graph is switched as set*Axis calls are made, which
-    // implicitly add axes.
-    m_chart->releaseAxis(m_autoAdjustingAxis);
-    m_chart->releaseAxis(m_fixedRangeAxis);
-    m_chart->releaseAxis(m_temperatureAxis);
-    m_chart->releaseAxis(m_yearAxis);
-    m_chart->releaseAxis(m_monthAxis);
-    m_chart->releaseAxis(m_genericRowAxis);
-    m_chart->releaseAxis(m_genericColumnAxis);
-}
-
-void ChartModifier::releaseProxies()
-{
-    // Releases all proxies - results in default proxy.
-    // Proxies will get readded back when graph is switched as setDataProxy call is made.
-    m_chart->releaseDataProxy(m_temperatureData);
-    m_chart->releaseDataProxy(m_genericData);
+    m_chart->setDataWindow(m_years.size(), m_months.size());
 }
 
 void ChartModifier::resetTemperatureData()
 {
-
     // Set up data
     static const float temp[7][12] = {
         {-6.7f, -11.7f, -9.7f, 3.3f, 9.2f, 14.0f, 16.3f, 17.8f, 10.2f, 2.1f, -2.6f, -0.3f},    // 2006
@@ -247,103 +121,13 @@ void ChartModifier::resetTemperatureData()
         dataSet->append(dataRow);
     }
 
-
     // Add data to chart (chart assumes ownership)
     m_temperatureData->resetArray(dataSet);
 }
 
-void ChartModifier::addRow()
-{
-    QBarDataRow *dataRow = new QBarDataRow(m_columnCount);
-    for (float i = 0; i < m_columnCount; i++) {
-        (*dataRow)[i].setValue(((i + 1) / (float)m_columnCount) * (float)(rand() % 100));
-        //(*dataRow)[i].setValue(i + m_chart->dataProxy()->rowCount());
-    }
-
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = qMax(m_selectedBarPos.x(), 0);
-    m_chart->activeDataProxy()->insertRow(row, dataRow);
-}
-
-void ChartModifier::addRows()
-{
-    QTime timer;
-    timer.start();
-    QBarDataArray dataArray;
-    for (int i = 0; i < m_rowCount; i++) {
-        QBarDataRow *dataRow = new QBarDataRow(m_columnCount);
-        for (int j = 0; j < m_columnCount; j++)
-            (*dataRow)[j].setValue(qreal(j + i + m_chart->activeDataProxy()->rowCount()));
-        dataArray.append(dataRow);
-    }
-
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = qMax(m_selectedBarPos.x(), 0);
-    m_chart->activeDataProxy()->insertRows(row, dataArray);
-    qDebug() << "Added" << m_rowCount << "rows, time:" << timer.elapsed();
-}
-
-void ChartModifier::changeItem()
-{
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = m_selectedBarPos.x();
-    int column = m_selectedBarPos.y();
-    if (row >= 0 && column >= 0) {
-        QBarDataItem item(qreal(rand() % 100));
-        m_chart->activeDataProxy()->setItem(row, column, item);
-    }
-}
-
-void ChartModifier::changeRow()
-{
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = m_selectedBarPos.x();
-    if (row >= 0) {
-        QBarDataRow *newRow = new QBarDataRow(m_chart->activeDataProxy()->rowAt(row)->size());
-        for (int i = 0; i < newRow->size(); i++)
-            (*newRow)[i].setValue(qreal(rand() % 100));
-        m_chart->activeDataProxy()->setRow(row, newRow);
-    }
-}
-
-void ChartModifier::changeRows()
-{
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = m_selectedBarPos.x();
-    if (row >= 0) {
-        int startRow = qMax(row - 2, 0);
-        QBarDataArray newArray;
-        for (int i = startRow; i <= row; i++ ) {
-            QBarDataRow *newRow = new QBarDataRow(m_chart->activeDataProxy()->rowAt(i)->size());
-            for (int j = 0; j < newRow->size(); j++)
-                (*newRow)[j].setValue(qreal(rand() % 100));
-            newArray.append(newRow);
-        }
-        m_chart->activeDataProxy()->setRows(startRow, newArray);
-    }
-}
-
-void ChartModifier::removeRow()
-{
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = m_selectedBarPos.x();
-    if (row >= 0)
-        m_chart->activeDataProxy()->removeRows(row, 1);
-}
-
-void ChartModifier::removeRows()
-{
-    // TODO Needs to be changed to account for data window offset once it is implemented.
-    int row = m_selectedBarPos.x();
-    if (row >= 0) {
-        int startRow = qMax(row - 2, 0);
-        m_chart->activeDataProxy()->removeRows(startRow, 3);
-    }
-}
-
 void ChartModifier::changeStyle()
 {
-    static int model = 0;
+    static int model = 9;
     switch (model) {
     case 0:
         m_chart->setBarType(QDataVis::Cylinders, false);
@@ -393,7 +177,7 @@ void ChartModifier::changePresetCamera()
 
 void ChartModifier::changeTheme()
 {
-    static int theme = QDataVis::ThemeSystem;
+    static int theme = QDataVis::ThemeBlueCerulean;
 
     m_chart->setTheme((QDataVis::ColorTheme)theme);
 
@@ -408,7 +192,7 @@ void ChartModifier::changeTransparency()
     m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency);
 
     if (++transparency > QDataVis::TransparencyNoBackground)
-        transparency = QDataVis::TransparencyFromTheme;
+        transparency = QDataVis::TransparencyNone;
 }
 
 void ChartModifier::changeSelectionMode()
@@ -443,12 +227,6 @@ void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
     emit shadowQualityChanged(quality);
 }
 
-void ChartModifier::handleSelectionChange(const QPoint &position)
-{
-    m_selectedBarPos = position;
-    qDebug() << "Selected bar position:" << position;
-}
-
 void ChartModifier::changeShadowQuality(int quality)
 {
     QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
@@ -456,16 +234,6 @@ void ChartModifier::changeShadowQuality(int quality)
     emit shadowQualityChanged(quality);
 }
 
-void ChartModifier::setBackgroundEnabled(int enabled)
-{
-    m_chart->setBackgroundVisible((bool)enabled);
-}
-
-void ChartModifier::setGridEnabled(int enabled)
-{
-    m_chart->setGridVisible((bool)enabled);
-}
-
 void ChartModifier::rotateX(int rotation)
 {
     m_xRotation = rotation;
@@ -478,32 +246,12 @@ void ChartModifier::rotateY(int rotation)
     m_chart->setCameraPosition(m_xRotation, m_yRotation);
 }
 
-void ChartModifier::setSpecsRatio(int barwidth)
-{
-    m_barThicknessRatio = (float)barwidth / 30.0f;
-    m_chart->setBarSpecs(m_barThicknessRatio, QSizeF(m_barSpacingX, m_barSpacingZ));
-}
-
-void ChartModifier::setSpacingSpecsX(int spacing)
-{
-    m_barSpacingX = (float)spacing / 100.0f;
-    m_chart->setBarSpecs(m_barThicknessRatio, QSizeF(m_barSpacingX, m_barSpacingZ));
-}
-
-void ChartModifier::setSpacingSpecsZ(int spacing)
-{
-    m_barSpacingZ = (float)spacing / 100.0f;
-    m_chart->setBarSpecs(m_barThicknessRatio, QSizeF(m_barSpacingX, m_barSpacingZ));
-}
-
-void ChartModifier::setSampleCountX(int samples)
+void ChartModifier::setBackgroundEnabled(int enabled)
 {
-    m_columnCount = samples;
-    m_chart->setDataWindow(m_rowCount, m_columnCount);
+    m_chart->setBackgroundVisible((bool)enabled);
 }
 
-void ChartModifier::setSampleCountZ(int samples)
+void ChartModifier::setGridEnabled(int enabled)
 {
-    m_rowCount = samples;
-    m_chart->setDataWindow(m_rowCount, m_columnCount);
+    m_chart->setGridVisible((bool)enabled);
 }
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index 3319df06..82745521 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -36,13 +36,6 @@ public:
     ~ChartModifier();
 
     void resetTemperatureData();
-    void addRow();
-    void addRows();
-    void changeItem();
-    void changeRow();
-    void changeRows();
-    void removeRow();
-    void removeRows();
     void changeStyle();
     void changePresetCamera();
     void changeTheme();
@@ -54,37 +47,19 @@ public:
     void rotateY(int rotation);
     void setBackgroundEnabled(int enabled);
     void setGridEnabled(int enabled);
-    void setSpecsRatio(int barwidth);
-    void setSpecsZ(int bardepth);
-    void setSpacingSpecsX(int spacing);
-    void setSpacingSpecsZ(int spacing);
-    void setSampleCountX(int samples);
-    void setSampleCountZ(int samples);
     void start();
-    void restart(bool dynamicData);
-    void selectBar();
-    void swapAxis();
-    void releaseAxes();
-    void releaseProxies();
 
 public slots:
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
-    void handleSelectionChange(const QPoint &position);
 
 signals:
     void shadowQualityChanged(int quality);
 
 private:
     Q3DBars *m_chart;
-    int m_columnCount;
-    int m_rowCount;
     float m_xRotation;
     float m_yRotation;
-    bool m_static;
-    qreal m_barThicknessRatio;
-    float m_barSpacingX;
-    float m_barSpacingZ;
     int m_fontSize;
     int m_segments;
     int m_subSegments;
@@ -92,17 +67,10 @@ private:
     qreal m_maxval;
     QStringList m_months;
     QStringList m_years;
-    QPoint m_selectedBarPos;
-    QValueAxis *m_autoAdjustingAxis;
-    QValueAxis *m_fixedRangeAxis;
     QValueAxis *m_temperatureAxis;
     QCategoryAxis *m_yearAxis;
     QCategoryAxis *m_monthAxis;
-    QCategoryAxis *m_genericRowAxis;
-    QCategoryAxis *m_genericColumnAxis;
     QBarDataProxy *m_temperatureData;
-    QBarDataProxy *m_genericData;
-    QValueAxis *m_currentAxis;
 };
 
 #endif
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
index 98d2dbbd..76ec6dee 100644
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
     QSize screenSize = widgetchart->screen()->size();
 
     QWidget *container = QWidget::createWindowContainer(widgetchart);
-    container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 2));
+    container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 1.5));
     container->setMaximumSize(screenSize);
     container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     container->setFocusPolicy(Qt::StrongFocus);
@@ -52,34 +52,6 @@ int main(int argc, char **argv)
     hLayout->addWidget(container, 1);
     hLayout->addLayout(vLayout);
 
-    QPushButton *dataButton = new QPushButton(widget);
-    dataButton->setText(QStringLiteral("Insert a row of data"));
-    dataButton->setEnabled(false);
-
-    QPushButton *multiDataButton = new QPushButton(widget);
-    multiDataButton->setText(QStringLiteral("Insert many rows of data"));
-    multiDataButton->setEnabled(false);
-
-    QPushButton *changeSingleDataButton = new QPushButton(widget);
-    changeSingleDataButton->setText(QStringLiteral("Change selected bar value"));
-    changeSingleDataButton->setEnabled(false);
-
-    QPushButton *changeRowButton = new QPushButton(widget);
-    changeRowButton->setText(QStringLiteral("Change selected row values"));
-    changeRowButton->setEnabled(false);
-
-    QPushButton *changeRowsButton = new QPushButton(widget);
-    changeRowsButton->setText(QStringLiteral("Change three rows from selected"));
-    changeRowsButton->setEnabled(false);
-
-    QPushButton *removeRowButton = new QPushButton(widget);
-    removeRowButton->setText(QStringLiteral("Remove selected row"));
-    removeRowButton->setEnabled(false);
-
-    QPushButton *removeRowsButton = new QPushButton(widget);
-    removeRowsButton->setText(QStringLiteral("remove three rows from selected"));
-    removeRowsButton->setEnabled(false);
-
     QPushButton *themeButton = new QPushButton(widget);
     themeButton->setText(QStringLiteral("Change theme"));
 
@@ -95,78 +67,24 @@ int main(int argc, char **argv)
     QPushButton *selectionButton = new QPushButton(widget);
     selectionButton->setText(QStringLiteral("Change selection mode"));
 
-    QPushButton *setSelectedBarButton = new QPushButton(widget);
-    setSelectedBarButton->setText(QStringLiteral("Select/deselect bar at (5,5)"));
-
-    QPushButton *swapAxisButton = new QPushButton(widget);
-    swapAxisButton->setText(QStringLiteral("Swap value axis"));
-    swapAxisButton->setEnabled(false);
-
-    QPushButton *releaseAxesButton = new QPushButton(widget);
-    releaseAxesButton->setText(QStringLiteral("Release all axes"));
-    releaseAxesButton->setEnabled(true);
-
-    QPushButton *releaseProxiesButton = new QPushButton(widget);
-    releaseProxiesButton->setText(QStringLiteral("Release all proxies"));
-    releaseProxiesButton->setEnabled(true);
-
     QCheckBox *backgroundCheckBox = new QCheckBox(widget);
     backgroundCheckBox->setText(QStringLiteral("Show background"));
-    backgroundCheckBox->setChecked(true);
+    backgroundCheckBox->setChecked(false);
 
     QCheckBox *gridCheckBox = new QCheckBox(widget);
     gridCheckBox->setText(QStringLiteral("Show grid"));
     gridCheckBox->setChecked(true);
 
-    QCheckBox *rotationCheckBox = new QCheckBox(widget);
-    rotationCheckBox->setText("Rotate with slider");
-
-    QCheckBox *staticCheckBox = new QCheckBox(widget);
-    staticCheckBox->setText("Use dynamic data");
-    staticCheckBox->setChecked(false);
-
     QSlider *rotationSliderX = new QSlider(Qt::Horizontal, widget);
     rotationSliderX->setTickInterval(1);
     rotationSliderX->setMinimum(-180);
     rotationSliderX->setValue(0);
     rotationSliderX->setMaximum(180);
-    rotationSliderX->setEnabled(false);
     QSlider *rotationSliderY = new QSlider(Qt::Horizontal, widget);
     rotationSliderY->setTickInterval(1);
-    rotationSliderY->setMinimum(0);
+    rotationSliderY->setMinimum(-90);
     rotationSliderY->setValue(0);
     rotationSliderY->setMaximum(90);
-    rotationSliderY->setEnabled(false);
-
-    QSlider *ratioSlider = new QSlider(Qt::Horizontal, widget);
-    ratioSlider->setTickInterval(1);
-    ratioSlider->setMinimum(10);
-    ratioSlider->setValue(30);
-    ratioSlider->setMaximum(100);
-
-    QSlider *spacingSliderX = new QSlider(Qt::Horizontal, widget);
-    spacingSliderX->setTickInterval(1);
-    spacingSliderX->setMinimum(0);
-    spacingSliderX->setValue(10);
-    spacingSliderX->setMaximum(200);
-    QSlider *spacingSliderZ = new QSlider(Qt::Horizontal, widget);
-    spacingSliderZ->setTickInterval(1);
-    spacingSliderZ->setMinimum(0);
-    spacingSliderZ->setValue(10);
-    spacingSliderZ->setMaximum(200);
-
-    QSlider *sampleSliderX = new QSlider(Qt::Horizontal, widget);
-    sampleSliderX->setTickInterval(1);
-    sampleSliderX->setMinimum(2);
-    sampleSliderX->setValue(10);
-    sampleSliderX->setMaximum(200);
-    sampleSliderX->setEnabled(false);
-    QSlider *sampleSliderZ = new QSlider(Qt::Horizontal, widget);
-    sampleSliderZ->setTickInterval(1);
-    sampleSliderZ->setMinimum(2);
-    sampleSliderZ->setValue(10);
-    sampleSliderZ->setMaximum(200);
-    sampleSliderZ->setEnabled(false);
 
     QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, widget);
     fontSizeSlider->setTickInterval(1);
@@ -175,6 +93,7 @@ int main(int argc, char **argv)
     fontSizeSlider->setMaximum(100);
 
     QFontComboBox *fontList = new QFontComboBox(widget);
+    fontList->setCurrentFont(QFont("Arial"));
 
     QComboBox *shadowQuality = new QComboBox(widget);
     shadowQuality->addItem(QStringLiteral("None"));
@@ -186,34 +105,15 @@ int main(int argc, char **argv)
     shadowQuality->addItem(QStringLiteral("High Soft"));
     shadowQuality->setCurrentIndex(5);
 
-    vLayout->addWidget(staticCheckBox, 0, Qt::AlignTop);
-    vLayout->addWidget(rotationCheckBox, 0, Qt::AlignTop);
+    vLayout->addWidget(new QLabel(QStringLiteral("Rotate horizontally")));
     vLayout->addWidget(rotationSliderX, 0, Qt::AlignTop);
+    vLayout->addWidget(new QLabel(QStringLiteral("Rotate vertically")));
     vLayout->addWidget(rotationSliderY, 0, Qt::AlignTop);
-    vLayout->addWidget(new QLabel(QStringLiteral("Adjust relative bar size")));
-    vLayout->addWidget(ratioSlider, 0, Qt::AlignTop);
-    vLayout->addWidget(new QLabel(QStringLiteral("Adjust relative bar spacing")));
-    vLayout->addWidget(spacingSliderX, 0, Qt::AlignTop);
-    vLayout->addWidget(spacingSliderZ, 0, Qt::AlignTop);
-    vLayout->addWidget(new QLabel(QStringLiteral("Adjust sample count")));
-    vLayout->addWidget(sampleSliderX, 0, Qt::AlignTop);
-    vLayout->addWidget(sampleSliderZ, 1, Qt::AlignTop);
-    vLayout->addWidget(dataButton, 0, Qt::AlignTop);
-    vLayout->addWidget(multiDataButton, 0, Qt::AlignTop);
-    vLayout->addWidget(changeSingleDataButton, 0, Qt::AlignTop);
-    vLayout->addWidget(changeRowButton, 0, Qt::AlignTop);
-    vLayout->addWidget(changeRowsButton, 0, Qt::AlignTop);
-    vLayout->addWidget(removeRowButton, 0, Qt::AlignTop);
-    vLayout->addWidget(removeRowsButton, 0, Qt::AlignTop);
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
     vLayout->addWidget(cameraButton, 0, Qt::AlignTop);
     vLayout->addWidget(selectionButton, 0, Qt::AlignTop);
-    vLayout->addWidget(setSelectedBarButton, 0, Qt::AlignTop);
-    vLayout->addWidget(swapAxisButton, 0, Qt::AlignTop);
-    vLayout->addWidget(releaseAxesButton, 0, Qt::AlignTop);
-    vLayout->addWidget(releaseProxiesButton, 0, Qt::AlignTop);
     vLayout->addWidget(backgroundCheckBox);
     vLayout->addWidget(gridCheckBox);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
@@ -221,8 +121,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(new QLabel(QStringLiteral("Change font")));
     vLayout->addWidget(fontList);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust font size")));
-    vLayout->addWidget(fontSizeSlider, 0, Qt::AlignTop);
-    // TODO: Add example for setMeshFileName
+    vLayout->addWidget(fontSizeSlider, 1, Qt::AlignTop);
 
     widget->show();
 
@@ -231,17 +130,19 @@ int main(int argc, char **argv)
     QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &ChartModifier::rotateX);
     QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &ChartModifier::rotateY);
 
-    QObject::connect(ratioSlider, &QSlider::valueChanged, modifier, &ChartModifier::setSpecsRatio);
-
-    QObject::connect(spacingSliderX, &QSlider::valueChanged, modifier,
-                     &ChartModifier::setSpacingSpecsX);
-    QObject::connect(spacingSliderZ, &QSlider::valueChanged, modifier,
-                     &ChartModifier::setSpacingSpecsZ);
+    QObject::connect(themeButton, &QPushButton::clicked, modifier, &ChartModifier::changeTheme);
+    QObject::connect(labelButton, &QPushButton::clicked, modifier,
+                     &ChartModifier::changeTransparency);
+    QObject::connect(styleButton, &QPushButton::clicked, modifier, &ChartModifier::changeStyle);
+    QObject::connect(cameraButton, &QPushButton::clicked, modifier,
+                     &ChartModifier::changePresetCamera);
+    QObject::connect(selectionButton, &QPushButton::clicked, modifier,
+                     &ChartModifier::changeSelectionMode);
 
-    QObject::connect(sampleSliderX, &QSlider::valueChanged, modifier,
-                     &ChartModifier::setSampleCountX);
-    QObject::connect(sampleSliderZ, &QSlider::valueChanged, modifier,
-                     &ChartModifier::setSampleCountZ);
+    QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier,
+                     &ChartModifier::setBackgroundEnabled);
+    QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier,
+                     &ChartModifier::setGridEnabled);
 
     QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeShadowQuality(int)));
@@ -249,75 +150,12 @@ int main(int argc, char **argv)
                      &QComboBox::setCurrentIndex);
     QObject::connect(widgetchart, &Q3DBars::shadowQualityChanged, modifier,
                      &ChartModifier::shadowQualityUpdatedByVisual);
-    QObject::connect(widgetchart, &Q3DBars::selectedBarPosChanged, modifier,
-                     &ChartModifier::handleSelectionChange);
 
     QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier,
                      &ChartModifier::changeFontSize);
-
-    QObject::connect(styleButton, &QPushButton::clicked, modifier, &ChartModifier::changeStyle);
-    QObject::connect(cameraButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::changePresetCamera);
-    QObject::connect(themeButton, &QPushButton::clicked, modifier, &ChartModifier::changeTheme);
-    QObject::connect(labelButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::changeTransparency);
-    QObject::connect(dataButton, &QPushButton::clicked, modifier, &ChartModifier::addRow);
-    QObject::connect(multiDataButton, &QPushButton::clicked, modifier, &ChartModifier::addRows);
-    QObject::connect(changeSingleDataButton, &QPushButton::clicked, modifier, &ChartModifier::changeItem);
-    QObject::connect(changeRowButton, &QPushButton::clicked, modifier, &ChartModifier::changeRow);
-    QObject::connect(changeRowsButton, &QPushButton::clicked, modifier, &ChartModifier::changeRows);
-    QObject::connect(removeRowButton, &QPushButton::clicked, modifier, &ChartModifier::removeRow);
-    QObject::connect(removeRowsButton, &QPushButton::clicked, modifier, &ChartModifier::removeRows);
-    QObject::connect(selectionButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::changeSelectionMode);
-    QObject::connect(setSelectedBarButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::selectBar);
-    QObject::connect(swapAxisButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::swapAxis);
-    QObject::connect(releaseAxesButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::releaseAxes);
-    QObject::connect(releaseProxiesButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::releaseProxies);
-
     QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
                      &ChartModifier::changeFont);
 
-    QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier,
-                     &ChartModifier::setBackgroundEnabled);
-    QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier,
-                     &ChartModifier::setGridEnabled);
-
-    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderX,
-                     &QSlider::setEnabled);
-    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderX,
-                     &QSlider::setValue);
-    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderY,
-                     &QSlider::setEnabled);
-    QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderY,
-                     &QSlider::setValue);
-
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, dataButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, multiDataButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, changeSingleDataButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, changeRowButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, changeRowsButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, removeRowButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, removeRowsButton,
-                     &QPushButton::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, sampleSliderX,
-                     &QSlider::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, sampleSliderZ,
-                     &QSlider::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, swapAxisButton,
-                     &QSlider::setEnabled);
-    QObject::connect(staticCheckBox, &QCheckBox::stateChanged, modifier, &ChartModifier::restart);
-
     modifier->start();
 
     return app.exec();