HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r471:b6db000cfc58

Update scatter example and docs

Michal Klocek -

r471:b6db000cfc58

parent child

Context file:

r471:b6db000cfc58

Collapse all files

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

NO CONTENT: new file 100644, binary diff hidden

doc/src/example-scatterchart.qdoc created 644 +26 0

@@ -0,0 +1,26
	1	/*!
	2	\example example/scatterchart
	3	\title ScatterChart Example
	4	\subtitle
	5
	6	The example shows how to create simple scatter chart.
	7
	8	\image scatterchart.png
	9
	10	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.
	11
	12	\snippet ../example/scatterchart/main.cpp 1
	13
	14	We add data to be shown. We can use add() member function or use stream operator.
	15
	16	\snippet ../example/scatterchart/main.cpp 2
	17
	18	In the end we create QChartView instance, set title, set anti-aliasing and add scatter series.
	19
	20	\snippet ../example/scatterchart/main.cpp 3
	21
	22	Chart is ready to be shown.
	23
	24	\snippet ../example/scatterchart/main.cpp 4
	25
	26	*/ No newline at end of file

doc/src/examples.qdoc +1 0

             /*!
                 \page examples.html
                 \title Examples
                 \keyword Examples
                 \raw HTML
                     <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
                     <tr>
                     <th class="titleheader" width="33%">
                     List of examples
                     </th>
                     </tr>
                     <tr>
                     <td valign="top">
                     <ul>
                         <li><a href="example-areachart.html">Area Chart example</a></li>
                         <li><a href="example-barchart.html">Bar Chart example</a></li>
                         <li><a href="example-stackedbarchart.html">Stacked Bar Chart example</a></li>
                         <li><a href="example-percentbarchart.html">Percent Bar Chart example</a></li>
+                        <li><a href="example-scatterchart.html">Scatter Chart example</a></li>
                         <li><a href="example-stackedbarchartdrilldown.html">Stacked Bar Chart Drilldown example</a></li>
                         <li><a href="example-linechart.html">Line Chart example</a></li>
                         <li><a href="example-piechart.html">Pie Chart example</a></li>
                         <li><a href="example-gdpbarchart.html">GDP Chart example</a></li>
                         <li><a href="example-splinechart.html">Spline Chart example</a></li>
                     </ul>
                     </td>
                     </tr>
                     </table>
                 \endraw
             */

doc/src/index.qdoc +5 -2

             /*!
                 \page index.html
                 \keyword About
             	\raw HTML
                 <div class="qchart">
                  <img src="images/qt_commercial_logo.png" alt="qtcommercial"/>
                  <p>
                  QCharts is a part of Qt Commercial addons package. It provides a set of easy to use chart
             	 components which are available for Qt Commercial customers. It uses Qt Graphics View
             	 Framework, therefore charts can be easily integrated to modern 2D user interfaces. QCharts can
             	 be used as QWidgets, QGraphicsWidget or QML elements. Users can easily create impressive
             	 graphs by selecting one of the charts themes.
                  </p>
                 <table><tr>
                 <td><a href="example-linechart.html"><img src="images/linechart.png" alt="linechart" /></a></td>
                 <td><a href="example-areachart.html"><img src="images/areachart.png" alt="areachart" /></a></td>
                 </tr>
                 <tr>
+                <td><a href="example-scatterchart.html"><img src="images/scatterchart.png" alt="scatterchart" /></a></td>
                 <td><a href="example-barchart.html"><img src="images/barchart.png" alt="barchart" /></a></td>
-                <td><a href="example-percentbarchart.html"><img src="images/percentbarchart.png" alt="percentbarcchart" /></a></td>
                 </tr>
                 <tr>
                 <td><a href="example-stackedbarchart.html"><img src="images/stackedbarchart.png" alt="stackedbarchart" /></a></td>
-                <td><img src="images/chartview_example.jpg " alt="linechart" /></td>
+                <td><a href="example-percentbarchart.html"><img src="images/percentbarchart.png" alt="percentbarcchart" /></a></td>
                 </tr><tr>
                 <td><img src="images/chartview_example_scatter.jpg " alt="scatterchart" /></td>
                 <td><img src="images/chartview_example_theme.jpg " alt="themechart" /></td>
                 </tr>
                 <tr>
                 <td><img src="images/chartview_example_bar.jpg " alt="barchart" /></td>
                 <td><img src="images/chartview_example_pie.jpg " alt="piechart" /></td>
                 </tr>
+                <tr>
+                 <td><img src="images/chartview_example.jpg " alt="linechart" /></td>
+                </tr>
                 </table>
                  </div>
             	\endraw
             */

