HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1026:d9d576bb7abc

Tuned scatterinteractions example

Tero Ahola -

r1026:d9d576bb7abc

parent child

Context file:

r1026:d9d576bb7abc

Collapse all files

doc/images/examples_scatterinteractions.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

doc/src/examples-scatterinteractions.qdoc +2 0

             /*!
                  \example examples/scatterinteractions
                  \title ScatterChart Example
                  \subtitle
                  The example shows how to create simple scatter chart and how to interact with the chart.
+                 \image examples_scatterinteractions.png
             */

examples/scatterinteractions/chartview.cpp ~~examples/scatterinteractions/mainwindow.cpp~~ renamed +16 -15

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #include "mainwindow.h"
+            #include "chartview.h"
-            #include <QChartView>
             QTCOMMERCIALCHART_USE_NAMESPACE
-            MainWindow::MainWindow(QWidget *parent)
+            ChartView::ChartView(QWidget *parent)
-                : QMainWindow(parent)
+                : QChartView(new QChart(), parent),
+                  m_scatter(0),
+                  m_scatter2(0)
             {
-                QChart *chart = new QChart();
+                setRenderHint(QPainter::Antialiasing);
-                chart->setTitle("Click to remove scatter point");
+                chart()->setTitle("Click to interact with scatter points");
                 m_scatter = new QScatterSeries();
                 for(qreal x(0.5); x <= 4.0; x += 0.5) {
                     for(qreal y(0.5); y <= 4.0; y += 0.5) {
                         *m_scatter << QPointF(x, y);
                     }
                 }
+                m_scatter2 = new QScatterSeries();
-                chart->addSeries(m_scatter);
+                chart()->addSeries(m_scatter2);
-                chart->axisX()->setRange(0, 4.5);
+                chart()->addSeries(m_scatter);
-                chart->axisY()->setRange(0, 4.5);
+                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);
             }

examples/scatterinteractions/chartview.h ~~examples/scatterinteractions/mainwindow.h~~ renamed +6 -7

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef MAINWINDOW_H
             #define MAINWINDOW_H
-            #include <QtGui/QMainWindow>
+            #include <QChartGlobal>
-            #include <qchartglobal.h>
+            #include <QChartView>
-            #include <qscatterseries.h>
+            #include <QScatterSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
-            class MainWindow : public QMainWindow
+            class ChartView : public QChartView
             {
                 Q_OBJECT
             public:
-                MainWindow(QWidget *parent = 0);
+                ChartView(QWidget *parent = 0);
-                ~MainWindow();
+                ~ChartView();
             private Q_SLOTS:
                 void handleClickedPoint(const QPointF& point);
             private:
                 QScatterSeries *m_scatter;
                 QScatterSeries *m_scatter2;
-                QScatterSeries *m_scatter3;
             };
             #endif // MAINWINDOW_H

examples/scatterinteractions/main.cpp +7 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtGui/QApplication>
-            #include "mainwindow.h"
+            #include <QMainWindow>
+            #include "chartview.h"
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
-                MainWindow w;
+                QMainWindow window;
-                w.resize(400, 300);
+                ChartView chartView(&window);
-                w.show();
+                window.setCentralWidget(&chartView);
+                window.resize(400, 300);
+                window.show();
                 return a.exec();
             }

examples/scatterinteractions/scatterinteractions.pro +4 -3

             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             TARGET = scatterinteractions
-            SOURCES += main.cpp\
+            SOURCES += main.cpp \
-                    mainwindow.cpp
+                chartview.cpp
-            HEADERS  += mainwindow.h
+            HEADERS  += \
+                chartview.h

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages