HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1015:5ddcd5974481

examples/scatterchart/chartview.cpp created 644 +34 0

@@ -0,0 +1,34
	1	#include "chartview.h"
	2	#include <QScatterSeries>
	3
	4	ChartView::ChartView(QWidget *parent) :
	5	QChartView(new QChart(), parent)
	6	{
	7	//![1]
	8	QScatterSeries *series0 = new QScatterSeries();
	9	series0->setShape(QScatterSeries::MarkerShapeCircle);
	10	series0->setSize(15.0);
	11
	12	QScatterSeries *series1 = new QScatterSeries();
	13	series1->setShape(QScatterSeries::MarkerShapeCircle);
	14	series1->setSize(20.0);
	15	//![1]
	16
	17	//![2]
	18	series0->append(0, 6);
	19	series0->append(2, 4);
	20	series0->append(3, 8);
	21	series0->append(7, 4);
	22	series0->append(10, 5);
	23
	24	*series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2);
	25	//![2]
	26
	27	//![3]
	28	setRenderHint(QPainter::Antialiasing);
	29	chart()->addSeries(series0);
	30	chart()->addSeries(series1);
	31	chart()->setTitle("Simple scatterchart example");
	32	chart()->setBackgroundDropShadowEnabled(false);
	33	//![3]
	34	}

examples/scatterchart/chartview.h created 644 +20 0

@@ -0,0 +1,20
	1	#ifndef CHARTVIEW_H
	2	#define CHARTVIEW_H
	3
	4	#include <QChartView>
	5
	6	QTCOMMERCIALCHART_USE_NAMESPACE
	7
	8	class ChartView : public QChartView
	9	{
	10	Q_OBJECT
	11	public:
	12	explicit ChartView(QWidget *parent = 0);
	13
	14	signals:
	15
	16	public slots:
	17
	18	};
	19
	20	#endif // CHARTVIEW_H

doc/images/examples_scatterchart.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/src/examples-presenterchart.qdoc +6 -15

                 \image examples_presenterchart2.png
                 \image examples_presenterchart3.png
                 \image examples_presenterchart4.png
                 We create simple ChartView class which derives form QChartView.
                 \snippet ../examples/presenterchart/chartview.h 1
                 Class will implement \c handleTimeout() slot which we are going to use to trigger switching between different chart presentations.
                 We are also going to provide \c handlePoitClicked() slot which will show clicked point on the chart.
                 Class members \c m_series and \c m_titles are going to store series and related titles. In example we are going to present data as a line chart
                 In the end we store references all the created series and matching titles.
                 \snippet ../examples/presenterchart/chartview.cpp 3
-                We connect \c clicked() signals from each series with our \c handlePointClciked() slot.
-                \snippet ../examples/presenterchart/chartview.cpp 4
                 In  \c handleTimeout() slot  we change currently displayed chart by removing previous series and adding next series from the \c m_series list. We also set proper title.
-                \snippet ../examples/presenterchart/chartview.cpp 5
+                \snippet ../examples/presenterchart/chartview.cpp 4
-                In  \c handlePointClciked() slot we set the chart's title to show clicked point x and y coordinates.
-                \snippet ../examples/presenterchart/chartview.cpp 6
             */

doc/src/examples-scatterchart.qdoc +6 -5

                 To create scatter charts, QScatterSeries instance is needed. Here we create scatter series instance and we set the type, color and width of outline for scatter points.
-                \snippet ../examples/scatterchart/main.cpp 1
+                \snippet ../examples/scatterchart/chartview.cpp 1
                 We add data to be shown. We can use add() member function or use stream operator.
-                \snippet ../examples/scatterchart/main.cpp 2
+                \snippet ../examples/scatterchart/chartview.cpp 2
-                In the end we create QChartView instance, set title, set anti-aliasing and add scatter series.
+                In the end we enable anti-aliasing, set the chart title and add the scatter series onto the chart. We also disable
+                drop shadow, because it would not look good on an application with only chart view shown.
-                \snippet ../examples/scatterchart/main.cpp 3
+                \snippet ../examples/scatterchart/chartview.cpp 3
                 Chart is ready to be shown.
                 \snippet ../examples/scatterchart/main.cpp 4
             */

examples/presenterchart/chartview.cpp +3 -14

             m_index(-1),m_chart(chart)
             {
                 m_chart->setTitle("Charts presenter");
+                m_chart->setBackgroundDropShadowEnabled(false);
                 QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(handleTimeout()));
                 m_timer.setInterval(3000);
                 m_titles<< m_chart->title()+": AreaChart";
             //![3]