example/example.pro +1 -1

             TEMPLATE = subdirs
             SUBDIRS += linechart \
                        zoomlinechart \
                        colorlinechart \
                        barchart \
                        stackedbarchart \
                        percentbarchart \
-                       scatter \
+                       scatterchart \
                        piechart \
                        piechartcustomization \
                        piechartdrilldown \
                        dynamiclinechart \
                        axischart \
                        multichart \
                        gdpbarchart \
                        presenterchart \
                        chartview \
                        scatterinteractions \
                        splinechart \
                        areachart \
                        stackedbarchartdrilldown

example/scatterchart/main.cpp ~~example/scatter/main.cpp~~ renamed +24 -26

@@ -1,51 +1,49
1	#include <QtGui/QApplication>	1	#include <QtGui/QApplication>
2	#include <QMainWindow>	2	#include <QMainWindow>
3	#include <qchartglobal.h>	3	#include <qchartglobal.h>
4	#include <qchartview.h>	4	#include <qchartview.h>
5	#include <qscatterseries.h>	5	#include <qscatterseries.h>
6		6
7	QTCOMMERCIALCHART_USE_NAMESPACE	7	QTCOMMERCIALCHART_USE_NAMESPACE
8		8
9	int main(int argc, char *argv[])	9	int main(int argc, char *argv[])
10	{	10	{
11	QApplication a(argc, argv);	11	QApplication a(argc, argv);
12		12
13	//! [1]	13	//! [1]
14	// Create chart view
15	QChartView *chartView = new QChartView();
16	chartView->setRenderHint(QPainter::Antialiasing);
17	// Add scatter series with linear test data with random "noise"
18	QScatterSeries *scatter = new QScatterSeries();	14	QScatterSeries *scatter = new QScatterSeries();
		15
		16	QBrush brush(Qt::red);
		17	QPen pen(Qt::black);
		18	pen.setWidth(2);
		19
		20	scatter->setPen(pen);
		21	scatter->setBrush(brush);
		22	scatter->setShape(QScatterSeries::MarkerShapeCircle);
		23	scatter->setSize(15.0);
		24	//! [1]
		25
		26	//! [2]
19	for (qreal i(0.0); i < 20; i += 0.5) {	27	for (qreal i(0.0); i < 20; i += 0.5) {
20	qreal x = i + (qreal)(rand() % 100) / 100.0;	28	qreal x = i + (qreal) (rand() % 100) / 100.0;
21	qreal y = i + (qreal)(rand() % 100) / 100.0;	29	qreal y = i + (qreal) (rand() % 100) / 100.0;
22	(*scatter) << ~~QPointF~~(x, y);	30	scatter->add(x, y);
23	}	31	}
24	// Chart takes ownership	32	*scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
25	chartView->addSeries(scatter);
26	//! [1]
27
28	// And more
29	//! [2]
30	// *scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
31	//! [2]	33	//! [2]
32		34
33	//! [3]	35	//! [3]
34	QBrush brush(Qt::red);	36	QMainWindow window;
35	scatter->setBrush(brush);	37	QChartView *chartView = new QChartView(&window);
36	QPen pen(Qt::black);	38	chartView->setRenderHint(QPainter::Antialiasing);
37	pen.setWidth(3);	39	chartView->setChartTitle("Basic scatter chart example");
38	scatter->setPen(pen);	40	chartView->addSeries(scatter);
39	scatter->setShape(QScatterSeries::MarkerShapeCircle);
40	scatter->setSize(25.0);
41	//! [3]	41	//! [3]
42		42
43	// Use the chart widget as the central widget	43	//! [4]
44	QMainWindow w;	44	window.setCentralWidget(chartView);
45	w.resize(400, 300);	45	window.resize(400, 300);
46	w.setCentralWidget(chartView);	46	window.show();
47	// w.setWindowFlags(Qt::FramelessWindowHint);	47	//! [4]
48	w.show();
49
50	return a.exec();	48	return a.exec();
51	}	49	}

example/scatterchart/scatterchart.pro ~~example/scatter/scatter.pro~~ renamed +1 -1

             !include( ../example.pri ) {
                 error( "Couldn't find the example.pri file!" )
             }
-            TARGET = scatter
+            TARGET = scatterchart
             SOURCES += main.cpp

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