HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1251:3e42cdbd748d

Small fixes to piemodelmapper and one more test

Marek Rosa -

r1251:3e42cdbd748d

parent child

Context file:

r1251:3e42cdbd748d

Collapse all files

src/piechart/qpiemodelmapper.cpp +31 -3

             #include "qpiemodelmapper_p.h"
             #include "qpiemodelmapper.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QPieModelMapper::QPieModelMapper(QObject *parent) :
                 QObject(parent),
                 d_ptr(new QPieModelMapperPrivate(this))
             {
             }
             QAbstractItemModel* QPieModelMapper::model() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_model;
             }
             void QPieModelMapper::setModel(QAbstractItemModel *model)
             {
                 if (model == 0)
                     return;
                 Q_D(QPieModelMapper);
                 if (d->m_model) {
                     disconnect(d->m_model, 0, d, 0);
                 }
                 d->m_model = model;
                 d->initializePieFromModel();
                 //    connect signals from the model
                 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
                 connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
                 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
                 connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
                 connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
             }
             QPieSeries* QPieModelMapper::series() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_series;
             }
             void QPieModelMapper::setSeries(QPieSeries *series)
             {
                 if (series == 0)
                     return;
                 Q_D(QPieModelMapper);
                 if (d->m_series) {
                     disconnect(d->m_series, 0, d, 0);
                 }
                 d->m_series = series;
                 d->initializePieFromModel();
                 // connect the signals from the series
                 connect(d->m_series, SIGNAL(added(QList<QPieSlice*>)), d, SLOT(slicesAdded(QList<QPieSlice*>)));
                 connect(d->m_series, SIGNAL(removed(QList<QPieSlice*>)), d, SLOT(slicesRemoved(QList<QPieSlice*>)));
                 //        connect(d->m_model, SIGNAL(), d, SLOT());
             }
             int QPieModelMapper::first() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_first;
             }
             void QPieModelMapper::setFirst(int first)
             {
                 Q_D(QPieModelMapper);
                 d->m_first = qMax(first, 0);
                 d->initializePieFromModel();
             }
             int QPieModelMapper::count() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_count;
             }
             void QPieModelMapper::setCount(int count)
             {
                 Q_D(QPieModelMapper);
                 d->m_count = qMax(count, -1);
                 d->initializePieFromModel();
             }
             Qt::Orientation QPieModelMapper::orientation() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_orientation;
             }
             void QPieModelMapper::setOrientation(Qt::Orientation orientation)
             {
                 Q_D(QPieModelMapper);
                 d->m_orientation = orientation;
                 d->initializePieFromModel();
             }
             int QPieModelMapper::valuesIndex() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_valuesIndex;
             }
             void QPieModelMapper::setValuesIndex(int valuesIndex)
             {
                 Q_D(QPieModelMapper);
                 d->m_valuesIndex = qMax(-1, valuesIndex);
                 d->initializePieFromModel();
             }
             int QPieModelMapper::labelsIndex() const
             {
                 Q_D(const QPieModelMapper);
                 return d->m_labelsIndex;
             }
             void QPieModelMapper::setLabelsIndex(int labelsIndex)
             {
                 Q_D(QPieModelMapper);
                 d->m_labelsIndex = qMax(-1, labelsIndex);
                 d->initializePieFromModel();
             }
             void QPieModelMapper::reset()
             {
                 Q_D(QPieModelMapper);
                 d->m_first = 0;
                 d->m_count = -1;
                 d->m_orientation = Qt::Vertical;
                 d->m_valuesIndex = -1;
                 d->m_labelsIndex = -1;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QPieModelMapperPrivate::QPieModelMapperPrivate(QPieModelMapper *q) :
                 m_series(0),
                 m_model(0),
                 m_first(0),
                 m_count(-1),
                 m_orientation(Qt::Vertical),
                 m_valuesIndex(-1),
                 m_labelsIndex(-1),
                 m_seriesSignalsBlock(false),
                 m_modelSignalsBlock(false),
                 q_ptr(q)
             {
             }
             void QPieModelMapperPrivate::blockModelSignals(bool block)
             {
                 m_modelSignalsBlock = block;
             }
             void QPieModelMapperPrivate::blockSeriesSignals(bool block)
             {
                 m_seriesSignalsBlock = block;
             }
             QPieSlice* QPieModelMapperPrivate::pieSlice(QModelIndex index) const
             {
                 if (m_orientation == Qt::Vertical && (index.column() == m_valuesIndex || index.column() == m_labelsIndex)) {
                     if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count))
                         return m_series->slices().at(index.row() - m_first);
                 } else if (m_orientation == Qt::Horizontal && (index.row() == m_valuesIndex || index.row() == m_labelsIndex)) {
                     if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
                         return m_series->slices().at(index.column() - m_first);
                 }
                 return 0; // This part of model has not been mapped to any slice
             }
             QModelIndex QPieModelMapperPrivate::valueModelIndex(int slicePos)
             {
                 if (m_count != -1 && slicePos >= m_count)
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
                     return m_model->index(slicePos + m_first, m_valuesIndex);
                 else
                     return m_model->index(m_valuesIndex, slicePos + m_first);
             }
             QModelIndex QPieModelMapperPrivate::labelModelIndex(int slicePos)
             {
                 if (m_count != -1 && slicePos >= m_count)
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
                     return m_model->index(slicePos + m_first, m_labelsIndex);
                 else
                     return m_model->index(m_labelsIndex, slicePos + m_first);
             }
