HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1208:2943560d5819

Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.

sauimone -

r1208:2943560d5819

parent child

Context file:

r1208:2943560d5819

Collapse all files

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

NO CONTENT: new file 100644, binary diff hidden

doc/src/examples-groupedbarchart.qdoc created 644 +40 0

@@ -0,0 +1,40
	1	/*!
	2	\example examples/groupedbarchart
	3	\title GroupedBarChart Example
	4	\subtitle
	5
	6	The example shows how to create simple bar chart. GroupedBarChart shows the data in sets as separate bars, which are grouped in categories.
	7
	8	\image examples_groupedbarchart.png
	9
	10	First we define categories.
	11
	12	\snippet ../examples/groupedbarchart/main.cpp 1
	13
	14	Data that groupedbarchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
	15	we want to visualize to them.
	16
	17	\snippet ../examples/groupedbarchart/main.cpp 2
	18
	19	To combine the sets and categories to a chart, we need to create QBarSeries instance. When creating
	20	the QBarSeries, the categories must be known. Sets can be added later. For example purposes the sets
	21	are added to series here.
	22
	23	\snippet ../examples/groupedbarchart/main.cpp 3
	24
	25	Then we create a chart and add the series to it.
	26
	27	\snippet ../examples/groupedbarchart/main.cpp 4
	28
	29	And we also want to show the legend, so that the data is easier to read.
	30
	31	\snippet ../examples/groupedbarchart/main.cpp 5
	32
	33	Finally we add the chart onto a view.
	34
	35	\snippet ../examples/groupedbarchart/main.cpp 6
	36
	37	And it is ready to be shown in a window.
	38
	39	\snippet ../examples/groupedbarchart/main.cpp 7
	40	*/

doc/images/examples_barchart.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/src/examples-barchart.qdoc +8 -14

             /*!
                 \example examples/barchart
                 \title BarChart Example
                 \subtitle
-                The example shows how to create simple bar chart. Barchart shows the data in sets as separate bars, which are grouped in categories.
+                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.
                 \image examples_barchart.png
-                First we define categories.
+                Data that barchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
+                we want to visualize to them. Note that first and third QPointF in each set have smaller intervals at their x coordinates. This will be reflected in the chart.
                 \snippet ../examples/barchart/main.cpp 1
-                Data that barchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
+                To combine the sets to a chart, we need to create QBarSeries instance. Then we append our barsets to the series.
-                we want to visualize to them.
                 \snippet ../examples/barchart/main.cpp 2
-                To combine the sets and categories to a chart, we need to create QBarSeries instance. When creating
+                Next we create a chart and add the series to it.
-            	the QBarSeries, the categories must be known. Sets can be added later. For example purposes the sets
-            	are added to series here.
                 \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 4
-                And we also want to show the legend, so that the data is easier to read.
-                \snippet ../examples/barchart/main.cpp 5
                 Finally we add the chart onto a view.
-                \snippet ../examples/barchart/main.cpp 6
+                \snippet ../examples/barchart/main.cpp 5
                 And it is ready to be shown in a window.
-                \snippet ../examples/percentbarchart/main.cpp 7
+                \snippet ../examples/percentbarchart/main.cpp 6
             */

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="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-linechart.html">Line chart</a></li>
                         <li><a href="examples-modeldata.html">Model data</a></li>
                         <li><a href="examples-percentbarchart.html">Percent bar chart</a></li>
                         <li><a href="examples-piechart.html">Pie chart</a></li>
                         <li><a href="examples-piechartdrilldown.html">Pie chart drilldown</a></li>
                         <li><a href="examples-presenterchart.html">Presenter chart</a></li>
                         <li><a href="examples-scatterchart.html">Scatter chart</a></li>
                         <li><a href="examples-scatterinteractions.html">Scatter interactions</a></li>
                         <li><a href="examples-splinechart.html">Spline chart</a></li>
                         <li><a href="examples-stackedbarchart.html">Stacked bar chart</a></li>
                         <li><a href="examples-stackedbarchartdrilldown.html">Stacked bar chart drilldown</a></li>
                         <li><a href="examples-zoomlinechart.html">Zoom line</a></li>
                     </ul>
                     </td>
                     </tr>
                     </table>
                 \endraw
             */

doc/src/index.qdoc +4 -3

             /*!
                 \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="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>
-                        <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-piechart.html"><img src="images/examples_piechart.png" width="440" alt="piechart" /></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-zoomlinechart.html"><img src="images/examples_zoomlinechart2.png" width="440" alt="zoomlinechart" /></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
             */

examples/barchart/main.cpp +10 -17

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <QMainWindow>
             #include <QChartView>
             #include <QBarSeries>
             #include <QBarSet>
             #include <QLegend>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
             //![1]
-                QBarCategories categories;
-                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
-            //![1]
-            //![2]
                 QBarSet *set0 = new QBarSet("Jane");
                 QBarSet *set1 = new QBarSet("John");
                 QBarSet *set2 = new QBarSet("Axel");
                 QBarSet *set3 = new QBarSet("Mary");
                 QBarSet *set4 = new QBarSet("Samantha");
                 *set0 << QPointF(0.0, 1) << QPointF(1.0, 2) << QPointF(2.4, 3) << QPointF(3.0, 4) << QPointF(4.0, 5) << QPointF(5.0, 6);
                 *set1 << QPointF(0.1, 2) << QPointF(1.2, 3) << QPointF(2.45, 4) << QPointF(3.2, 5) << QPointF(4.2, 6) << QPointF(5.2, 7);
                 *set2 << QPointF(0.2, 3) << QPointF(1.4, 4) << QPointF(2.50, 5) << QPointF(3.4, 6) << QPointF(4.4, 7) << QPointF(5.4, 8);
                 *set3 << QPointF(0.3, 4) << QPointF(1.6, 5) << QPointF(2.55, 6) << QPointF(3.6, 7) << QPointF(4.6, 8) << QPointF(5.6, 9);
                 *set4 << QPointF(0.4, 5) << QPointF(1.8, 6) << QPointF(2.6, 7) << QPointF(3.8, 8) << QPointF(4.8, 9) << QPointF(5.8, 10);
-            //![2]
+            //![1]
-            //![3]
+            //![2]
                 QBarSeries* series = new QBarSeries();
-                series->setCategories(categories);
                 series->append(set0);
                 series->append(set1);
                 series->append(set2);
                 series->append(set3);
                 series->append(set4);
+            //![2]
             //![3]
