HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1618:fab18ef35094

doc/images/demos_qmlchart6.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/images/demos_qmlchart7.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/images/demos_qmlchart8.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/images/examples_barchart.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/src/classes.qdoc 0 -1

                                 <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>

doc/src/examples-barchart.qdoc +16 -13

                 \title BarChart Example
                 \subtitle
-                The example shows how to create simple bar chart. Barchart shows the data in sets as separate bars, which are drawn at the x-axis to the position defined by data.
+                The example shows how to create a bar chart. BarChart shows the data in sets as separate bars, which are  in categories.
                 \image examples_barchart.png
-                Data that barchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
+                Data that barchart visualizes, is defined by QBarSet instances. Here we create the sets and append data
-                we want to visualize to them. Note that x positions are not in even intervals and this will be reflected in the chart.
+                to them.
-            	If x positions aren't defined, then the index of value is assumed to be x position.
                 \snippet ../examples/barchart/main.cpp 1
-                To combine the sets to a chart, we need to create QBarSeries instance. Then we append our barsets to the series.
+                We create the series and append the sets to it. The barseries groups the data from sets to categories.
+            	First value of each set are gropuped together at first category second value to second category and so on.
                 \snippet ../examples/barchart/main.cpp 2
-                Next we create a chart and add the series to it.
-            	We also set the title for chart
-                \snippet ../examples/barchart/main.cpp 3
+                Then we create a chart and add the series to it.
-                We want to have the legend displayed at the bottom of the chart. Also we turn on the nice numbers algorithm on for y-axis.
+                \snippet ../examples/barchart/main.cpp 3
+            	We define the categories here and add them to QCategoriesAxis which we then set to be the x-axis of the chart.
                 \snippet ../examples/barchart/main.cpp 4
-                Finally we add the chart onto a view.
+                And we also want to show the legend.
                 \snippet ../examples/barchart/main.cpp 5
+                Finally we add the chart onto a view.
+                \snippet ../examples/barchart/main.cpp 6
                 And it is ready to be shown in a window.
-                \snippet ../examples/percentbarchart/main.cpp 6
+                \snippet ../examples/barchart/main.cpp 7
             */

doc/src/examples-barmodelmapper.qdoc +1 -1

                  \snippet ../examples/barmodelmapper/tablewidget.cpp 3
-                 First line of the code below creates new grouped bar series. Variables firstRow and rowCount are used to define a custom model mapping.
+                 First line of the code below creates new bar series. Variables firstRow and rowCount are used to define a custom model mapping.
                  Custom mapping allows to take only part of the data from the model. In this case data from 5 rows starting with the row with the index 3.
                  Following three lines create an instance of QVBarModelMapper class and specifie that data for the bar sets should be taken from the model's columns with indexes from 1 to 4(inclusive).
                  To create a connection between the series and the model we set both of those objects to QVBarModelMapper.

doc/src/examples.qdoc 0 -1

                         <li><a href="examples-areachart.html">Area chart</a></li>
                         <li><a href="examples-barchart.html">Bar chart</a></li>
                         <li><a href="examples-customchart.html">Custom chart</a></li>
-                        <li><a href="examples-groupedbarchart.html">Grouped bar chart</a></li>
                         <li><a href="examples-legend.html">Legend</a></li>
                         <li><a href="examples-linechart.html">Line chart</a></li>
                         <li><a href="examples-modeldata.html">Model data</a></li>

doc/src/index.qdoc +3 -4

                         <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>
+                        <td><a href="examples-percentbarchart.html"><img src="images/examples_percentbarchart.png" width="440" alt="percentbarcchart" /></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>
+                        <td><a href="examples-customchart.html"><img src="images/examples_customchart.png" width="440" alt="customerchart" /></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>
+                        <td><a href="demos-chartthemes.html"><img src="images/demo_chartthemes_blue_cerulean.png" width=440 alt="charttheme" /></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>

doc/src/qml.qdoc 0 -1

                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-barseries.html">BarSeries</a></li>
-                                <li><a href="qml-groupedbarseries.html">GroupedBarSeries</a></li>
                                 <li><a href="qml-stackedbarseries.html">StackedBarSeries</a></li>
                                 <li><a href="qml-percentbarseries.html">PercentBarSeries</a></li>
                                 <li><a href="qml-barset.html">BarSet</a></li>

src/axis/qabstractaxis.cpp +1 0

                 The type of the series object.
+                \value AxisTypeNoAxis
                 \value AxisTypeValues
                 \value AxisTypeCategories
             */

src/barchart/qbarseries.cpp +4 -4

                 as groups, where bars in same category are grouped next to each other. QBarSeries groups the data
                 from sets to categories, which are defined by a QStringList.
-                See the \l {GroupedbarChart Example} {grouped bar chart example} to learn how to create a grouped bar chart.
+                See the \l {BarChart Example} {bar chart example} to learn how to create a grouped bar chart.
-                \image examples_groupedbarchart.png
+                \image examples_barchart.png
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries
             */
                 \inherits AbstractBarSeries
                 The following QML shows how to create a simple grouped bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
+                \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
                 \beginfloatleft
-                \image demos_qmlchart7.png
+                \image demos_qmlchart6.png
                 \endfloat
                 \clearfloat
             */

src/barchart/qpercentbarseries.cpp +2 -2

                 \inherits QAbstractBarSeries
                 The following QML shows how to create a simple percent bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View9.qml 1
+                \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
                 \beginfloatleft
-                \image demos_qmlchart9.png
+                \image demos_qmlchart8.png
                 \endfloat
                 \clearfloat
             */

src/barchart/qstackedbarseries.cpp +2 -2

                 \inherits AbstractBarSeries
                 The following QML shows how to create a simple stacked bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
+                \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
                 \beginfloatleft
-                \image demos_qmlchart8.png
+                \image demos_qmlchart7.png
                 \endfloat
                 \clearfloat
             */

doc/images/demos_qmlchart9.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

doc/images/examples_groupedbarchart.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

doc/src/examples-groupedbarchart.qdoc removed 0 -39

NO CONTENT: file was removed

	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