-            //![4]
-                foreach (QAbstractSeries* series, m_series) {
-                    QObject::connect(series,SIGNAL(clicked(QPointF)),this,SLOT(handlePointClicked(QPointF)));
-            //![4]
                 m_timer.start();
                 handleTimeout();
             }
                 qDeleteAll(m_series);
             }
-            //![5]
+            //![4]
             void ChartView::handleTimeout()
             {
                 if(m_series.size()==0) return;
                 m_chart->addSeries(m_series.at(m_index));
                 m_chart->setTitle(m_titles.at(m_index));
             }
-            //![5]
+            //![4]
-            //![6]
-            void ChartView::handlePointClicked(const QPointF& point)
-                m_chart->setTitle(m_titles.at(m_index) + QString(" x: %1 y: %2").arg(point.x()).arg(point.y()));
-            //![6]

examples/presenterchart/chartview.h 0 -1

             public slots:
                 void handleTimeout();
-                void handlePointClicked(const QPointF& point);
             private:
                 QTimer m_timer;

examples/presenterchart/main.cpp +1 -1

                 chart->axisY()->setNiceNumbersEnabled(true);
                 ChartView chartView(chart,&window);
                 chartView.setRenderHint(QPainter::Antialiasing);
-                chart->setAnimationOptions(QChart::AllAnimations);
+                chart->setAnimationOptions(QChart::SeriesAnimations);
                 window.setCentralWidget(&chartView);
                 window.resize(400, 300);
                 window.show();

examples/scatterchart/main.cpp +3 -45

@@ -20,8 +20,7
20		20
21	#include <QtGui/QApplication>	21	#include <QtGui/QApplication>
22	#include <QMainWindow>	22	#include <QMainWindow>
23	#include ~~<QChartView>~~	23	#include "chartview.h"
24	#include <QScatterSeries>
25		24
26	QTCOMMERCIALCHART_USE_NAMESPACE	25	QTCOMMERCIALCHART_USE_NAMESPACE
27		26
@@ -29,54 +28,13 int main(int argc, char *argv[])
29	{	28	{
30	QApplication a(argc, argv);	29	QApplication a(argc, argv);
31		30
32	//![1]
33	QPen pen(Qt::black);
34	pen.setWidth(2);
35	QBrush blue(Qt::blue);
36	QBrush red(Qt::red);
37
38	QScatterSeries *series0 = new QScatterSeries();
39	series0->setPen(pen);
40	series0->setBrush(blue);
41	series0->setShape(QScatterSeries::MarkerShapeCircle);
42	series0->setSize(15.0);
43
44	QScatterSeries *series1 = new QScatterSeries();
45	series1->setPen(pen);
46	series1->setBrush(red);
47	series1->setShape(QScatterSeries::MarkerShapeCircle);
48	series1->setSize(15.0);
49	//![1]
50
51	//![2]
52	series0->append(0, 6);
53	series0->append(2, 4);
54	series0->append(3, 8);
55	series0->append(7, 4);
56	series0->append(10, 5);
57
58	*series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2);
59	//![2]
60
61	//![3]
62	QChart* chart = new QChart();
63
64	chart->addSeries(series0);
65	chart->addSeries(series1);
66	chart->setTitle("Simple scatterchart example");
67	//![3]
68
69	//![4]
70	QChartView* chartView = new QChartView(chart);
71	chartView->setRenderHint(QPainter::Antialiasing);
72	//![4]	31	//![4]
73		32	ChartView* chartView = new ChartView();
74	//![5]
75	QMainWindow window;	33	QMainWindow window;
76	window.setCentralWidget(chartView);	34	window.setCentralWidget(chartView);
77	window.resize(400, 300);	35	window.resize(400, 300);
78	window.show();	36	window.show();
79	//![5]	37	//![4]
80		38
81	return a.exec();	39	return a.exec();
82	}	40	}

examples/scatterchart/scatterchart.pro +5 -1

@@ -2,4 +2,8
2	error( "Couldn't find the examples.pri file!" )	2	error( "Couldn't find the examples.pri file!" )
3	}	3	}
4	TARGET = scatterchart	4	TARGET = scatterchart
5	SOURCES += main.cpp	5	SOURCES += main.cpp \
		6	chartview.cpp
		7
		8	HEADERS += \
		9	chartview.h

	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