-            //![4]
                 QChart* chart = new QChart();
                 chart->addSeries(series);
                 chart->setTitle("Simple barchart example");
-            //![4]
+            //![3]
-            //![5]
+            //![4]
                 chart->legend()->setVisible(true);
                 chart->legend()->setAlignment(QLegend::AlignmentBottom);
                 chart->axisY()->setNiceNumbersEnabled(true);
-            //![5]
+            //![4]
-            //![6]
+            //![5]
                 QChartView* chartView = new QChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
-            //![6]
+            //![5]
-            //![7]
+            //![6]
                 QMainWindow window;
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
-            //![7]
+            //![6]
                 return a.exec();
             }

src/barchart/qbarseries.cpp +70 -24

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qbarseries.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include <QAbstractItemModel>
             #include <QModelIndex>
             #include <QBarModelMapper>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSeries
                 \brief part of QtCommercial chart API.
                 \mainclass
-                QBarSeries represents a series of data shown as bars. One QBarSeries can contain multiple
+                QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
-                QBarSet data sets. QBarSeries groups the data from sets to categories, which are defined
+                the position defined by data. Single bar is defined by QPointF, where x value is the x-coordinate of the bar
-                by QStringList.
+                and y-value is the height of the bar. The category names are ignored with this series and x-axis
+                shows the x-values.
                 See the \l {BarChart Example} {bar chart example} to learn how to create a simple bar chart.
                 \image examples_barchart.png
                 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \fn void QBarSeries::clicked(QBarSet *barset, QString category)
                 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset of category \a category
                 contained by the series.
             */
             /*!
                 \fn void QBarSeries::hovered(QBarSet* barset, bool status)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
-                Constructs empty QBarSeries. Parameter \a categories defines the categories for chart.
+                Constructs empty QBarSeries.
                 QBarSeries is QObject which is a child of a \a parent.
             */
-            QBarSeries::QBarSeries(/*QBarCategories categories,*/ QObject *parent) :
+            QBarSeries::QBarSeries(QObject *parent) :
-                QAbstractSeries(*new QBarSeriesPrivate(/*categories,*/ this),parent)
+                QAbstractSeries(*new QBarSeriesPrivate(this),parent)
             {
             }
             /*!
                 Destructs barseries and owned barsets.
             */
             QBarSeries::~QBarSeries()
             {
                 // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 \internal
             */
             QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) :
                 QAbstractSeries(d,parent)
             {
             }
             /*!
                 Returns the type of series. Derived classes override this.
             */
             QAbstractSeries::SeriesType QBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeBar;
             }
