Tuned scatterinteractions example

4 files changed, 33 insertions, 29 deletions

diff --git a/examples/scatterinteractions/mainwindow.cpp b/examples/scatterinteractions/chartview.cpp
index 6cef450f..60b4d015 100644
--- a/examples/scatterinteractions/mainwindow.cpp
+++ b/examples/scatterinteractions/chartview.cpp
@@ -18,16 +18,18 @@
 **
 ****************************************************************************/
 
-#include "mainwindow.h"
-#include <QChartView>
+#include "chartview.h"
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent)
+ChartView::ChartView(QWidget *parent)
+    : QChartView(new QChart(), parent),
+      m_scatter(0),
+      m_scatter2(0)
 {
-    QChart *chart = new QChart();
-    chart->setTitle("Click to remove scatter point");
+    setRenderHint(QPainter::Antialiasing);
+
+    chart()->setTitle("Click to interact with scatter points");
 
     m_scatter = new QScatterSeries();
     for(qreal x(0.5); x <= 4.0; x += 0.5) {
@@ -35,23 +37,22 @@ MainWindow::MainWindow(QWidget *parent)
             *m_scatter << QPointF(x, y);
         }
     }
+    m_scatter2 = new QScatterSeries();
 
-    chart->addSeries(m_scatter);
-    chart->axisX()->setRange(0, 4.5);
-    chart->axisY()->setRange(0, 4.5);
+    chart()->addSeries(m_scatter2);
+    chart()->addSeries(m_scatter);
+    chart()->axisX()->setRange(0, 4.5);
+    chart()->axisY()->setRange(0, 4.5);
 
     connect(m_scatter, SIGNAL(clicked(QPointF)), this, SLOT(handleClickedPoint(QPointF)));
-
-    QChartView *chartView = new QChartView(chart);
-    chartView->setRenderHint(QPainter::Antialiasing);
-    setCentralWidget(chartView);
 }
 
-MainWindow::~MainWindow()
+ChartView::~ChartView()
 {
 }
 
-void MainWindow::handleClickedPoint(const QPointF& point)
+void ChartView::handleClickedPoint(const QPointF& point)
 {
     m_scatter->remove(point);
+    m_scatter2->append(point);
 }
diff --git a/examples/scatterinteractions/mainwindow.h b/examples/scatterinteractions/chartview.h
index af77c03c..56c9224e 100644
--- a/examples/scatterinteractions/mainwindow.h
+++ b/examples/scatterinteractions/chartview.h
@@ -21,19 +21,19 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
-#include <qchartglobal.h>
-#include <qscatterseries.h>
+#include <QChartGlobal>
+#include <QChartView>
+#include <QScatterSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
-class MainWindow : public QMainWindow
+class ChartView : public QChartView
 {
     Q_OBJECT
 
 public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
+    ChartView(QWidget *parent = 0);
+    ~ChartView();
 
 private Q_SLOTS:
     void handleClickedPoint(const QPointF& point);
@@ -41,7 +41,6 @@ private Q_SLOTS:
 private:
     QScatterSeries *m_scatter;
     QScatterSeries *m_scatter2;
-    QScatterSeries *m_scatter3;
 };
 
 #endif // MAINWINDOW_H
diff --git a/examples/scatterinteractions/main.cpp b/examples/scatterinteractions/main.cpp
index 5e47f613..d0356229 100644
--- a/examples/scatterinteractions/main.cpp
+++ b/examples/scatterinteractions/main.cpp
@@ -19,14 +19,17 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include "mainwindow.h"
+#include <QMainWindow>
+#include "chartview.h"
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    MainWindow w;
-    w.resize(400, 300);
-    w.show();
+    QMainWindow window;
+    ChartView chartView(&window);
+    window.setCentralWidget(&chartView);
+    window.resize(400, 300);
+    window.show();
 
     return a.exec();
 }
diff --git a/examples/scatterinteractions/scatterinteractions.pro b/examples/scatterinteractions/scatterinteractions.pro
index 3c64d801..596fe020 100644
--- a/examples/scatterinteractions/scatterinteractions.pro
+++ b/examples/scatterinteractions/scatterinteractions.pro
@@ -3,6 +3,7 @@
 }
 
 TARGET = scatterinteractions
-SOURCES += main.cpp\
-        mainwindow.cpp
-HEADERS  += mainwindow.h
+SOURCES += main.cpp \
+    chartview.cpp
+HEADERS  += \
+    chartview.h