HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1331:c415cc6dbfb2

doc/src/classes.qdoc +7 -1

                         <li><a href="qsplineseries.html">QSplineSeries</a></li>
                         <li><a href="qstackedbarseries.html">QStackedBarSeries</a></li>
                         <li><a href="qxyseries.html">QXYSeries</a></li>
-            			<li><a href="qlegend.html">QLegend</a></li>
+                        <li><a href="qlegend.html">QLegend</a></li>
+            	    <li><a href="qhpiemodelmapper.html">QHPieModelMapper</a></li>
+            	    <li><a href="qvpiemodelmapper.html">QVPieModelMapper</a></li>
+            	    <li><a href="qhbarmodelmapper.html">QHBarModelMapper</a></li>
+            	    <li><a href="qvbarmodelmapper.html">QVBarModelMapper</a></li>
+            	    <li><a href="qhxymodelmapper.html">QHXYModelMapper</a></li>
+            	    <li><a href="qvxymodelmapper.html">QVXYModelMapper</a></li>
                     </ul>
                     </td>
                     </tr>

src/barchart/qbarmodelmapper.cpp +11 -6

             #include "qbarmodelmapper_p.h"
             #include "qbarseries.h"
             #include "qbarset.h"
+            #include "qchart.h"
+            #include "qaxis.h"
             #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 Q_D(QBarModelMapper);
                 d->m_first = 0;
                 d->m_count = -1;
-                d->m_orientation = Qt::Vertical;
                 d->m_firstBarSetSection = -1;
                 d->m_lastBarSetSection = -1;
                 d->m_categoriesSection = -1;
                     return 0;
                 if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSetSection && index.column() <= m_lastBarSetSection) {
-                    if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count))
+                    if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
-                        return m_series->barSets().at(index.column() - m_firstBarSetSection);
+            //            if (m_model->index(index.row(), m_valuesSection).isValid() && m_model->index(index.row(), m_labelsSection).isValid())
+                            return m_series->barSets().at(index.column() - m_firstBarSetSection);
+            //            else
+            //                return 0;
+                    }
                 } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSetSection && index.row() <= m_lastBarSetSection) {
                     if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
                         return m_series->barSets().at(index.row() - m_firstBarSetSection);
                             point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
                             m_series->insert(i - m_first, point);
                         }
+            >>>>>>> Stashed changes
                     }
                     // remove excess of slices (abouve m_count)
                     m_series->append(barSet);
                 }
-                if (m_categoriesSection != -1) {
+                if (m_series->chart() && m_categoriesSection != -1) {
                     int posInCategories = 0;
                     QStringList categories;
                     QModelIndex categoriesIndex = categoriesModelIndex(posInCategories);
                         posInCategories++;
                         categoriesIndex = categoriesModelIndex(posInCategories);
                     }
-                    // TODO: set the categories to axis
+                    m_series->chart()->axisX()->categories()->insert(categories);
-            //        m_series->setCategories(categories);
                 }
                 blockSeriesSignals(false);
             }

src/barchart/qbarmodelmapper.h +5 -4

             class QBarModelMapperPrivate;
             class QBarSeries;
+            class QChart;
             class QTCOMMERCIALCHART_EXPORT QBarModelMapper : public QObject
             {
                 int count() const;
                 void setCount(int count);
+                void reset();
+            protected:
                 int firstBarSetSection() const;
                 void setFirstBarSetSection(int firstBarSetSection);
                 int categoriesSection() const;
                 void setCategoriesSection(int categoriesSection);
-            protected:
                 Qt::Orientation orientation() const;
                 void setOrientation(Qt::Orientation orientation);
-                void reset();
             Q_SIGNALS:
                 void updated();

src/barchart/qhbarmodelmapper.cpp +8 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                \class QHBarModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                Nothing here yet
+            */
             QHBarModelMapper::QHBarModelMapper(QObject *parent) :
                 QBarModelMapper(parent)
             {

src/barchart/qvbarmodelmapper.cpp +8 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                \class QVBarModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                Nothing here yet
+            */
             QVBarModelMapper::QVBarModelMapper(QObject *parent) :
                 QBarModelMapper(parent)
             {

src/piechart/qhpiemodelmapper.cpp +8 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                \class QHPieModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                Nothing here yet
+            */
             QHPieModelMapper::QHPieModelMapper(QObject *parent) :
                 QPieModelMapper(parent)
             {

src/piechart/qvpiemodelmapper.cpp +8 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                \class QVPieModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                Nothing here yet
+            */
             QVPieModelMapper::QVPieModelMapper(QObject *parent) :
                 QPieModelMapper(parent)
             {

src/xychart/qhxymodelmapper.cpp +8 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                \class QHXYModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                Nothing here yet
+            */
             QHXYModelMapper::QHXYModelMapper(QObject *parent) :
                 QXYModelMapper(parent)
             {

src/xychart/qvxymodelmapper.cpp +8 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                \class QVXYModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                Nothing here yet
+            */
             QVXYModelMapper::QVXYModelMapper(QObject *parent) :
                 QXYModelMapper(parent)
             {

tests/tablemodelchart/tablewidget.cpp +10 -6

                 connect(m_pieRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_areaRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_barRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
-                m_lineRadioButton->setChecked(true);
+                m_barRadioButton->setChecked(true);
                 // radio buttons layout
                 QVBoxLayout* radioLayout = new QVBoxLayout;
                         //            barSeries->setModelMappingRange(2, 5);
                         //                    barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                         int first = 3;
-            //            int count = 4;
+                        int count = 6;
                         QVBarModelMapper *mapper = new QVBarModelMapper;
-                        mapper->setCategoriesSection(5);
+                        mapper->setCategoriesColumn(5);
-                        mapper->setFirstBarSetSection(2);
+                        mapper->setFirstBarSetColumn(2);
-                        mapper->setLastBarSetSection(4);
+                        mapper->setLastBarSetColumn(4);
                         mapper->setFirst(first);
-            //            mapper->setCount(count);
+                        mapper->setCount(count);
                         mapper->setSeries(barSeries);
                         mapper->setModel(m_model);
             //            barSeries->setModelMapper(mapper);
                         m_chart->addSeries(barSeries);
                         QList<QBarSet*> barsets = barSeries->barSets();
                         for (int i = 0; i < barsets.count(); i++) {
                             seriesColorHex = "#" + QString::number(barsets.at(i)->brush().color().rgb(), 16).right(6).toUpper();
                             m_model->addMapping(seriesColorHex, QRect(2 + i, first, 1, barsets.at(i)->count()));
                         }
                     }

	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