+            /*!
+                Sets the \a categories, which are used to to group the data.
+            */
             void QBarSeries::setCategories(QBarCategories categories)
             {
                 Q_D(QBarSeries);
                 d->setCategories(categories);
                 emit d->categoriesUpdated();
             }
             /*!
-                Adds a set of bars to series. Takes ownership of \a set.
+                Adds a set of bars to series. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
+                Returns true, if appending succeeded.
             */
             bool QBarSeries::append(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 if ((d->m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 d->m_barSets.append(set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
                 emit d->restructuredBars();
                 return true;
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
+                Returns true, if set was removed.
             */
             bool QBarSeries::remove(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 if (!d->m_barSets.contains(set)) {
                     // Fail if set is not in list
                     return false;
                 }
                 d->m_barSets.removeOne(set);
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
                 emit d->restructuredBars();
                 return true;
             }
             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
+                Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series,
+                nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
+                and function returns false.
             */
             bool QBarSeries::append(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                 foreach (QBarSet* set, sets) {
                     if ((set == 0) || (d->m_barSets.contains(set))) {
                         // Fail if any of the sets is null or is already appended.
                         return false;
                     }
                     if (sets.count(set) != 1) {
                         // Also fail if same set is more than once in given list.
                         return false;
                     }
                 }
                 foreach (QBarSet* set, sets) {
                     d->m_barSets.append(set);
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
                 }
                 emit d->restructuredBars();
                 return true;
             }
             /*!
                 Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
             */
             bool QBarSeries::remove(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                 bool setsRemoved = false;
                 foreach (QBarSet* set, sets) {
                     if (d->m_barSets.contains(set)) {
                         d->m_barSets.removeOne(set);
                         QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
                         setsRemoved = true;
                     }
                 }
                 if (setsRemoved) {
                     emit d->restructuredBars();
                 }
                 return setsRemoved;
             }
             /*!
                 Returns number of sets in series.
             */
             int QBarSeries::barsetCount() const
             {
                 Q_D(const QBarSeries);
                 return d->m_barSets.count();
             }
             /*!
                 Returns number of categories in series
             */
             int QBarSeries::categoryCount() const
             {
                 Q_D(const QBarSeries);
-                return d->m_categories.count();
+                return d->categoryCount();
             }
             /*!
                 Returns a list of sets in series. Keeps ownership of sets.
              */
             QList<QBarSet*> QBarSeries::barSets() const
             {
                 Q_D(const QBarSeries);
                 return d->m_barSets;
             }
             /*!
                  \fn bool QBarSeries::setModel(QAbstractItemModel *model)
                  Sets the \a model to be used as a data source
              */
             void QBarSeries::setModel(QAbstractItemModel *model)
             {
                 Q_D(QBarSeries);
                 // disconnect signals from old model
                 if(d->m_model)
                 {
                     disconnect(d->m_model, 0, this, 0);
                 }
                 // set new model
                 if(model)
                 {
                     d->m_model = model;
                     // connect the signals
                     connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
                     connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
                     connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
                     connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
                     connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
                     if (d->m_mapper)
                         d->initializeDataFromModel();
                 }
                 else
                 {
                     d->m_model = 0;
                 }
             }
             void QBarSeries::setModelMapper(QBarModelMapper *mapper)
             {
                 Q_D(QBarSeries);
                 // disconnect signals from old mapper
                 if (d->m_mapper) {
                     QObject::disconnect(d->m_mapper, 0, this, 0);
                 }
                 if (mapper) {
                     d->m_mapper = mapper;
                     // connect the signal from the mapper
                     connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializeDataFromModel()));
                     if (d->m_model)
                         d->initializeDataFromModel();
                 } else {
                     d->m_mapper = 0;
                 }
             }
             QBarModelMapper* QBarSeries::modelMapper() const
             {
                 Q_D(const QBarSeries);
                 return d->m_mapper;
             }
             /*!
                 Returns the bar categories of the series.
             */
             QBarCategories QBarSeries::categories() const
             {
                 Q_D(const QBarSeries);
-                return d->m_categories;
+                return d->categories();
             }
             /*!
                 Sets the visibility of labels in series to \a visible
             */
             void QBarSeries::setLabelsVisible(bool visible)
             {
                 foreach (QBarSet* s, barSets()) {
                     s->setLabelsVisible(visible);
                 }
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_barMargin(0.05),  // Default value is 5% of category width
                 m_mapper(0)
-                //    m_categories(categories),
             {
             }
             void QBarSeriesPrivate::setCategories(QBarCategories categories)
             {
                 m_categories = categories;
             }
+            void QBarSeriesPrivate::insertCategory(int index, const QString category)
+            {
+                m_categories.insert(index, category);
+                emit categoriesUpdated();
+            }
+            void QBarSeriesPrivate::removeCategory(int index)
+            {
+                m_categories.removeAt(index);
+                emit categoriesUpdated();
+            }
+            int QBarSeriesPrivate::categoryCount() const
+            {
+                if (m_categories.count() > 0) {
+                    return m_categories.count();
+                }
+                // No categories defined. return count of longest set.
+                int count = 0;
+                for (int i=0; i<m_barSets.count(); i++) {
+                    if (m_barSets.at(i)->count() > count) {
+                        count = m_barSets.at(i)->count();
+                    }
+                }
+                return count;
+            }
+            QBarCategories QBarSeriesPrivate::categories() const
+            {
+                if (m_categories.count() > 0) {
+                    return m_categories;
+                }
+                // No categories defined. retun list of indices.
+                QBarCategories categories;
+                int count = categoryCount();
+                for (int i = 0; i < count; i++) {
+                    categories.append(QString::number(i));
+                }
+                return categories;
+            }
             void QBarSeriesPrivate::setBarMargin(qreal margin)
             {
                 if (margin > 1.0) {
                     margin = 1.0;
                 } else if (margin < 0.0) {
                     margin = 0.0;
                 }
                 m_barMargin = margin;
                 emit updatedBars();
             }
             qreal QBarSeriesPrivate::barMargin()
             {
                 return m_barMargin;
             }
             QBarSet* QBarSeriesPrivate::barsetAt(int index)
             {
                 return m_barSets.at(index);
             }
             QString QBarSeriesPrivate::categoryName(int category)
             {
+                if ((category > 0) && (category < m_categories.count())) {
                     return m_categories.at(category);
                 }
+                return QString::number(category);
+            }
             qreal QBarSeriesPrivate::min()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal min = INT_MAX;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j).y();
                         if (temp < min)
                             min = temp;
                     }
                 }
                 return min;
             }
             qreal QBarSeriesPrivate::max()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal max = INT_MIN;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j).y();
                         if (temp > max)
                             max = temp;
                     }
                 }
                 return max;
             }
             qreal QBarSeriesPrivate::valueAt(int set, int category)
             {
                 if ((set < 0) || (set >= m_barSets.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 return m_barSets.at(set)->at(category).y();
             }
             qreal QBarSeriesPrivate::percentageAt(int set, int category)
             {
                 if ((set < 0) || (set >= m_barSets.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 qreal value = m_barSets.at(set)->at(category).y();
                 qreal sum = categorySum(category);
                 if ( qFuzzyIsNull(sum) ) {
                     return 0;
                 }
                 return value / sum;
             }
             qreal QBarSeriesPrivate::categorySum(int category)
             {
                 qreal sum(0);
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
                         sum += m_barSets.at(set)->at(category).y();
                 }
                 return sum;
             }
             qreal QBarSeriesPrivate::absoluteCategorySum(int category)
             {
                 qreal sum(0);
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
                         sum += qAbs(m_barSets.at(set)->at(category).y());
                 }
                 return sum;
             }
             qreal QBarSeriesPrivate::maxCategorySum()
             {
                 qreal max = INT_MIN;
-                int count = m_categories.count();
+                int count = categoryCount();
                 for (int i = 0; i < count; i++) {
                     qreal sum = categorySum(i);
                     if (sum > max)
                         max = sum;
                 }
                 return max;
             }
             void QBarSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 if (m_model == 0 || m_mapper == 0)
                     return;
                 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                     for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                         if (m_mapper->orientation() == Qt::Vertical)
                         {
                             // model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
                             if ( row >= m_mapper->first() && (m_mapper->count() == - 1 || row < m_mapper->first() + m_mapper->count())) {
                                 if (column >= m_mapper->mapBarBottom() && column <= m_mapper->mapBarTop())
                                     barsetAt(column - m_mapper->mapBarBottom())->replace(row - m_mapper->first(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
                                 //                    if (column == m_mapper->mapCategories());// TODO:
                             }
                         }
                         else
                         {
                             // model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
                             if (column >= m_mapper->first() && (m_mapper->count() == - 1 || column < m_mapper->first() + m_mapper->count())) {
                                 if (row >= m_mapper->mapBarBottom() && row <= m_mapper->mapBarTop())
                                     barsetAt(row - m_mapper->mapBarBottom())->replace(column - m_mapper->first(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
                                 //                    if (row == m_mapper->mapCategories());// TODO:
                             }
                         }
                     }
                 }
             }
             void QBarSeriesPrivate::modelDataAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                 Q_UNUSED(start);
                 Q_UNUSED(end);
                 initializeDataFromModel();
             }
             void QBarSeriesPrivate::modelDataRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                 Q_UNUSED(start);
                 Q_UNUSED(end);
                 initializeDataFromModel();
             }
             void QBarSeriesPrivate::initializeDataFromModel()
             {
                 Q_Q(QBarSeries);
                 // create the initial bars
                 m_categories.clear();
                 m_barSets.clear();
                 if (m_model == 0 || m_mapper == 0)
                     return;
                 // check if mappings are set
                 if (m_mapper->mapBarBottom() == -1 || m_mapper->mapBarTop() == -1 || m_mapper->mapCategories() == -1)
                     return;
                 //    emit restructuredBars();
                 if (m_mapper->orientation() == Qt::Vertical) {
                     if (m_mapCategories >= m_model->columnCount())
                         return;
                     int rowCount = 0;
                     if(m_mapper->count() == -1)
                         rowCount = m_model->rowCount() - m_mapper->first();
                     else
                         rowCount = qMin(m_mapper->count(), m_model->rowCount() - m_mapper->first());
                     for (int k = m_mapper->first(); k < m_mapper->first() + rowCount; k++) {
                         m_categories << m_model->data(m_model->index(k, m_mapper->mapCategories()), Qt::DisplayRole).toString();
                     }
                     int lastAvailableBarSet = qMin(m_model->columnCount() - 1, m_mapper->mapBarTop());
                     for (int i = m_mapper->mapBarBottom(); i <= lastAvailableBarSet; i++) {
             //        for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
                         QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
                         for(int m = m_mapper->first(); m < m_mapper->first() + rowCount; m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
                         q->append(barSet);
                     }
                 } else {
                     if (m_mapCategories >= m_model->rowCount())
                         return;
                     int columnCount = 0;
                     if(m_mapper->count() == -1)
                         columnCount = m_model->columnCount() - m_mapper->first();
                     else
                         columnCount = qMin(m_mapper->count(), m_model->columnCount() - m_mapper->first());
                     for (int k = m_mapper->first(); k < m_mapper->first() + columnCount; k++) {
                         m_categories << m_model->data(m_model->index(m_mapper->mapCategories(), k), Qt::DisplayRole).toString();
                     }
                     int lastAvailableBarSet = qMin(m_model->rowCount() - 1, m_mapper->mapBarTop());
                     for (int i = m_mapper->mapBarBottom(); i <= lastAvailableBarSet; i++) {
             //        for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
                         QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Vertical, Qt::DisplayRole).toString());
                         for(int m = m_mapper->first(); m < m_mapper->first() + columnCount; m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
                         q->append(barSet);
                     }
                 }
                 emit restructuredBars();
                 //    emit updatedBars();
             }
-            void QBarSeriesPrivate::insertCategory(int index, const QString category)
-                m_categories.insert(index, category);
-                emit categoriesUpdated();
-            void QBarSeriesPrivate::removeCategory(int index)
-                m_categories.removeAt(index);
-                emit categoriesUpdated();
             void QBarSeriesPrivate::barsetChanged()
             {
                 emit updatedBars();
             }
             void QBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
-                qreal x = m_categories.count();
+                qreal x = categoryCount();
                 qreal y = max();
                 minX = qMin(minX, x);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, x);
                 maxY = qMax(maxY, y);
                 tickXCount = x+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QBarSeries);
                 BarChartItem* bar = new BarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(bar);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             QList<LegendMarker*> QBarSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QBarSeries);
                 QList<LegendMarker*> markers;
                 foreach(QBarSet* set, q->barSets()) {
                     BarLegendMarker* marker = new BarLegendMarker(q,set,legend);
                     markers << marker;
                 }
                 return markers;
             }
             #include "moc_qbarseries.cpp"
             #include "moc_qbarseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef BARSERIES_H
             #define BARSERIES_H
             #include <qabstractseries.h>
             #include <QStringList>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             typedef QStringList QBarCategories;
             class QBarSet;
             class BarCategory;
             class QBarSeriesPrivate;
             class QBarModelMapper;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
             public:
                 explicit QBarSeries(QObject *parent = 0);
                 virtual ~QBarSeries();
                 QAbstractSeries::SeriesType type() const;
                 void setCategories(QBarCategories categories);
