HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1510:1d95213abff9

Few docs changes based on the findings list

Marek Rosa -

r1510:1d95213abff9

parent child

Context file:

r1510:1d95213abff9

Collapse all files

doc/src/classes.qdoc 0 -13

             /*!
                 \page classes.html
                 \title QtCommercial Charts API
                 \keyword All Classes
                 Charts API is build on top of Qt Graphics View Framework. Charts can be displayed as QGraphicsWidget using QChart class. However
                 there is also convenience class QChartView which is QWidget based. These lets quickly use QCharts as normal Qt widget.
-                The API supports following chart types:
-                 \list
-                 \o line
-                 \o area
-                 \o scatter
-                 \o spline
-                 \o pie
-                 \o grouped bar
-                 \o percent bar
-                 \o stacked bar
-                 \endlist
                 Each chart type is represented by QAbstractSeries derived class. To create given chart type users have to use instance of related series class and add it to QChart instance.
                 \code
                 QLineSeries* series = new QLineSeries();
                 series->add(0, 6);
                 series->add(2, 4);
                 ...
                 chartView->chart()->addSeries(series);
                 \endcode
                 \raw HTML
                     <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%">
                                 Common and global
                             </th>
                             <th class="titleheader" width="25%">
                                 XY chart
                             </th>
                         </tr>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qchart.html">QChart</a></li>
                                 <li><a href="qaxis.html">QAxis</a></li>
                                 <li><a href="qaxiscategories.html">QAxisCategories</a></li>
                                 <li><a href="qchartview.html">QChartView</a></li>
                                 <li><a href="qlegend.html">QLegend</a></li>
                                 <li><a href="qabstractseries.html">QAbstractSeries</a></li>
                                 <li><a href="qchartglobal.html">QChartGlobal</a></li>
                                 </ul>
                             </td>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qxyseries.html">QXYSeries</a></li>
                                 <li><a href="qlineseries.html">QLineSeries</a></li>
                                 <li><a href="qareaseries.html">QAreaSeries</a></li>
                                 <li><a href="qscatterseries.html">QScatterSeries</a></li>
                                 <li><a href="qsplineseries.html">QSplineSeries</a></li>
                                 <li><a href="qhxymodelmapper.html">QHXYModelMapper</a></li>
                                 <li><a href="qvxymodelmapper.html">QVXYModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%">
                                 Pie chart
                             </th>
                             <th class="titleheader" width="25%">
                                 Bar chart
                             </th>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qpieseries.html">QPieSeries</a></li>
                                 <li><a href="qpieslice.html">QPieSlice</a></li>
                                 <li><a href="qhpiemodelmapper.html">QHPieModelMapper</a></li>
                                 <li><a href="qvpiemodelmapper.html">QVPieModelMapper</a></li>
                                 </ul>
                             </td>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qbarseries.html">QBarSeries</a></li>
                                 <li><a href="qbarset.html">QBarSet</a></li>
                                 <li><a href="qgroupedbarseries.html">QGroupedBarSeries</a></li>
                                 <li><a href="qpercentbarseries.html">QPercentBarSeries</a></li>
                                 <li><a href="qstackedbarseries.html">QStackedBarSeries</a></li>
                                 <li><a href="qhbarmodelmapper.html">QHBarModelMapper</a></li>
                                 <li><a href="qvbarmodelmapper.html">QVBarModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                 \endraw
             */

doc/src/gettingstarted.qdoc +5 -14

             /*!
                 \page gettingstarted.html
                 \title QtCommercial Charts getting started
                 \keyword Introduction
-                You can obtain the QtCommercial Charts package from \l {http://www.digia.com/en/Qt/Log-in-Customer-Portal/} {Customer portal}.
                 Compiling:
                 \code
                 qmake CONFIG+=release
                 make
                 make install
                 \endcode
                 Depending on the OS and the compiler you are using "make" might need to be replaced with another command like: nmake, mingw32-make, etc.
+                To uninstall the QtCommercialCharts run:
+                \code
+                make uninstall
+                \endcode
                 On Windows platforms both debug and release configurations are built by default at the same time.
                 To build both at the same time on other platforms invoke the following command:
                 \code
                 make all
                 \endcode
                 Compiling as a static library (lib only):
                 \code
                 qmake CONFIG+=staticlib
                 make
                 make install
                 \endcode
                 \bold {New project}
                 Create a new project in a usual way and then add to your project's *.pro file following line:
                 \code
                 CONFIG += qtcommercialchart
                 \endcode
-                Or if you have not installed charts after building:
-                \code
-                CHARTSLIB = QtCommercialChart
-                CONFIG(debug, debug|release) {
-                    mac: CHARTSLIB = $$join(CHARTSLIB,,,_debug)
-                    win32: CHARTSLIB = $$join(CHARTSLIB,,,d)
-                INCLUDEPATH += <path_to_charts_folder>/include
-                LIBS += -L<path_to_charts_folder>/lib -l$$CHARTSLIB
-                \endcode
                 \bold {Widget project}
                 To use the QCharts classes add QtCommercialChart namespace macro in your header file.
                 \code
                 #include<QWidget>
                 #include<QChartView>
                 QTCOMMERCIALCHART_USE_NAMESPACE
                 class ExampleWidget : public QWidget
                 \endcode
                 \bold {QML project}
                 Add an import line to your *.qml file:
                 \code
                 import QtCommercial.Chart 1.0
                 \endcode
                 \raw HTML
                 \endraw
             */

doc/src/index.qdoc +1 -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
+                 Framework, therefore charts can be easily integrated to modern 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="examples-linechart.html"><img src="images/examples_linechart.png" width="440" alt="linechart" /></a></td>
                         <td><a href="examples-areachart.html"><img src="images/examples_areachart.png" width="440" alt="areachart" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="examples-scatterchart.html"><img src="images/examples_scatterchart.png" width="440" alt="scatterchart" /></a></td>
                         <td><a href="examples-barchart.html"><img src="images/examples_barchart.png" width="440" alt="barchart" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="examples-groupedbarchart.html"><img src="images/examples_groupedbarchart.png" width="440" alt="groupedbarcchart" /></a></td>
                         <td><a href="examples-stackedbarchart.html"><img src="images/examples_stackedbarchart.png" width="440" alt="stackedbarchart" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="examples-percentbarchart.html"><img src="images/examples_percentbarchart.png" width="440" alt="percentbarcchart" /></a></td>
                         <td><a href="examples-splinechart.html"><img src="images/examples_splinechart.png" width="440" alt="linechart" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="examples-customchart.html"><img src="images/examples_customchart.png" width="440" alt="customerchart" /></a></td>
                         <td><a href="examples-piechart.html"><img src="images/examples_piechart.png" width="440" alt="piechart" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-chartthemes.html"><img src="images/demo_chartthemes_blue_cerulean.png" width=440 alt="charttheme" /></a></td>
                         <td><a href="examples-zoomlinechart.html"><img src="images/examples_zoomlinechart2.png" width="440" alt="zoomlinechart" /></a></td>
                     </tr>
                 </table>
                 </div>
             	\endraw
             */

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