+            bool QPieModelMapperPrivate::isLabelIndex(QModelIndex index) const
+            {
+                if (m_orientation == Qt::Vertical && index.column() == m_labelsIndex)
+                    return true;
+                else if (m_orientation == Qt::Horizontal && index.row() == m_labelsIndex)
+                    return true;
+                return false;
+            }
+            bool QPieModelMapperPrivate::isValueIndex(QModelIndex index) const
+            {
+                if (m_orientation == Qt::Vertical && index.column() == m_valuesIndex)
+                    return true;
+                else if (m_orientation == Qt::Horizontal && index.row() == m_valuesIndex)
+                    return true;
+                return false;
+            }
             void QPieModelMapperPrivate::slicesAdded(QList<QPieSlice*> slices)
             {
                 if (m_seriesSignalsBlock)
                     return;
                 if (slices.count() == 0)
                     return;
                 int firstIndex = m_series->slices().indexOf(slices.at(0));
                 if (firstIndex == -1)
                     return;
                 if (m_count != -1)
                     m_count += slices.count();
                 for (int i = firstIndex; i < firstIndex + slices.count(); i++) {
                     m_slices.insert(i, slices.at(i - firstIndex));
                     connect(slices.at(i - firstIndex), SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
                     connect(slices.at(i - firstIndex), SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                 }
                 blockModelSignals();
                 if (m_orientation == Qt::Vertical)
                     m_model->insertRows(firstIndex + m_first, slices.count());
                 else
                     m_model->insertColumns(firstIndex + m_first, slices.count());
                 for(int i = firstIndex; i < firstIndex + slices.count(); i++) {
                     m_model->setData(valueModelIndex(i), slices.at(i - firstIndex)->value());
                     m_model->setData(labelModelIndex(i), slices.at(i - firstIndex)->label());
                 }
                 blockModelSignals(false);
             }
             void QPieModelMapperPrivate::slicesRemoved(QList<QPieSlice*> slices)
             {
                 if (m_seriesSignalsBlock)
                     return;
                 if (slices.count() == 0)
                     return;
                 int firstIndex = m_slices.indexOf(slices.at(0));
                 if (firstIndex == -1)
                     return;
                 if (m_count != -1)
                     m_count -= slices.count();
                 for (int i = firstIndex + slices.count() - 1; i >= firstIndex; i--)
                     m_slices.removeAt(i);
                 blockModelSignals();
                 if (m_orientation == Qt::Vertical)
                     m_model->removeRows(firstIndex + m_first, slices.count());
                 else
                     m_model->removeColumns(firstIndex + m_first, slices.count());
                 blockModelSignals(false);
             }
             void QPieModelMapperPrivate::sliceLabelChanged()
             {
                 if (m_seriesSignalsBlock)
                     return;
                 blockModelSignals();
                 QPieSlice *slice = qobject_cast<QPieSlice *>(QObject::sender());
                 m_model->setData(labelModelIndex(m_series->slices().indexOf(slice)), slice->label());
                 blockModelSignals(false);
             }
             void QPieModelMapperPrivate::sliceValueChanged()
             {
                 if (m_seriesSignalsBlock)
                     return;
                 blockModelSignals();
                 QPieSlice *slice = qobject_cast<QPieSlice *>(QObject::sender());
                 m_model->setData(valueModelIndex(m_series->slices().indexOf(slice)), slice->value());
                 blockModelSignals(false);
             }
             void QPieModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 QModelIndex index;
                 QPieSlice *slice;
                 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                     for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                         index = topLeft.sibling(row, column);
                         slice = pieSlice(index);
                         if (slice) {
-                            slice->setValue(m_model->data(index, Qt::DisplayRole).toReal());
+                            if (isValueIndex(index))
-                            slice->setLabel(m_model->data(index, Qt::DisplayRole).toString());
+                                slice->setValue(m_model->data(index, Qt::DisplayRole).toReal());
+                            if (isLabelIndex(index))
+                                slice->setLabel(m_model->data(index, Qt::DisplayRole).toString());
                         }
                     }
                 }
                 blockSeriesSignals(false);
             }
             void QPieModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Vertical)
                     insertData(start, end);
                 else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
             void QPieModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Vertical)
                     removeData(start, end);
                 else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
             void QPieModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Horizontal)
                     insertData(start, end);
                 else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
             void QPieModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Horizontal)
                     removeData(start, end);
                 else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
             void QPieModelMapperPrivate::insertData(int start, int end)
             {
+                if (m_model == 0 || m_series == 0)
+                    return;
                 if (m_count != -1 && start >= m_first + m_count) {
                     return;
                 } else {
                     int addedCount = end - start + 1;
                     if (m_count != -1 && addedCount > m_count)
                         addedCount = m_count;
                     int first = qMax(start, m_first);
                     int last = qMin(first + addedCount - 1, m_orientation == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
                     for (int i = first; i <= last; i++) {
                         QPieSlice *slice = new QPieSlice;
                         slice->setValue(m_model->data(valueModelIndex(i - m_first), Qt::DisplayRole).toDouble());
                         slice->setLabel(m_model->data(labelModelIndex(i - m_first), Qt::DisplayRole).toString());
                         slice->setLabelVisible();
                         connect(slice, SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
                         connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                         m_series->insert(i - m_first, slice);
                         m_slices.insert(i - m_first, slice);
                     }
                     // remove excess of slices (abouve m_count)
                     if (m_count != -1 && m_series->slices().size() > m_count)
                         for (int i = m_series->slices().size() - 1; i >= m_count; i--) {
                             m_series->remove(m_series->slices().at(i));
                             m_slices.removeAt(i);
                         }
                 }
             }
             void QPieModelMapperPrivate::removeData(int start, int end)
             {
+                if (m_model == 0 || m_series == 0)
+                    return;
                 int removedCount = end - start + 1;
                 if (m_count != -1 && start >= m_first + m_count) {
                     return;
                 } else {
                     int toRemove = qMin(m_series->slices().size(), removedCount);     // first find how many items can actually be removed
                     int first = qMax(start, m_first);    // get the index of the first item that will be removed.
                     int last = qMin(first + toRemove - 1, m_series->slices().size() + m_first - 1);    // get the index of the last item that will be removed.
                     for (int i = last; i >= first; i--) {
                         m_series->remove(m_series->slices().at(i - m_first));
                         m_slices.removeAt(i - m_first);
                     }
                     if (m_count != -1) {
                         int itemsAvailable;     // check how many are available to be added
                         if (m_orientation == Qt::Vertical)
                             itemsAvailable = m_model->rowCount() - m_first - m_series->slices().size();
                         else
                             itemsAvailable = m_model->columnCount() - m_first - m_series->slices().size();
                         int toBeAdded = qMin(itemsAvailable, m_count - m_series->slices().size());     // add not more items than there is space left to be filled.
                         int currentSize = m_series->slices().size();
                         if (toBeAdded > 0)
                             for (int i = m_series->slices().size(); i < currentSize + toBeAdded; i++) {
                                 QPieSlice *slice = new QPieSlice;
                                 if (m_orientation == Qt::Vertical) {
                                     slice->setValue(m_model->data(m_model->index(i + m_first, m_valuesIndex), Qt::DisplayRole).toDouble());
                                     slice->setLabel(m_model->data(m_model->index(i + m_first, m_labelsIndex), Qt::DisplayRole).toString());
                                 } else {
                                     slice->setValue(m_model->data(m_model->index(m_valuesIndex, i + m_first), Qt::DisplayRole).toDouble());
                                     slice->setLabel(m_model->data(m_model->index(m_labelsIndex, i + m_first), Qt::DisplayRole).toString());
                                 }
                                 slice->setLabelVisible();
                                 m_series->insert(i, slice);
                                 m_slices.insert(i, slice);
                             }
                     }
                 }
             }
             void QPieModelMapperPrivate::initializePieFromModel()
             {
                 if (m_model == 0 || m_series == 0)
                     return;
                 blockSeriesSignals();
                 // clear current content
                 m_series->clear();
                 m_slices.clear();
                 // create the initial slices set
                 int slicePos = 0;
                 QModelIndex valueIndex = valueModelIndex(slicePos);
                 QModelIndex labelIndex = labelModelIndex(slicePos);
                 while (valueIndex.isValid() && labelIndex.isValid()) {
                     QPieSlice *slice = new QPieSlice;
                     slice->setLabel(m_model->data(labelIndex, Qt::DisplayRole).toString());
                     slice->setValue(m_model->data(valueIndex, Qt::DisplayRole).toDouble());
                     connect(slice, SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
                     connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                     m_series->append(slice);
                     m_slices.append(slice);
-            //        m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
+                    //        m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
                     slicePos++;
                     valueIndex = valueModelIndex(slicePos);
                     labelIndex = labelModelIndex(slicePos);
                 }
                 m_series->setLabelsVisible(true);
                 blockSeriesSignals(false);
             }
             #include "moc_qpiemodelmapper_p.cpp"
             #include "moc_qpiemodelmapper.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpiemodelmapper_p.h +2 0

             #ifndef QPIEMODELMAPPER_P_H
             #define QPIEMODELMAPPER_P_H
             #include "qpiemodelmapper.h"
             #include <QObject>
             class QModelIndex;
             class QAbstractItemModel;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieModelMapper;
             class QPieSeries;
             class QPieSlice;
             class QPieModelMapperPrivate : public QObject
             {
                 Q_OBJECT
             public:
                 QPieModelMapperPrivate(QPieModelMapper *q);
             public Q_SLOTS:
                 // for the model
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
                 void modelRowsAdded(QModelIndex parent, int start, int end);
                 void modelRowsRemoved(QModelIndex parent, int start, int end);
                 void modelColumnsAdded(QModelIndex parent, int start, int end);
                 void modelColumnsRemoved(QModelIndex parent, int start, int end);
                 // for the series
                 void slicesAdded(QList<QPieSlice*> slices);
                 void slicesRemoved(QList<QPieSlice*> slices);
                 void sliceLabelChanged();
                 void sliceValueChanged();
                 void initializePieFromModel();
             private:
                 QPieSlice* pieSlice(QModelIndex index) const;
+                bool isLabelIndex(QModelIndex index) const;
+                bool isValueIndex(QModelIndex index) const;
                 QModelIndex valueModelIndex(int slicePos);
                 QModelIndex labelModelIndex(int slicePos);
                 void insertData(int start, int end);
                 void removeData(int start, int end);
                 void blockModelSignals(bool block = true);
                 void blockSeriesSignals(bool block = true);
             private:
                 QPieSeries *m_series;
                 QList<QPieSlice*> m_slices;
                 QAbstractItemModel *m_model;
                 int m_first;
                 int m_count;
                 Qt::Orientation m_orientation;
                 int m_valuesIndex;
                 int m_labelsIndex;
                 bool m_seriesSignalsBlock;
                 bool m_modelSignalsBlock;
             private:
                 QPieModelMapper *q_ptr;
                 Q_DECLARE_PUBLIC(QPieModelMapper)
                 friend class QPieSeriesPrivate;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QPIEMODELMAPPER_P_H

tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +31 -2

             #include <QtCore/QString>
             #include <QtTest/QtTest>
             #include <qchart.h>
             #include <qchartview.h>
             #include <qpieseries.h>
             #include <qvpiemodelmapper.h>
             #include <qhpiemodelmapper.h>
             #include <QStandardItemModel>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class tst_piemodelmapper : public QObject
             {
                 Q_OBJECT
                 public:
                 tst_piemodelmapper();
                 private Q_SLOTS:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
                 void verticalMapper_data();
                 void verticalMapper();
                 void verticalMapperCustomMapping_data();
                 void verticalMapperCustomMapping();
                 void horizontalMapper_data();
                 void horizontalMapper();
                 void horizontalMapperCustomMapping_data();
                 void horizontalMapperCustomMapping();
+                void seriesUpdated();
                 private:
                 QStandardItemModel *m_model;
                 int m_modelRowCount;
                 int m_modelColumnCount;
                 QPieSeries *m_series;
                 QChart *m_chart;
             };
             tst_piemodelmapper::tst_piemodelmapper():
                 m_model(0),
                 m_modelRowCount(10),
                 m_modelColumnCount(8)
             {
             }
             void tst_piemodelmapper::init()
             {
                 m_series = new QPieSeries;
                 m_chart->addSeries(m_series);
             }
             void tst_piemodelmapper::cleanup()
             {
                 m_chart->removeSeries(m_series);
                 delete m_series;
                 m_series = 0;
             }
             void tst_piemodelmapper::initTestCase()
             {
                 m_chart = new QChart;
                 QChartView *chartView = new QChartView(m_chart);
                 chartView->show();
                 m_model = new QStandardItemModel(this);
                 for (int row = 0; row < m_modelRowCount; ++row) {
                     for (int column = 0; column < m_modelColumnCount; column++) {
                         QStandardItem *item = new QStandardItem(row * column);
                         m_model->setItem(row, column, item);
                     }
                 }
             }
             void tst_piemodelmapper::cleanupTestCase()
             {
                 m_model->clear();
             }
             void tst_piemodelmapper::verticalMapper_data()
             {
                 QTest::addColumn<int>("valuesColumn");
                 QTest::addColumn<int>("labelsColumn");
                 QTest::addColumn<int>("expectedCount");
                 QTest::newRow("different values and labels columns") << 0 << 1 << m_modelRowCount;
                 QTest::newRow("same values and labels columns") << 1 << 1 << m_modelRowCount;
                 QTest::newRow("invalid values column and correct labels column") << -3 << 1 << 0;
                 QTest::newRow("values column beyond the size of model and correct labels column") << m_modelColumnCount << 1 << 0;
                 QTest::newRow("values column beyond the size of model and correct labels column") << m_modelColumnCount << -1 << 0;
             }
             void tst_piemodelmapper::verticalMapper()
             {
                 QFETCH(int, valuesColumn);
                 QFETCH(int, labelsColumn);
                 QFETCH(int, expectedCount);
                 QVPieModelMapper *mapper = new QVPieModelMapper;
                 mapper->setValuesColumn(valuesColumn);
                 mapper->setLabelsColumn(labelsColumn);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 QCOMPARE(m_series->count(), expectedCount);
                 QCOMPARE(mapper->valuesColumn(), qMax(-1, valuesColumn));
                 QCOMPARE(mapper->labelsColumn(), qMax(-1, labelsColumn));
                 delete mapper;
                 mapper = 0;
             }
             void tst_piemodelmapper::verticalMapperCustomMapping_data()
             {
                 QTest::addColumn<int>("first");
                 QTest::addColumn<int>("countLimit");
                 QTest::addColumn<int>("expectedCount");
                 QTest::newRow("first: 0, unlimited count") << 0 << -1 << m_modelRowCount;
                 QTest::newRow("first: 3, unlimited count") << 3 << -1 << m_modelRowCount - 3;
                 QTest::newRow("first: 0, count: 5") << 0 << 5 << qMin(5, m_modelRowCount);
                 QTest::newRow("first: 3, count: 5") << 3 << 5 << qMin(5, m_modelRowCount - 3);
                 QTest::newRow("first: +1 greater then the number of rows in the model, unlimited count") << m_modelRowCount + 1 << -1 << 0;
                 QTest::newRow("first: +1 greater then the number of rows in the model, count: 5") << m_modelRowCount + 1 << 5 << 0;
                 QTest::newRow("first: 0, count: +3 greater than the number of rows in the model (should limit to the size of model)") << 0 << m_modelRowCount + 3 << m_modelRowCount;
                 QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << m_modelRowCount;
                 QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << m_modelRowCount;
                 QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << m_modelRowCount;
             }
             void tst_piemodelmapper::verticalMapperCustomMapping()
             {
                 QFETCH(int, first);
                 QFETCH(int, countLimit);
                 QFETCH(int, expectedCount);
                 QCOMPARE(m_series->count(), 0);
                 QVPieModelMapper *mapper = new QVPieModelMapper;
                 mapper->setValuesColumn(0);
                 mapper->setLabelsColumn(1);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 mapper->setFirst(first);
                 mapper->setCount(countLimit);
                 QCOMPARE(m_series->count(), expectedCount);
-                // change values column mappings to invalid
+                // change values column mapping to invalid
                 mapper->setValuesColumn(-1);
                 mapper->setLabelsColumn(1);
                 QCOMPARE(m_series->count(), 0);
                 delete mapper;
                 mapper = 0;
             }
             void tst_piemodelmapper::horizontalMapper_data()
             {
                 QTest::addColumn<int>("valuesRow");
                 QTest::addColumn<int>("labelsRow");
                 QTest::addColumn<int>("expectedCount");
                 QTest::newRow("different values and labels rows") << 0 << 1 << m_modelColumnCount;
                 QTest::newRow("same values and labels rows") << 1 << 1 << m_modelColumnCount;
                 QTest::newRow("invalid values row and correct labels row") << -3 << 1 << 0;
                 QTest::newRow("values row beyond the size of model and correct labels row") << m_modelRowCount << 1 << 0;
                 QTest::newRow("values row beyond the size of model and invalid labels row") << m_modelRowCount << -1 << 0;
             }
             void tst_piemodelmapper::horizontalMapper()
             {
                 QFETCH(int, valuesRow);
                 QFETCH(int, labelsRow);
                 QFETCH(int, expectedCount);
                 QHPieModelMapper *mapper = new QHPieModelMapper;
                 mapper->setValuesRow(valuesRow);
                 mapper->setLabelsRow(labelsRow);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 QCOMPARE(m_series->count(), expectedCount);
                 QCOMPARE(mapper->valuesRow(), qMax(-1, valuesRow));
                 QCOMPARE(mapper->labelsRow(), qMax(-1, labelsRow));
                 delete mapper;
                 mapper = 0;
             }
             void tst_piemodelmapper::horizontalMapperCustomMapping_data()
             {
                 QTest::addColumn<int>("first");
                 QTest::addColumn<int>("countLimit");
                 QTest::addColumn<int>("expectedCount");
                 QTest::newRow("first: 0, unlimited count") << 0 << -1 << m_modelColumnCount;
                 QTest::newRow("first: 3, unlimited count") << 3 << -1 << m_modelColumnCount - 3;
                 QTest::newRow("first: 0, count: 5") << 0 << 5 << qMin(5, m_modelColumnCount);
                 QTest::newRow("first: 3, count: 5") << 3 << 5 << qMin(5, m_modelColumnCount - 3);
                 QTest::newRow("first: +1 greater then the number of columns in the model, unlimited count") << m_modelColumnCount + 1 << -1 << 0;
                 QTest::newRow("first: +1 greater then the number of columns in the model, count: 5") << m_modelColumnCount + 1 << 5 << 0;
                 QTest::newRow("first: 0, count: +3 greater than the number of columns in the model (should limit to the size of model)") << 0 << m_modelColumnCount + 3 << m_modelColumnCount;
                 QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << m_modelColumnCount;
                 QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << m_modelColumnCount;
                 QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << m_modelColumnCount;
             }
             void tst_piemodelmapper::horizontalMapperCustomMapping()
             {
                 QFETCH(int, first);
                 QFETCH(int, countLimit);
                 QFETCH(int, expectedCount);
                 QCOMPARE(m_series->count(), 0);
                 QHPieModelMapper *mapper = new QHPieModelMapper;
                 mapper->setValuesRow(0);
                 mapper->setLabelsRow(1);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 mapper->setFirst(first);
                 mapper->setCount(countLimit);
                 QCOMPARE(m_series->count(), expectedCount);
-                // change values column mappings to invalid
+                // change values row mapping to invalid
                 mapper->setValuesRow(-1);
                 mapper->setLabelsRow(1);
                 QCOMPARE(m_series->count(), 0);
                 delete mapper;
                 mapper = 0;
             }
+            void tst_piemodelmapper::seriesUpdated()
+            {
+                QStandardItemModel *otherModel = new QStandardItemModel;
+                for (int row = 0; row < m_modelRowCount; ++row) {
+                    for (int column = 0; column < m_modelColumnCount; column++) {
+                        QStandardItem *item = new QStandardItem(row * column);
+                        otherModel->setItem(row, column, item);
+                    }
+                }
+                QVPieModelMapper *mapper = new QVPieModelMapper;
+                mapper->setValuesColumn(0);
+                mapper->setLabelsColumn(1);
+                mapper->setModel(otherModel);
+                mapper->setSeries(m_series);
+                QCOMPARE(m_series->count(), m_modelRowCount);
+                m_series->append("1000", 1000);
+                QCOMPARE(m_series->count(), m_modelRowCount + 1);
+                m_series->remove(m_series->slices().last());
+                QCOMPARE(m_series->count(), m_modelRowCount);
+                otherModel->clear();
+                delete otherModel;
+                otherModel = 0;
+            }
             QTEST_MAIN(tst_piemodelmapper)
             #include "tst_qpiemodelmapper.moc"

tests/tablemodelchart/tablewidget.cpp +24 -20

             /****************************************************************************
             **
             ** 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 "tablewidget.h"
             #include <QGridLayout>
             #include <QTableView>
             #include <QChart>
             #include <QStyledItemDelegate>
             #include <QLineSeries>
             #include <QSplineSeries>
             #include <QScatterSeries>
             #include <QXYModelMapper>
             #include "customtablemodel.h"
             #include <QPieSeries>
             #include <QVPieModelMapper>
             #include <QPieSlice>
             #include <QAreaSeries>
             #include <QBarSeries>
             #include <QGroupedBarSeries>
             #include <QBarSet>
             #include <QBarModelMapper>
             #include <QPushButton>
             #include <QRadioButton>
             #include <QLabel>
             #include <QSpinBox>
             #include <QTime>
             #include <QHeaderView>
             TableWidget::TableWidget(QWidget *parent)
                 : QWidget(parent)
                 //      specialPie(0)
             {
                 setGeometry(1900, 100, 1000, 600);
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 // create simple model for storing data
                 // user's table data model
                 m_model = new CustomTableModel;
                 m_tableView = new QTableView;
                 m_tableView->setModel(m_model);
                 //    m_tableView->setMinimumHeight(300);
                 m_tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
                 m_tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
                 m_chart = new QChart;
                 m_chart->legend()->setVisible(true);
                 m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 m_chartView = new QChartView(m_chart);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
                 m_chartView->setMinimumSize(640, 480);
                 // add, remove data buttons
                 QPushButton* addRowAboveButton = new QPushButton("Add row above");
                 connect(addRowAboveButton, SIGNAL(clicked()), this, SLOT(addRowAbove()));
                 QPushButton* addRowBelowButton = new QPushButton("Add row below");
                 connect(addRowBelowButton, SIGNAL(clicked()), this, SLOT(addRowBelow()));
                 QPushButton* removeRowButton = new QPushButton("Remove row");
                 connect(removeRowButton, SIGNAL(clicked()), this, SLOT(removeRow()));
                 QPushButton* addColumnRightButton = new QPushButton("Add column to the right");
                 connect(addColumnRightButton, SIGNAL(clicked()), this, SLOT(addColumnRight()));
                 QPushButton* removeColumnButton = new QPushButton("Remove column");
                 connect(removeColumnButton, SIGNAL(clicked()), this, SLOT(removeColumn()));
-                QPushButton* specialPieButton = new QPushButton("Add slices from series");
+                QPushButton* specialPieButton = new QPushButton("Add slices using series API");
                 connect(specialPieButton, SIGNAL(clicked()), this, SLOT(testPie()));
-                QPushButton* specialPieButton2 = new QPushButton("Remove slices from series");
+                QPushButton* specialPieButton2 = new QPushButton("Remove slices using series API");
                 connect(specialPieButton2, SIGNAL(clicked()), this, SLOT(testPie2()));
-                QPushButton* specialPieButton3 = new QPushButton("Remove slices from series");
+                QPushButton* specialPieButton3 = new QPushButton("Modify slices using series API");
                 connect(specialPieButton3, SIGNAL(clicked()), this, SLOT(testPie3()));
                 //    QLabel *spinBoxLabel = new QLabel("Rows affected:");
                 // spin box for setting number of affected items (add, remove)
                 m_linesCountSpinBox = new QSpinBox;
                 m_linesCountSpinBox->setRange(1, 10);
                 m_linesCountSpinBox->setValue(1);
                 // buttons layout
                 QVBoxLayout* buttonsLayout = new QVBoxLayout;
                 //    buttonsLayout->addWidget(spinBoxLabel);
                 //    buttonsLayout->addWidget(m_linesCountSpinBox);
                 //    buttonsLayout->addWidget(addRowAboveButton);
                 buttonsLayout->addWidget(addRowBelowButton);
                 buttonsLayout->addWidget(removeRowButton);
                 //    buttonsLayout->addWidget(addColumnRightButton);
                 //    buttonsLayout->addWidget(removeColumnButton);
                 buttonsLayout->addWidget(specialPieButton);
                 buttonsLayout->addWidget(specialPieButton2);
                 buttonsLayout->addWidget(specialPieButton3);
                 buttonsLayout->addStretch();
                 // chart type radio buttons
                 m_lineRadioButton = new QRadioButton("Line");
                 m_splineRadioButton = new QRadioButton("Spline");
                 m_scatterRadioButton = new QRadioButton("Scatter");
                 m_pieRadioButton = new QRadioButton("Pie");
                 m_areaRadioButton = new QRadioButton("Area");
                 m_barRadioButton = new QRadioButton("Bar");
                 connect(m_lineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_splineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_scatterRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 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);
                 // radio buttons layout
                 QVBoxLayout* radioLayout = new QVBoxLayout;
                 radioLayout->addWidget(m_lineRadioButton);
                 radioLayout->addWidget(m_splineRadioButton);
                 //    radioLayout->addWidget(m_scatterRadioButton);
                 radioLayout->addWidget(m_pieRadioButton);
                 //    radioLayout->addWidget(m_areaRadioButton);
                 radioLayout->addWidget(m_barRadioButton);
                 radioLayout->addStretch();
                 // create main layout
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addLayout(buttonsLayout, 2, 0);
                 mainLayout->addLayout(radioLayout, 3, 0);
                 mainLayout->addWidget(m_tableView, 1, 0);
                 mainLayout->addWidget(m_chartView, 1, 1, 2, 1);
                 setLayout(mainLayout);
                 m_lineRadioButton->setFocus();
             }
             void TableWidget::addRowAbove()
             {
                 m_model->insertRows(m_tableView->currentIndex().row(), m_linesCountSpinBox->value());
             }
             void TableWidget::addRowBelow()
             {
                 m_model->insertRows(m_tableView->currentIndex().row() + 1, m_linesCountSpinBox->value());
             }
             void TableWidget::removeRow()
             {
                 m_model->removeRows(m_tableView->currentIndex().row(), qMin(m_model->rowCount() - m_tableView->currentIndex().row(), m_linesCountSpinBox->value()));
             }
             void TableWidget::addColumnRight()
             {
                 m_model->insertColumns(m_tableView->currentIndex().column() + 1, m_linesCountSpinBox->value());
             }
             void TableWidget::removeColumn()
             {
                 m_model->removeColumns(m_tableView->currentIndex().column(), qMin(m_model->columnCount() - m_tableView->currentIndex().column(), m_linesCountSpinBox->value()));
             }
             void TableWidget::updateChartType(bool toggle)
             {
                 // this if is needed, so that the function is only called once.
                 // For the radioButton that was enabled.
                 if (toggle) {
                     //        specialPie = 0;
                     m_chart->removeAllSeries();
                     //        m_chart->axisX()->setNiceNumbersEnabled(false);
                     //        m_chart->axisY()->setNiceNumbersEnabled(false);
                     //        // renable axes of the chart (pie hides them)
                     //        // x axis
                     //        QAxis *axis = m_chart->axisX();
                     //        axis->setAxisVisible(true);
                     //        axis->setGridLineVisible(true);
                     //        axis->setLabelsVisible(true);
                     //        // y axis
                     //        axis = m_chart->axisY();
                     //        axis->setAxisVisible(true);
                     //        axis->setGridLineVisible(true);
                     //        axis->setLabelsVisible(true);
                     //        m_model->clearMapping();
                     QString seriesColorHex = "#000000";
                     //        QPen pen;
                     //        pen.setWidth(2);
                     if (m_lineRadioButton->isChecked())
                     {
                         //            m_chart->setAnimationOptions(QChart::NoAnimation);
                         //            // series 1
                         //            m_series = new QLineSeries;
                         //            m_series->setModel(m_model);
                         //            QXYModelMapper *mapper = new QXYModelMapper;
                         //            mapper->setMapX(0);
                         //            mapper->setMapY(1);
                         //            mapper->setFirst(3);
                         //            mapper->setCount(4);
                         //            m_series->setModelMapper(mapper);
                         //            //            m_series->setModelMapping(0,1, Qt::Vertical);
                         //            //            m_series->setModelMappingRange(3, 4);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(0, 3, 2, 4));
                         //            // series 2
                         //            m_series = new QLineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(3);
                         //            mapper->setMapY(4);
                         //            //            mapper->setFirst(3);
                         //            //            mapper->setCount(4);
                         //            m_series->setModelMapper(mapper);
                         //            //            m_series->setModelMapping(2,3, Qt::Vertical);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(3, 0, 2, 1000));
                         //            // series 3
                         //            m_series = new QLineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(5);
                         //            mapper->setMapY(6);
                         //            mapper->setFirst(2);
                         //            mapper->setCount(-1);
                         //            m_series->setModelMapper(mapper);
                         //            //            m_series->setModelMapping(4,5, Qt::Vertical);
                         //            //            m_series->setModelMappingRange(2, -1);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(5, 2, 2, 1000));
                     }
                     else if (m_splineRadioButton->isChecked())
                     {
                         //            m_chart->setAnimationOptions(QChart::NoAnimation);
                         //            // series 1
                         //            m_series = new QSplineSeries;
                         //            m_series->setModel(m_model);
                         //            QXYModelMapper *mapper = new QXYModelMapper;
                         //            mapper->setMapX(0);
                         //            mapper->setMapY(1);
                         //            mapper->setFirst(0);
                         //            mapper->setCount(-1);
                         //            m_series->setModelMapper(mapper);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(0, 0, 2, 1000));
                         //            // series 2
                         //            m_series = new QSplineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(2);
                         //            mapper->setMapY(3);
                         //            mapper->setFirst(2);
                         //            mapper->setCount(4);
                         //            m_series->setModelMapper(mapper);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(2, 2, 2, 4));
                         //            // series 3
                         //            m_series = new QSplineSeries;
                         //            m_series->setModel(m_model);
                         //            mapper = new QXYModelMapper;
                         //            mapper->setMapX(4);
                         //            mapper->setMapY(5);
                         //            mapper->setFirst(2);
                         //            mapper->setCount(-1);
                         //            m_series->setModelMapper(mapper);
                         //            m_chart->addSeries(m_series);
                         //            seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                     }
                     //        else if (m_scatterRadioButton->isChecked())
                     //        {
                     //            m_chart->setAnimationOptions(QChart::NoAnimation);
                     //            // series 1
                     //            m_series = new QScatterSeries;
                     //            m_series->setModel(m_model);
                     //            m_series->setModelMapping(0,1, Qt::Vertical);
                     //            //            m_series->setModelMappingRange(2, 0);
                     //            //        series->setModelMapping(0,1, Qt::Horizontal);
                     //            m_chart->addSeries(m_series);
                     //            seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 1000));
                     //            // series 2
                     //            m_series = new QScatterSeries;
                     //            m_series->setModel(m_model);
                     //            m_series->setModelMapping(2,3, Qt::Vertical);
                     //            //            m_series->setModelMappingRange(1, 6);
                     //            //        series->setModelMapping(2,3, Qt::Horizontal);
                     //            m_chart->addSeries(m_series);
                     //            seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(2, 1, 2, 6));
                     //            // series 3
                     //            m_series = new QScatterSeries;
                     //            m_series->setModel(m_model);
                     //            m_series->setModelMapping(4,5, Qt::Vertical);
                     //            //        series->setModelMapping(4,5, Qt::Horizontal);
                     //            m_chart->addSeries(m_series);
                     //            seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(4, 0, 2, 1000));
                     //        }
                     else if (m_pieRadioButton->isChecked())
                     {
                         m_chart->setAnimationOptions(QChart::SeriesAnimations);
                         // pie 1
                         m_pieSeries = new QPieSeries;
                         m_pieMapper = new QVPieModelMapper;
                         m_pieMapper->setValuesColumn(1);
                         m_pieMapper->setLabelsColumn(7);
                         m_pieMapper->setSeries(m_pieSeries);
                         m_pieMapper->setModel(m_model);
                         m_pieMapper->setFirst(2);
-            //                        m_pieMapper->setCount(5);
+                        //                        m_pieMapper->setCount(5);
                         //                    pieSeries->setModelMapper(mapper);
                         m_pieSeries->setLabelsVisible(true);
-                        m_pieSeries->setPieSize(0.75);
+                        m_pieSeries->setPieSize(0.35);
-                        //            pieSeries->setHorizontalPosition(0.2);
+                        m_pieSeries->setHorizontalPosition(0.25);
-                        //            pieSeries->setVerticalPosition(0.3);
+                        m_pieSeries->setVerticalPosition(0.35);
                         m_chart->addSeries(m_pieSeries);
                         seriesColorHex = "#" + QString::number(m_pieSeries->slices().at(m_pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
-                        m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 5));
+                        m_model->addMapping(seriesColorHex, QRect(1, 2, 1, 50));
                         //                            pieSeries->slices().at(0)->setValue(400);
                         //                            pieSeries->slices().at(0)->setLabel(QString("36"));
-                        //            // pie 2
+                        // pie 2
-                        //            pieSeries = new QPieSeries;
+                        m_pieSeries2 = new QPieSeries;
-                        //            pieSeries->setModel(m_model);
-                        //            pieSeries->setModelMapping(1,1, Qt::Vertical);
+                        m_pieMapper = new QVPieModelMapper;
-                        //            pieSeries->setModelMappingRange(2, -1);
+                        m_pieMapper->setValuesColumn(0);
-                        //            pieSeries->setLabelsVisible(true);
+                        m_pieMapper->setLabelsColumn(7);
-                        //            pieSeries->setPieSize(0.35);
+                        m_pieMapper->setSeries(m_pieSeries2);
-                        //            pieSeries->setHorizontalPosition(0.8);
+                        m_pieMapper->setModel(m_model);
-                        //            pieSeries->setVerticalPosition(0.3);
+                        m_pieMapper->setFirst(2);
-                        //            m_chart->addSeries(pieSeries);
-                        //            seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
+                        m_pieSeries2->setLabelsVisible(true);
-                        //            m_model->addMapping(seriesColorHex, QRect(1, 2, 1, 1000));
+                        m_pieSeries2->setPieSize(0.35);
+                        m_pieSeries2->setHorizontalPosition(0.75);
+                        m_pieSeries2->setVerticalPosition(0.65);
+                        m_chart->addSeries(m_pieSeries2);
+                        seriesColorHex = "#" + QString::number(m_pieSeries2->slices().at(m_pieSeries2->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
+                        m_model->addMapping(seriesColorHex, QRect(0, 2, 1, 1000));
                         //            // pie 3
                         //            pieSeries = new QPieSeries;
                         //            pieSeries->setModel(m_model);
                         //            pieSeries->setModelMapping(2,2, Qt::Vertical);
                         //            pieSeries->setLabelsVisible(true);
                         //            pieSeries->setPieSize(0.35);
                         //            pieSeries->setHorizontalPosition(0.5);
                         //            pieSeries->setVerticalPosition(0.75);
                         //            m_chart->addSeries(pieSeries);
                         //            seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         //            m_model->addMapping(seriesColorHex, QRect(2, 0, 1, 1000));
                         //            // special pie
                         //            specialPie = new QPieSeries;
                         //            specialPie->append(17, "1");
                         //            specialPie->append(45, "2");
                         //            specialPie->append(77, "3");
                         //            specialPie->append(37, "4");
                         //            specialPie->append(27, "5");
                         //            specialPie->append(47, "6");
                         //            specialPie->setPieSize(0.35);
                         //            specialPie->setHorizontalPosition(0.8);
                         //            specialPie->setVerticalPosition(0.75);
                         //            specialPie->setLabelsVisible(true);
                         //            m_chart->addSeries(specialPie);
                     }
                     //        else if (m_areaRadioButton->isChecked())
                     //        {
                     //            m_chart->setAnimationOptions(QChart::NoAnimation);
                     //            QLineSeries* upperLineSeries = new QLineSeries;
                     //            upperLineSeries->setModel(m_model);
                     //            upperLineSeries->setModelMapping(0, 1, Qt::Vertical);
                     //            //            upperLineSeries->setModelMappingRange(1, 5);
                     //            QLineSeries* lowerLineSeries = new QLineSeries;
                     //            lowerLineSeries->setModel(m_model);
                     //            lowerLineSeries->setModelMapping(2, 3, Qt::Vertical);
                     //            QAreaSeries* areaSeries = new QAreaSeries(upperLineSeries, lowerLineSeries);
                     //            m_chart->addSeries(areaSeries);
                     //            seriesColorHex = "#" + QString::number(areaSeries->brush().color().rgb(), 16).right(6).toUpper();
                     //            m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 5));
                     //            m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                     //        }
                     else if (m_barRadioButton->isChecked())
                     {
                         //                    m_chart->setAnimationOptions(QChart::SeriesAnimations);
                         //                    QGroupedBarSeries* barSeries = new QGroupedBarSeries();
                         //                    barSeries->setCategories(QStringList());
                         //                    barSeries->setModel(m_model);
                         //                    //            barSeries->setModelMappingRange(2, 5);
                         ////                    barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                         //                    QBarModelMapper *mapper = new QBarModelMapper;
                         //                    mapper->setMapCategories(5);
                         //                    mapper->setMapBarBottom(2);
                         //                    mapper->setMapBarTop(4);
                         //                    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, 0, 1, 1000));
                         //                    }
                     }
                     if (!m_barRadioButton->isChecked()) {
                         m_chart->axisX()->setRange(0, 500);
                         m_chart->axisY()->setRange(0, 220);
                     }
                     m_chart->legend()->setVisible(true);
                     // repaint table view colors
                     m_tableView->repaint();
                     m_tableView->setFocus();
                 }
             }
             void TableWidget::testPie()
             {
                 //    m_pieMapper->setCount(-1);
                 QPieSlice *slice = new QPieSlice("Hehe", 145);
                 slice->setLabelVisible();
                 m_pieSeries->append(slice);
                 slice = new QPieSlice("Hoho", 34);
                 slice->setLabelVisible();
                 m_pieSeries->append(slice);
                 //    m_series->modelMapper()->setMapX(4);
                 //    m_tableView->setColumnWidth(10, 250);
                 //    if (specialPie) {
                 //        specialPie->remove(specialPie->slices().at(2));
                 //        //    specialPie->insert(4, new QPieSlice(45, "Hello"));//specialPie->slices.at(2));
                 //        specialPie->append(4, "heloo");
                 //    }
             }
             void TableWidget::testPie2()
             {
                 QPieSlice *slice;
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().last();
                     m_pieSeries->remove(slice);
                 }
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().first();
                     m_pieSeries->remove(slice);
                 }
             }
             void TableWidget::testPie3()
             {
                 QPieSlice *slice;
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().last();
                     slice->setLabel("Dalej");
                     slice->setValue(222);
                 }
                 if (m_pieSeries->count() > 0) {
                     slice = m_pieSeries->slices().first();
                     slice->setLabel("Prawie");
                     slice->setValue(111);
                 }
             }
             TableWidget::~TableWidget()
             {
             }

tests/tablemodelchart/tablewidget.h +2 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$
             **
             ****************************************************************************/
             #ifndef TABLEWIDGET_H
             #define TABLEWIDGET_H
             #include <QtGui/QWidget>
             //#include <QChartGlobal>
             #include "qchartview.h"
             //#include "qxyseries.h"
             #include <QPieSeries>
             #include <QVPieModelMapper>
             class CustomTableModel;
             class QTableView;
             class QRadioButton;
             class QSpinBox;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class TableWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 TableWidget(QWidget *parent = 0);
                 ~TableWidget();
                 public slots:
                 void addRowAbove();
                 void addRowBelow();
                 void removeRow();
                 void addColumnRight();
                 void removeColumn();
                 void updateChartType(bool toggle);
                 void testPie();
                 void testPie2();
                 void testPie3();
                 private:
                 QChartView* m_chartView;
                 QChart* m_chart;
                 QXYSeries* m_series;
                 CustomTableModel* m_model;
                 QTableView* m_tableView;
                 QRadioButton* m_lineRadioButton;
                 QRadioButton* m_splineRadioButton;
                 QRadioButton* m_scatterRadioButton;
                 QRadioButton* m_pieRadioButton;
                 QRadioButton* m_areaRadioButton;
                 QRadioButton* m_barRadioButton;
                 QSpinBox* m_linesCountSpinBox;
                 QVPieModelMapper *m_pieMapper;
                 QPieSeries* m_pieSeries;
+                QVPieModelMapper *m_pieMapper2;
+                QPieSeries* m_pieSeries2;
             //    QPieSeries* specialPie;
             };
             #endif // TABLEWIDGET_H

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