-                bool append(QBarSet *set);            // Takes ownership of set
+                bool append(QBarSet *set);
-                bool remove(QBarSet *set);            // Releases ownership, doesn't delete set
+                bool remove(QBarSet *set);
                 bool append(QList<QBarSet* > sets);
                 bool remove(QList<QBarSet* > sets);
                 int barsetCount() const;
                 int categoryCount() const;
                 QList<QBarSet*> barSets() const;
                 QBarCategories categories() const;
                 void setLabelsVisible(bool visible = true);
                 void setModel(QAbstractItemModel *model);
                 void setModelMapper(QBarModelMapper *mapper);
                 QBarModelMapper* modelMapper() const;
             protected:
                 explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0);
             Q_SIGNALS:
                 void clicked(QBarSet *barset, QString category);
                 void hovered(QBarSet* barset, bool status);
             protected:
                 Q_DECLARE_PRIVATE(QBarSeries)
                 friend class BarChartItem;
                 friend class PercentBarChartItem;
                 friend class StackedBarChartItem;
                 friend class GroupedBarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARSERIES_H

src/barchart/qbarseries_p.h +5 -3

             #ifndef QBARSERIES_P_H
             #define QBARSERIES_P_H
             #include "qbarseries.h"
             #include "qabstractseries_p.h"
             #include <QStringList>
             #include <QAbstractSeries>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarModelMapper;
             // Container for series
             class QBarSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QBarSeriesPrivate(QBarSeries *parent);
                 void setCategories(QBarCategories categories);
