HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r482:e8dd9abb1675

Adds chartPresenter example to docs

Michal Klocek -

r482:e8dd9abb1675

parent child

Context file:

r482:e8dd9abb1675

Collapse all files

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

NO CONTENT: new file 100644, binary diff hidden

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

NO CONTENT: new file 100644, binary diff hidden

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

NO CONTENT: new file 100644, binary diff hidden

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

NO CONTENT: new file 100644, binary diff hidden

doc/src/example-presenterchart.qdoc created 644 +37 0

@@ -0,0 +1,37
	1	/*!
	2	\example example/presenterchart
	3	\title PresenterChart Example
	4	\subtitle
	5
	6	The example shows how to create chart which presents the same set of data as line, scatter and spline charts.
	7	ChartPresenter will switch between these three chart types every few seconds.
	8	Please note this example does not use common data model. A use of common data model is documented here.[TODO]
	9
	10	\image presenterchart1.png
	11	\image presenterchart2.png
	12	\image presenterchart3.png
	13
	14	We create simple ChartView class which derives form QChartView.
	15
	16	\snippet ../example/presenterchart/chartview.h 1
	17
	18	Class will implement \c handleTimeout() slot which we are going to use to trigger switching between different chart presentations.
	19	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
	20	using QLineSeries , as scatter chart using QScatterSeries, and as a spline chart using QSplineSeries. We create needed instances in constructor of ChartView class.
	21	We set custom line and points colors.
	22
	23	\snippet ../example/presenterchart/chartview.cpp 1
	24
	25	We add data to all three series. We can use add() member function. If data set is large,it is wiser to use shared data model, as described here.[TODO]
	26
	27	\snippet ../example/presenterchart/chartview.cpp 2
	28
	29	In the end we store references all the created series and matching titles.
	30
	31	\snippet ../example/presenterchart/chartview.cpp 3
	32
	33	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.
	34
	35	\snippet ../example/presenterchart/chartview.cpp 4
	36
	37	*/ No newline at end of file

doc/qchart-html.qdocconf +1 0

             # Define the location of the templates to use. Style sheets and scripts are
             # specified relative to the template directory and will be copied into
             # subdirectories of the output directory.
             HTML.templatedir = .
             HTML.stylesheets = style/offline.css
             HTML.scripts     =
             # Files not referenced in any qdoc file, many needed by style sheets.
             # These also need to be listed in qhp.Qt.extraFiles with the correct
             # directory prefixes.
             extraimages.HTML        = qt_commercial_logo.png \
                                       digia_logo.png \
                                       qcharts.png \
                                       arrow_down.png \
                                       breadcrumb.png \
                                       bullet_gt.png \
                                       bullet_dn.png \
                                       bullet_sq.png \
                                       bullet_up.png \
                                       horBar.png \
+                                      presenterchart_example.png \
                                       bg.png
             # Include the style sheets and scripts used.
             HTML.headerstyles = \
                 "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
             HTML.headerscripts =
             HTML.endheader = \
                 "</head>\n" \
                 "<body>\n"
             HTML.nobreadcrumbs = true

doc/src/examples.qdoc +5 -4

             /*!
                 \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-percentbarchart.html">Percent Bar Chart example</a></li>
                         <li><a href="example-piechart.html">Pie Chart example</a></li>
+                        <li><a href="example-presenterchart.html">Presenter Chart example</a></li>
+                        <li><a href="example-scatterchart.html">Scatter Chart example</a></li>
                         <li><a href="example-splinechart.html">Spline Chart example</a></li>
+                        <li><a href="example-stackedbarchart.html">Stacked Bar Chart example</a></li>
+                        <li><a href="example-stackedbarchartdrilldown.html">Stacked Bar Chart Drilldown example</a></li>
                     </ul>
                     </td>
                     </tr>
                     </table>
                 \endraw
             */

doc/src/index.qdoc +2 -1

             /*!
                 \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>
                 </tr>
                 <tr>
                 <td><a href="example-stackedbarchart.html"><img src="images/stackedbarchart.png" alt="stackedbarchart" /></a></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>
+                <td><img src="images/chartview_example.jpg " alt="linechart" /></td>
+                <td><a href="example-presenterchart.html"><img src="images/presenterchart_example.png" alt="presenterchart" /></a></td>
                 </tr>
                 </table>
                  </div>
             	\endraw
             */

example/presenterchart/chartview.cpp +12 -5

             #include "chartview.h"
             #include <qlineseries.h>
             #include <qscatterseries.h>
             #include <qsplineseries.h>
             #include <QTime>
             ChartView::ChartView(QWidget* parent):QChartView(parent),
             m_index(0)
             {
+                QTime now = QTime::currentTime();
+                qsrand((uint)now.msec());
                 setChartTitle("Three random line charts");
                 QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(handleTimeout()));
                 m_timer.setInterval(3000);
-                QTime now = QTime::currentTime();
+            //![1]
-                qsrand((uint)now.msec());
                 QLineSeries* series0 = new QLineSeries(this);
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
                 QScatterSeries* series1 = new QScatterSeries(this);
                 QPen red(Qt::red);
                 red.setWidth(3);
                 series1->setPen(red);
                 series1->setBrush(Qt::white);
                 QSplineSeries* series2 = new QSplineSeries(this);
                 QPen green(Qt::green);
                 green.setWidth(3);
                 series2->setPen(green);
+            //![1]
+            //![2]
                 int numPoints = 10;
                 for (int x = 0; x <= numPoints; ++x) {
                     qreal y = qrand() % 100;
                     series0->add(x,y);
                     series1->add(x,y);
                     series2->add(x,y);
                 }
+            //![2]
+            //![3]
                 m_series<<series0;
                 m_titles<<chartTitle()+": LineChart";
                 m_series<<series1;
                 m_titles<<chartTitle()+": ScatterChart";
                 m_series<<series2;
                 m_titles<<chartTitle()+": SplineChart";
+            //![3]
                 addSeries(series0);
                 setChartTitle(m_titles.at(0));
                 m_timer.start();
             }
             ChartView::~ChartView()
             {
                 if(m_series.size()==0) return;
                 removeSeries(m_series.at(m_index));
                 qDeleteAll(m_series);
             }
+            //![4]
             void ChartView::handleTimeout()
             {
                 if(m_series.size()==0) return;
                 removeSeries(m_series.at(m_index));
                 m_index++;
                 m_index=m_index%m_series.size();
                 addSeries(m_series.at(m_index));
                 setChartTitle(m_titles.at(m_index));
             }
+            //![4]

example/presenterchart/chartview.h +2 0

             #ifndef CHARTVIEW_H_
             #define CHARTVIEW_H_
             #include <qchartview.h>
             #include <QTimer>
             QTCOMMERCIALCHART_USE_NAMESPACE
+            //![1]
             class ChartView: public QChartView
             {
                 Q_OBJECT
             public:
                 ChartView(QWidget* parent=0);
                 virtual ~ChartView();
             public slots:
                 void handleTimeout();
             private:
                 QTimer m_timer;
                 QList<QSeries*> m_series;
                 QStringList m_titles;
                 int m_index;
             };
+            //![1]
             #endif /* CHARTVIEW_H_ */

example/presenterchart/presenterchart.pro +1 -1

             !include( ../example.pri ) {
              error( "Couldn't find the example.pri file!" )
             }
-            TARGET = presenterChart
+            TARGET = presenterchart
             HEADERS += chartview.h
             SOURCES += main.cpp chartview.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