+                void insertCategory(int index, const QString category);
+                void removeCategory(int index);
+                int categoryCount() const;
+                QBarCategories categories() const;
                 void setBarMargin(qreal margin);
                 qreal barMargin();
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
-                void insertCategory(int index, const QString category);
-                void removeCategory(int index);
                 QBarSet* barsetAt(int index);
                 QString categoryName(int category);
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal percentageAt(int set, int category);
                 qreal categorySum(int category);
                 qreal absoluteCategorySum(int category);
                 qreal maxCategorySum();
             Q_SIGNALS:
                 void clicked(QBarSet *barset, QString category);
                 void updatedBars();
                 void restructuredBars();
                 void categoriesUpdated();
             private Q_SLOTS:
                 // slots for updating bars when data in model changes
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
                 void modelDataAdded(QModelIndex parent, int start, int end);
                 void modelDataRemoved(QModelIndex parent, int start, int end);
                 void initializeDataFromModel();
                 void barsetChanged();
             protected:
                 QList<QBarSet *> m_barSets;
                 QBarCategories m_categories;
                 qreal m_barMargin;
                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;
                 QBarModelMapper *m_mapper;
             private:
                 Q_DECLARE_PUBLIC(QBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSERIESPRIVATE_P_H

src/barchart/qbarset.cpp +32 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qbarset.h"
             #include "qbarset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSet
                 \brief part of QtCommercial chart API.
                 QBarSet represents one set of bars. Set of bars contains one data value for each category.
                 First value of set is assumed to belong to first category, second to second category and so on.
                 If set has fewer values than there are categories, then the missing values are assumed to be
                 at the end of set. For missing values in middle of a set, numerical value of zero is used.
                 \mainclass
-                \sa QBarSeries, QStackedBarSeries, QPercentBarSeries
+                \sa QBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \fn void QBarSet::clicked(QString category)
                 \brief signals that set has been clicked
                 Parameter \a category describes on which category was clicked
             */
             /*!
                 \fn void QBarSet::hovered(bool status)
                 \brief signals that mouse has hovered over the set. If \a status is true, then mouse was entered. If \a status is false, then mouse was left.
                 The signal is emitted if mouse is hovered on top of set
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 Constructs QBarSet with a name of \a name and with parent of \a parent
             */
             QBarSet::QBarSet(const QString name, QObject *parent)
                 : QObject(parent)
                 ,d_ptr(new QBarSetPrivate(name,this))
             {
             }
             /*!
                 Destroys the barset
             */
             QBarSet::~QBarSet()
             {
                 // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 Sets new \a name for set.
             */
             void QBarSet::setName(const QString name)
             {
                 d_ptr->m_name = name;
             }
             /*!
                 Returns name of the set.
             */
             QString QBarSet::name() const
             {
                 return d_ptr->m_name;
             }
+            /*!
+                Appends a point to set. Parameter \a value x coordinate defines the
+                position in x-axis and y coordinate defines the height of bar.
+                Depending on presentation (QBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries)
+                the x values are used or ignored.
+            */
             void QBarSet::append(const QPointF value)
             {
                 d_ptr->m_values.append(value);
                 emit d_ptr->restructuredBars();
             }
+            /*!
+                Appends a list of \a points to set. Works like append with single point.
+                \sa append()
+            */
             void QBarSet::append(const QList<QPointF> values)
             {
                 for (int i=0; i<values.count(); i++) {
                     d_ptr->m_values.append(values.at(i));
                 }
                 emit d_ptr->restructuredBars();
             }
             /*!
-                Appends new value \a value to the end of set.
+                Appends new value \a value to the end of set. Internally the value is converted to QPointF,
+                with x coordinate being the index of appended value and y coordinate is the value.
             */
             void QBarSet::append(const qreal value)
             {
                 append(QPointF(d_ptr->m_values.count(), value));
-            //    d_ptr->m_values.append(value);
             }
+            /*!
+                Appends a list of reals to set. Works like append with single real value. The values in list
+                are converted to QPointF, where x coordinate is the index of point and y coordinate is the value.
+                \sa append()
+            */
             void QBarSet::append(const QList<qreal> values)
             {
                 int index = d_ptr->m_values.count();
                 for (int i=0; i<values.count(); i++) {
                     d_ptr->m_values.append(QPointF(index,values.at(i)));
                     index++;
                 }
                 emit d_ptr->restructuredBars();
             }
             /*!
-                Appends new value \a value to the end of set.
+                Convinience operator. Same as append, with real \a value.
+                \sa append()
             */
             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 append(value);
                 return *this;
             }
+            /*!
+                Convinience operator. Same as append, with QPointF \a value.
+                \sa append()
+            */
             QBarSet& QBarSet::operator << (const QPointF &value)
             {
                 append(value);
                 return *this;
             }
             /*!
                 Inserts new \a value on the \a index position.
                 The value that is currently at this postion is moved to postion index + 1
                 \sa remove()
             */
             void QBarSet::insert(const int index, const qreal value)
             {
                 d_ptr->m_values.insert(index, QPointF(index, value));
             //    emit d_ptr->updatedBars();
             }
             /*!
                 Removes the value specified by \a index
                 \sa insert()
             */
             void QBarSet::remove(const int index)
             {
                 d_ptr->m_values.removeAt(index);
             //    emit d_ptr->updatedBars();
             }
             /*!
                 Sets a new value \a value to set, indexed by \a index
             */
             void QBarSet::replace(const int index, const qreal value)
             {
                 d_ptr->m_values.replace(index,QPointF(index,value));
                 emit d_ptr->updatedBars();
             }
             /*!
-                Returns value of set indexed by \a index. Note that all appended values are stored internally as QPointF
+                Returns value of set indexed by \a index. Note that all appended values are stored internally as QPointF.
+                The returned QPointF has x coordinate, which is index (if appended with qreal append) or the x value
+                of the QPointF (if appended with QPointF append).
+                If the index is out of bounds QPointF(0, 0.0) is returned.
             */
             QPointF QBarSet::at(const int index) const
             {
                 if (index < 0 || index >= d_ptr->m_values.count()) {
                     return QPointF(index, 0.0);
                 }
                 return d_ptr->m_values.at(index);
             }
             /*!
-                Returns value of set indexed by \a index
+                Returns value of set indexed by \a index. ote that all appended values are stored internally as QPointF.
+                The returned QPointF has x coordinate, which is index (if appended with qreal append) or the x value
+                of the QPointF (if appended with QPointF append).
             */
             QPointF QBarSet::operator [](const int index) const
             {
                 return d_ptr->m_values.at(index);
             }
             /*!
                 Returns count of values in set.
             */
             int QBarSet::count() const
             {
                 return d_ptr->m_values.count();
             }
             /*!
-                Returns sum of all values in barset.
+                Returns sum of all values in barset. The sum is sum of y coordinates in the QPointF representation.
             */
             qreal QBarSet::sum() const
             {
                 qreal total(0);
                 for (int i=0; i < d_ptr->m_values.count(); i++) {
                     //total += d_ptr->m_values.at(i);
                     total += d_ptr->m_values.at(i).y();
                 }
                 return total;
             }
             /*!
                 Sets pen for set. Bars of this set are drawn using \a pen
             */
             void QBarSet::setPen(const QPen &pen)
             {
                   if(d_ptr->m_pen!=pen){
                       d_ptr->m_pen = pen;
                       emit d_ptr->updatedBars();
                   }
             }
             /*!
                 Returns pen of the set.
             */
             QPen QBarSet::pen() const
             {
                 return d_ptr->m_pen;
             }
             /*!
                 Sets brush for the set. Bars of this set are drawn using \a brush
             */
             void QBarSet::setBrush(const QBrush &brush)
             {
                 if(d_ptr->m_brush!=brush){
                   d_ptr->m_brush = brush;
                   emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns brush of the set.
             */
             QBrush QBarSet::brush() const
             {
                 return d_ptr->m_brush;
             }
             /*!
                 Sets \a pen of the values that are drawn on top of this barset
             */
             void QBarSet::setLabelPen(const QPen &pen)
             {
                 if(d_ptr->m_labelPen!=pen){
                     d_ptr->m_labelPen = pen;
                     emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns pen of the values that are drawn on top of this barset
             */
             QPen QBarSet::labelPen() const
             {
                 return d_ptr->m_labelPen;
             }
             /*!
                 Sets \a brush of the values that are drawn on top of this barset
             */
             void QBarSet::setLabelBrush(const QBrush &brush)
             {
                 if(d_ptr->m_labelBrush!=brush){
                     d_ptr->m_labelBrush = brush;
                     emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns brush of the values that are drawn on top of this barset
             */
             QBrush QBarSet::labelBrush() const
             {
                 return d_ptr->m_labelBrush;
             }
             /*!
                 Sets the \a font for values that are drawn on top of this barset
             */
             void QBarSet::setLabelFont(const QFont &font)
             {
                 if(d_ptr->m_labelFont!=font) {
                     d_ptr->m_labelFont = font;
                     emit d_ptr->updatedBars();
                 }
             }
             /*!
                 Returns the pen for values that are drawn on top of this set
             */
             QFont QBarSet::labelFont() const
             {
                 return d_ptr->m_labelFont;
             }
             /*!
                 Sets visibility of bar labels. If \a visible is true, labels are drawn on top of barsets.
             */
             void QBarSet::setLabelsVisible(bool visible)
             {
                 if(d_ptr->m_labelsVisible!=visible) {
                     d_ptr->m_labelsVisible = visible;
                     emit d_ptr->labelsVisibleChanged(visible);
                 }
             }
             /*!
                 Returns the visibility of values
             */
             bool QBarSet::labelsVisible() const
             {
                 return d_ptr->m_labelsVisible;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSetPrivate::QBarSetPrivate(const QString name, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
                 m_name(name),
                 m_labelsVisible(false)
             {
             }
             QBarSetPrivate::~QBarSetPrivate()
             {
             }
             #include "moc_qbarset.cpp"
             #include "moc_qbarset_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qgroupedbarseries.cpp +5 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qgroupedbarseries.h"
             #include "qgroupedbarseries_p.h"
             #include "groupedbarchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QGroupedBarSeries
                 \brief part of QtCommercial chart API.
                 \mainclass
-                QGroupedBarSeries represents a series of data shown as bars. All bars in same category are
+                QGroupedBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
-                grouped next to each other. One QGroupedBarSeries can contain multiple QBarSet data sets.
+                as groups, where bars in same category are grouped next to each other. QGroupedBarSeries groups the data
-                QGroupedBarSeries groups the data from sets to categories, which are defined by QStringList.
+                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.
                 \image examples_groupedbarchart.png
                 \sa QBarSet, QPercentBarSeries, QBarSeries, QStackedBarSeries
             */
             /*!
                 \fn virtual QSeriesType QGroupedBarSeries::type() const
                 \brief Returns type of series.
-                \sa QSeriesType
+                \sa QAbstractSeries, QSeriesType
             */
             /*!
-                Constructs empty QGroupedBarSeries. Parameter \a categories defines the categories for chart.
+                Constructs empty QGroupedBarSeries.
                 QGroupedBarSeries is QObject which is a child of a \a parent.
             */
             QGroupedBarSeries::QGroupedBarSeries(QObject *parent)
                 : QBarSeries(*new QGroupedBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QGroupedBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeGroupedBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QGroupedBarSeriesPrivate::QGroupedBarSeriesPrivate(/*QBarCategories categories,*/ QGroupedBarSeries *q) : QBarSeriesPrivate(/*categories,*/q)
             {
             }
             void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal x = m_categories.count();
                 qreal y = maxCategorySum();
                 minX = qMin(minX, x);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, x);
                 maxY = qMax(maxY, y);
                 tickXCount = x+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QGroupedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QGroupedBarSeries);
                 GroupedBarChartItem* bar = new GroupedBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(bar);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             #include "moc_qgroupedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarseries.cpp +7 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qpercentbarseries.h"
             #include "qpercentbarseries_p.h"
             #include "percentbarchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QPercentBarSeries
                 \brief part of QtCommercial chart API.
                 \mainclass
-                QPercentBarSeries represents a series of data shown as bars. Each bar of QBarSet is shown as percentage
+                QPercentBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
-                of all bars in category. One QPercentBarSeries can contain multiple QBarSet data sets.
+                as stacks, where each bar is shown as percentage of all bars in that category.
-                QBarSeries groups the data from sets to categories, which are defined by QStringList.
+                QPercentBarSeries groups the data from sets to categories, which are defined by a QStringList.
                 See the \l {PercentbarChart Example} {percent bar chart example} to learn how to create a percent bar chart.
                 \image examples_percentbarchart.png
                 \sa QBarSet, QStackedBarSeries, QBarSeries
             */
             /*!
                 \fn virtual QSeriesType QPercentBarSeries::type() const
                 \brief Returns type of series.
                 \sa QAbstractSeries, QSeriesType
             */
             /*!
-                Constructs empty QPercentBarSeries. Parameter \a categories defines the categories for chart.
+                Constructs empty QPercentBarSeries.
                 QPercentBarSeries is QObject which is a child of a \a parent.
             */
-            QPercentBarSeries::QPercentBarSeries(/*QBarCategories categories,*/ QObject *parent)
+            QPercentBarSeries::QPercentBarSeries(QObject *parent)
-                : QBarSeries(*new QPercentBarSeriesPrivate(/*categories,*/this), parent)
+                : QBarSeries(*new QPercentBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QPercentBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypePercentBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(/*QBarCategories categories,*/ QPercentBarSeries *q) : QBarSeriesPrivate(/*categories,*/q)
+            QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QBarSeriesPrivate(q)
             {
             }
             void QPercentBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 Q_Q(QPercentBarSeries);
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal x = q->categoryCount();
                 minX = qMin(minX, x);
                 maxX = qMax(maxX, x);
                 minY = 0;
                 maxY = 100;
                 tickXCount = x+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QPercentBarSeries);
                 PercentBarChartItem* bar = new PercentBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(bar);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             #include "moc_qpercentbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef PERCENTBARSERIES_H
             #define PERCENTBARSERIES_H
             #include <QStringList>
             #include <qbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPercentBarSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries
             {
                 Q_OBJECT
             public:
-                explicit QPercentBarSeries(/*QBarCategories categories,*/ QObject *parent = 0);
+                explicit QPercentBarSeries(QObject *parent = 0);
                 QAbstractSeries::SeriesType type() const;
             private:
                 Q_DECLARE_PRIVATE(QPercentBarSeries)
                 Q_DISABLE_COPY(QPercentBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PERCENTBARSERIES_H

src/barchart/qstackedbarseries.cpp +7 -7

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qstackedbarseries.h"
             #include "qstackedbarseries_p.h"
             #include "stackedbarchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QStackedBarSeries
                 \brief part of QtCommercial chart API.
                 \mainclass
-                QStackedBarSeries represents a series of data shown as bars. All bars in same category are
+                QStackedBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
-                stacked on top of each other. One QStackedBarSeries can contain multiple QBarSet data sets.
+                as stacks, where bars in same category are stacked on top of each other.
                 QStackedBarSeries groups the data from sets to categories, which are defined by QStringList.
                 See the \l {StackedbarChart Example} {stacked bar chart example} to learn how to create a stacked bar chart.
                 \image examples_stackedbarchart.png
                 \sa QBarSet, QPercentBarSeries, QBarSeries
             */
             /*!
                 \fn virtual QSeriesType QStackedBarSeries::type() const
                 \brief Returns type of series.
-                \sa QSeriesType
+                \sa QAbstractSeries, QSeriesType
             */
             /*!
-                Constructs empty QStackedBarSeries. Parameter \a categories defines the categories for chart.
+                Constructs empty QStackedBarSeries.
                 QStackedBarSeries is QObject which is a child of a \a parent.
             */
-            QStackedBarSeries::QStackedBarSeries(/*QBarCategories categories,*/ QObject *parent)
+            QStackedBarSeries::QStackedBarSeries(QObject *parent)
-                : QBarSeries(*new QStackedBarSeriesPrivate(/*categories,*/this), parent)
+                : QBarSeries(*new QStackedBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QStackedBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeStackedBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(/*QBarCategories categories,*/ QStackedBarSeries *q) : QBarSeriesPrivate(/*categories,*/q)
+            QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QBarSeriesPrivate(q)
             {
             }
             void QStackedBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal x = m_categories.count();
                 qreal y = maxCategorySum();
                 minX = qMin(minX, x);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, x);
                 maxY = qMax(maxY, y);
                 tickXCount = x+1;
                 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
             }
             Chart* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QStackedBarSeries);
                 StackedBarChartItem* bar = new StackedBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(bar);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             #include "moc_qstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qstackedbarseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef STACKEDBARSERIES_H
             #define STACKEDBARSERIES_H
             #include <QStringList>
             #include <qbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QStackedBarSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries
             {
                 Q_OBJECT
             public:
-                explicit QStackedBarSeries(/*QBarCategories categories,*/ QObject *parent = 0);
+                explicit QStackedBarSeries(QObject *parent = 0);
                 QAbstractSeries::SeriesType type() const;
             private:
                 Q_DECLARE_PRIVATE(QStackedBarSeries)
                 Q_DISABLE_COPY(QStackedBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // STACKEDBARSERIES_H

src/chartdataset.cpp +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartdataset_p.h"
             #include "qaxis.h"
             #include "qaxis_p.h"
             #include "qabstractseries_p.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qpieseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),
                 m_axisX(new QAxis(this)),
                 m_axisY(new QAxis(this)),
                 m_domainIndex(0),
                 m_axisXInitialized(false),
                 m_axisYInitialized(false)
             {
                 //create main domain
                 Domain* domain = new Domain(m_axisY);
                 m_axisDomainMap.insert(m_axisY,domain);
                 QObject::connect(m_axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
                 QObject::connect(m_axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
                 QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),m_axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
                 QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),m_axisX->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
             }
             ChartDataSet::~ChartDataSet()
             {
                 removeAllSeries();
             }
             void ChartDataSet::addSeries(QAbstractSeries* series, QAxis *axisY)
             {
                 if(axisY==0) axisY = m_axisY;
                 QAxis* axis = m_seriesAxisMap.value(series);
                 if(axis) {
                     qWarning() << "Can not add series. Series already on the chart";
                     return;
                 }
                 series->setParent(this); // take ownership
                 axisY->setParent(this); // take ownership
                 Domain* domain = m_axisDomainMap.value(axisY);
                 if(!domain) {
                     domain = new Domain(axisY);
                     QObject::connect(axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
                     QObject::connect(axisX()->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int)));
                     QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
                     //initialize
                     m_axisDomainMap.insert(axisY,domain);
                     emit axisAdded(axisY,domain);
                 }
                 if(!m_axisXInitialized){
                    m_axisXInitialized=true;
                    emit axisAdded(m_axisX,domain);
                 }
                 if(!m_axisYInitialized && axisY==m_axisY){
                    m_axisYInitialized=true;
                    emit axisAdded(m_axisY,domain);
                 }
                 series->d_ptr->scaleDomain(*domain);
+                // Note that with SeriesTypeBar we don't set up categories, but use real values on x-asis
                 if(series->type() == QAbstractSeries::SeriesTypeGroupedBar
                         || series->type() == QAbstractSeries::SeriesTypeStackedBar
                         || series->type() == QAbstractSeries::SeriesTypePercentBar) {
                     QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                     setupCategories(barSeries);
                 }
                 if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisMap.count() == 0) {
                     axisX()->hide();
                     this->axisY()->hide();
                 }
                 m_seriesAxisMap.insert(series,axisY);
                 QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
                 int key=0;
                 while (i.hasNext()) {
                     i.next();
                     if(i.key()!=key) {
                         break;
                     }
                     key++;
                 }
                 m_indexSeriesMap.insert(key,series);
                 series->d_ptr->m_dataset=this;
                 emit seriesAdded(series,domain);
             }
             QAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
             {
                 QAxis* axis = m_seriesAxisMap.value(series);
                 if(!axis){
                     qWarning()<<"Can not remove series. Series not found on the chart.";
                     return 0;
                 }
                 emit seriesRemoved(series);
                 m_seriesAxisMap.remove(series);
                 int key = seriesIndex(series);
                 Q_ASSERT(key!=-1);
                 m_indexSeriesMap.remove(key);
                 series->setParent(0);
                 series->d_ptr->m_dataset=0;
                 QList<QAxis*> axes =  m_seriesAxisMap.values();
                 int i = axes.indexOf(axis);
                 if(i==-1){
                     Domain* domain = m_axisDomainMap.take(axis);
                     emit axisRemoved(axis);
                     if(axis!=m_axisY){
                         axis->setParent(0);
                         delete domain;
                     }else{
                         m_axisYInitialized=false;
                         m_axisDomainMap.insert(m_axisY,domain);
                     }
                 }
                 if(m_seriesAxisMap.values().size()==0)
                 {
                     m_axisXInitialized=false;
                     emit axisRemoved(axisX());
                 }
                 return axis;
             }
             void ChartDataSet::removeAllSeries()
             {
                 QList<QAbstractSeries*> series =  m_seriesAxisMap.keys();
                 QList<QAxis*> axes;
                 foreach(QAbstractSeries *s , series) {
                     QAxis* axis  = removeSeries(s);
                     if(axis==axisY()) continue;
                     int i = axes.indexOf(axis);
                     if(i==-1){
                         axes<<axis;
                     }
                 }
                 Q_ASSERT(m_seriesAxisMap.count()==0);
                 Q_ASSERT(m_axisDomainMap.count()==1);
                 qDeleteAll(series);
                 qDeleteAll(axes);
             }
             void ChartDataSet::setupCategories(QBarSeries* series)
             {
                QAxisCategories* categories = axisX()->categories();
                categories->clear();
                categories->insert(series->categories());
             }
             void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)
             {
                 QMapIterator<QAxis*, Domain*> i(m_axisDomainMap);
                 //main domain has to be the last one;
                 Domain *domain = m_axisDomainMap.value(axisY());
                 Q_ASSERT(domain);
                 while (i.hasNext()) {
                     i.next();
                     if(i.value()==domain) continue;
                     i.value()->zoomIn(rect,size);
                 }
                 domain->zoomIn(rect,size);
             }
             void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
             {
                 QMapIterator<QAxis*, Domain*> i(m_axisDomainMap);
                 //main domain has to be the last one;
                 Domain *domain = m_axisDomainMap.value(axisY());
                 Q_ASSERT(domain);
                 while (i.hasNext()) {
                     i.next();
                     if(i.value()==domain) continue;
                     i.value()->zoomOut(rect,size);
                 }
                 domain->zoomOut(rect,size);
             }
             int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
             {
                 int count=0;
                 QMapIterator<QAbstractSeries*, QAxis*> i(m_seriesAxisMap);
                 while (i.hasNext()) {
                        i.next();
                        if(i.key()->type()==type) count++;
                 }
                 return count;
             }
             int ChartDataSet::seriesIndex(QAbstractSeries *series)
             {
                 QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
                 while (i.hasNext()) {
                     i.next();
                     if (i.value() == series)
                         return i.key();
                 }
                 return -1;
             }
             QAxis* ChartDataSet::axisY(QAbstractSeries *series) const
             {
                 if(series == 0) return m_axisY;
                 return m_seriesAxisMap.value(series);
             }
             Domain* ChartDataSet::domain(QAbstractSeries *series) const
             {
             	QAxis* axis = m_seriesAxisMap.value(series);
             	if(axis){
             		return m_axisDomainMap.value(axis);
             	}else
             		return 0;
             }
             Domain* ChartDataSet::domain(QAxis* axis) const
             {
                 if(!axis || axis==axisX()) {
                     return  m_axisDomainMap.value(axisY());
                 }
                 else {
                     return m_axisDomainMap.value(axis);
                 }
             }
             void ChartDataSet::scrollDomain(int dx,int dy,const QSizeF& size)
             {
                 QMapIterator<QAxis*, Domain*> i( m_axisDomainMap);
                 //main domain has to be the last one;
                 Domain *domain = m_axisDomainMap.value(axisY());
                 while (i.hasNext()) {
                     i.next();
                     if(i.value()==domain) continue;
                     i.value()->move(dx,dy,size);
                 }
                 domain->move(dx,dy,size);
             }
             QList<QAbstractSeries*> ChartDataSet::series() const
             {
                 return m_seriesAxisMap.keys();
             }
             #include "moc_chartdataset_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qabstractseries.cpp +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qabstractseries.h"
             #include "qabstractseries_p.h"
             #include "chartdataset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QAbstractSeries
                 \brief Base class for all QtCommercial Chart series.
                 \mainclass
                 Usually you use the series type specific inherited classes instead of the base class.
                 \sa QXYSeries, QLineSeries, QSplineSeries, QScatterSeries, QAreaSeries, QBarSeries, QStackedBarSeries,
                 QPercentBarSeries, QPieSeries
             */
             /*!
                 \enum QAbstractSeries::SeriesType
                 The type of the series object.
                 \value SeriesTypeLine
                 \value SeriesTypeArea
                 \value SeriesTypeBar
                 \value SeriesTypeStackedBar
                 \value SeriesTypePercentBar
+                \value SeriesTypeGroupedBar
                 \value SeriesTypePie
                 \value SeriesTypeScatter
                 \value SeriesTypeSpline
             */
             /*!
                 \fn QSeriesType QAbstractSeries::type() const
                 \brief The type of the series.
             */
             /*!
                 \fn bool QAbstractSeries::setModel(QAbstractItemModel *model)
                 \brief Use the \a model to provide data for the series. The model overrides possible user data
                 set with QChartSeries type specific data setters. For example if you call both
                 QScatterSeries::addData() and QScatterSeries::setModel, only the data provided by the model is
                 used by the series. Returns true if the model is valid for the series.
             */
             /*!
                 \property QAbstractSeries::name
                 \brief name of the series property
             */
             /*!
                 \fn void QAbstractSeries::setName(const QString& name)
                 \brief Sets a \a name for the series.
                 The name of a series is shown in the legend for QXYSeries.
                 \sa QChart::setTitle()
                 \sa QPieSlice::setLabel()
                 \sa QBarSet::setName()
             */
             /*!
                 \internal
                 \brief Constructs ChartSeries object with \a parent.
             */
             QAbstractSeries::QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent) :
                 QObject(parent),
                 d_ptr(&d)
             {
             }
             /*!
                 \brief Virtual destructor for the chart series.
             */
             QAbstractSeries::~QAbstractSeries()
             {
                 if(d_ptr->m_dataset) qFatal("Still binded series detected !");
             }
             /*!
                 \brief Returns the pointer to the model that is used as the series data source
             */
             QAbstractItemModel* QAbstractSeries::model() const
             {
                 return d_ptr->m_model;
             }
             void QAbstractSeries::setName(const QString& name)
             {
                 d_ptr->m_name = name;
             }
             /*!
                 \brief Returns the name of the series.
                 \sa setName()
             */
             QString QAbstractSeries::name() const
             {
                 return d_ptr->m_name;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////
             QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries* q):
                 q_ptr(q),
                 m_model(0),
                 m_dataset(0)
             {
             }
             QAbstractSeriesPrivate::~QAbstractSeriesPrivate()
             {
             }
             #include "moc_qabstractseries.cpp"
             #include "moc_qabstractseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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