HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1317:1951d151d7af

Fixed problem with qhxymodelmapper

Marek Rosa -

r1317:1951d151d7af

parent child

Context file:

r1317:1951d151d7af

Collapse all files

src/xychart/qxymodelmapper.cpp +29 -13

             #include "qxymodelmapper.h"
             #include "qxymodelmapper_p.h"
             #include "qxyseries.h"
             #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QXYModelMapper::QXYModelMapper(QObject *parent):
                 QObject(parent),
                 d_ptr(new QXYModelMapperPrivate(this))
             {
             }
             QXYModelMapper::~QXYModelMapper()
             {
                 Q_D(QXYModelMapper);
                 disconnect(d->m_model, 0, d, 0);
                 //    disconnect(d->m_series, 0, d, 0);
             }
             QAbstractItemModel* QXYModelMapper::model() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_model;
             }
             void QXYModelMapper::setModel(QAbstractItemModel *model)
             {
                 if (model == 0)
                     return;
                 Q_D(QXYModelMapper);
                 if (d->m_model) {
                     disconnect(d->m_model, 0, d, 0);
                 }
                 d->m_model = model;
                 d->initializeXYFromModel();
                 //    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)));
             }
             QXYSeries* QXYModelMapper::series() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_series;
             }
             void QXYModelMapper::setSeries(QXYSeries *series)
             {
                 Q_D(QXYModelMapper);
                 if (d->m_series) {
                     disconnect(d->m_series, 0, d, 0);
                 }
                 if (series == 0)
                     return;
                 d->m_series = series;
                 d->initializeXYFromModel();
                 // connect the signals from the series
                 connect(d->m_series, SIGNAL(pointAdded(int)), d, SLOT(handlePointAdded(int)));
                 connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));
                 connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));
             }
             int QXYModelMapper::first() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_first;
             }
             void QXYModelMapper::setFirst(int first)
             {
                 Q_D(QXYModelMapper);
                 d->m_first = qMax(first, 0);
                 d->initializeXYFromModel();
             }
             int QXYModelMapper::count() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_count;
             }
             void QXYModelMapper::setCount(int count)
             {
                 Q_D(QXYModelMapper);
                 d->m_count = qMax(count, -1);
                 d->initializeXYFromModel();
             }
             Qt::Orientation QXYModelMapper::orientation() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_orientation;
             }
             void QXYModelMapper::setOrientation(Qt::Orientation orientation)
             {
                 Q_D(QXYModelMapper);
                 d->m_orientation = orientation;
                 d->initializeXYFromModel();
             }
             int QXYModelMapper::xSection() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_xSection;
             }
             void QXYModelMapper::setXSection(int xSection)
             {
                 Q_D(QXYModelMapper);
                 d->m_xSection = xSection;
                 d->initializeXYFromModel();
             }
             int QXYModelMapper::ySection() const
             {
                 Q_D(const QXYModelMapper);
                 return d->m_ySection;
             }
             void QXYModelMapper::setYSection(int ySection)
             {
                 Q_D(QXYModelMapper);
                 d->m_ySection = ySection;
                 d->initializeXYFromModel();
             }
             void QXYModelMapper::reset()
             {
                 Q_D(QXYModelMapper);
                 d->m_first = 0;
                 d->m_count = -1;
                 d->m_orientation = Qt::Vertical;
                 d->m_xSection = -1;
                 d->m_ySection = -1;
                 d->initializeXYFromModel();
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QXYModelMapperPrivate::QXYModelMapperPrivate(QXYModelMapper *q) :
                 m_series(0),
                 m_model(0),
                 m_first(0),
                 m_count(-1),
                 m_orientation(Qt::Vertical),
                 m_xSection(-1),
                 m_ySection(-1),
                 m_seriesSignalsBlock(false),
                 m_modelSignalsBlock(false),
                 q_ptr(q)
             {
             }
             void QXYModelMapperPrivate::blockModelSignals(bool block)
             {
                 m_modelSignalsBlock = block;
             }
             void QXYModelMapperPrivate::blockSeriesSignals(bool block)
             {
                 m_seriesSignalsBlock = block;
             }
             QModelIndex QXYModelMapperPrivate::xModelIndex(int xPos)
             {
                 if (m_count != -1 && xPos >= m_count)
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
                     return m_model->index(xPos + m_first, m_xSection);
                 else
                     return m_model->index(m_xSection, xPos + m_first);
             }
             QModelIndex QXYModelMapperPrivate::yModelIndex(int yPos)
             {
                 if (m_count != -1 && yPos >= m_count)
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
                     return m_model->index(yPos + m_first, m_ySection);
                 else
                     return m_model->index(m_ySection, yPos + m_first);
             }
             void QXYModelMapperPrivate::handlePointAdded(int pointPos)
             {
                 if (m_seriesSignalsBlock)
                     return;
                 if (m_count != -1)
                     m_count += 1;
                 blockModelSignals();
                 if (m_orientation == Qt::Vertical)
                     m_model->insertRows(pointPos + m_first, 1);
                 else
                     m_model->insertColumns(pointPos + m_first, 1);
                 m_model->setData(xModelIndex(pointPos), m_series->points().at(pointPos).x());
                 m_model->setData(yModelIndex(pointPos), m_series->points().at(pointPos).y());
                 blockModelSignals(false);
             }
             void QXYModelMapperPrivate::handlePointRemoved(int pointPos)
             {
                 if (m_seriesSignalsBlock)
                     return;
                 if (m_count != -1)
                     m_count -= 1;
                 blockModelSignals();
                 if (m_orientation == Qt::Vertical)
                     m_model->removeRow(pointPos + m_first);
                 else
                     m_model->removeColumn(pointPos + m_first);
                 blockModelSignals(false);
             }
             void QXYModelMapperPrivate::handlePointReplaced(int pointPos)
             {
                 if (m_seriesSignalsBlock)
                     return;
                 blockModelSignals();
                 m_model->setData(xModelIndex(pointPos), m_series->points().at(pointPos).x());
                 m_model->setData(yModelIndex(pointPos), m_series->points().at(pointPos).y());
                 blockModelSignals(false);
             }
             void QXYModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 if (m_model == 0 || m_series == 0)
                     return;
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 QModelIndex index;
                 QPointF oldPoint;
                 QPointF newPoint;
                 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                     for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                         index = topLeft.sibling(row, column);
-                        if (m_orientation == Qt::Vertical && (index.column() == m_xSection|| index.column() == m_ySection)) {
+                        if (m_orientation == Qt::Vertical && (index.column() == m_xSection || index.column() == m_ySection)) {
                             if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
-                                oldPoint = m_series->points().at(index.row() - m_first);
+                                QModelIndex xIndex = xModelIndex(index.row() - m_first);
-                                newPoint.setX(m_model->data(m_model->index(index.row(), m_xSection)).toReal());
+                                QModelIndex yIndex = yModelIndex(index.row() - m_first);
-                                newPoint.setY(m_model->data(m_model->index(index.row(), m_ySection)).toReal());
+                                if (xIndex.isValid() && yIndex.isValid()) {
+                                    oldPoint = m_series->points().at(index.row() - m_first);
+                                    newPoint.setX(m_model->data(xIndex).toReal());
+                                    newPoint.setY(m_model->data(yIndex).toReal());
+                                }
                             }
                         } else if (m_orientation == Qt::Horizontal && (index.row() == m_xSection || index.row() == m_ySection)) {
                             if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count)) {
-                                oldPoint = m_series->points().at(index.column() - m_first);
+                                QModelIndex xIndex = xModelIndex(index.column() - m_first);
-                                newPoint.setX(m_model->data(m_model->index(m_xSection, index.column())).toReal());
+                                QModelIndex yIndex = yModelIndex(index.column() - m_first);
-                                newPoint.setY(m_model->data(m_model->index(m_ySection, index.column())).toReal());
+                                if (xIndex.isValid() && yIndex.isValid()) {
+                                    oldPoint = m_series->points().at(index.column() - m_first);
+                                    newPoint.setX(m_model->data(xIndex).toReal());
+                                    newPoint.setY(m_model->data(yIndex).toReal());
+                                }
                             }
                         } else {
                             continue;
                         }
                         m_series->replace(oldPoint, newPoint);
                     }
                 }
                 blockSeriesSignals(false);
             }
             void QXYModelMapperPrivate::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_xSection || start <= m_ySection) // if the changes affect the map - reinitialize the xy
                     initializeXYFromModel();
                 blockSeriesSignals(false);
             }
             void QXYModelMapperPrivate::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_xSection || start <= m_ySection) // if the changes affect the map - reinitialize the xy
                     initializeXYFromModel();
                 blockSeriesSignals(false);
             }
             void QXYModelMapperPrivate::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_xSection || start <= m_ySection) // if the changes affect the map - reinitialize the xy
                     initializeXYFromModel();
                 blockSeriesSignals(false);
             }
             void QXYModelMapperPrivate::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_xSection || start <= m_ySection) // if the changes affect the map - reinitialize the xy
                     initializeXYFromModel();
                 blockSeriesSignals(false);
             }
             void QXYModelMapperPrivate::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++) {
                         QPointF point;
-                        point.setX(m_model->data(xModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                        QModelIndex xIndex = xModelIndex(i - m_first);
-                        point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                        QModelIndex yIndex = yModelIndex(i - m_first);
-                        m_series->insert(i - m_first, point);
+                        if (xIndex.isValid() && yIndex.isValid()) {
+                            point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
+                            point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                            m_series->insert(i - m_first, point);
+                        }
                     }
                     // remove excess of slices (abouve m_count)
                     if (m_count != -1 && m_series->points().size() > m_count)
                         for (int i = m_series->points().size() - 1; i >= m_count; i--) {
                             m_series->remove(m_series->points().at(i));
                         }
                 }
             }
             void QXYModelMapperPrivate::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->count(), 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->count() + 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->points().at(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->count();
                         else
                             itemsAvailable = m_model->columnCount() - m_first - m_series->count();
                         int toBeAdded = qMin(itemsAvailable, m_count - m_series->count());     // add not more items than there is space left to be filled.
                         int currentSize = m_series->count();
                         if (toBeAdded > 0)
                             for (int i = m_series->count(); i < currentSize + toBeAdded; i++) {
                                 QPointF point;
-                                point.setX(m_model->data(xModelIndex(i), Qt::DisplayRole).toDouble());
+                                QModelIndex xIndex = xModelIndex(i);
-                                point.setY(m_model->data(yModelIndex(i), Qt::DisplayRole).toDouble());
+                                QModelIndex yIndex = yModelIndex(i);
-                                m_series->insert(i, point);
+                                if (xIndex.isValid() && yIndex.isValid()) {
+                                    point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
+                                    point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                                    m_series->insert(i, point);
+                                }
                             }
                     }
                 }
             }
             void QXYModelMapperPrivate::initializeXYFromModel()
             {
                 if (m_model == 0 || m_series == 0)
                     return;
                 blockSeriesSignals();
                 // clear current content
                 m_series->clear();
                 // create the initial slices set
                 int pointPos = 0;
                 QModelIndex xIndex = xModelIndex(pointPos);
                 QModelIndex yIndex = yModelIndex(pointPos);
                 while (xIndex.isValid() && yIndex.isValid()) {
                     QPointF point;
                     point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
                     point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
                     m_series->append(point);
                     pointPos++;
                     xIndex = xModelIndex(pointPos);
                     yIndex = yModelIndex(pointPos);
                 }
                 blockSeriesSignals(false);
             }
             #include "moc_qxymodelmapper.cpp"
             #include "moc_qxymodelmapper_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

tests/tablemodelchart/customtablemodel.cpp +6 -6

             /****************************************************************************
             **
             ** 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 "customtablemodel.h"
             #include <QVector>
             #include <QTime>
             #include <QRect>
             #include <QColor>
             CustomTableModel::CustomTableModel(QObject *parent) :
                 QAbstractTableModel(parent)
             {
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 m_columnCount = 7;
-                m_rowCount = 9;
+                m_rowCount = 1029;
                 m_labels.append("Apples");
                 m_labels.append("Oranges");
                 m_labels.append("Pears");
                 m_labels.append("Peaches");
                 m_labels.append("Coconuts");
                 m_labels.append("Bananas");
                 m_labels.append("Kiwis");
                 m_labels.append("Grapes");
                 m_labels.append("Plums");
                 // m_data
                 for (int i = 0; i < m_rowCount; i++)
                 {
                     QVector<qreal>* dataVec = new QVector<qreal>(m_columnCount);
                     for (int k = 0; k < dataVec->size(); k++)
                     {
                         if (k%2 == 0)
                             dataVec->replace(k, i * 50 + qrand()%20);
                         else
                             dataVec->replace(k, qrand()%100);
                     }
                     m_data.append(dataVec);
                     //        m_labels.append(QString("Row: %1").arg((i + 1)));
                 }
             }
             int CustomTableModel::rowCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
                 return m_data.count();
             }
             int CustomTableModel::columnCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
-                return m_columnCount + 1;
+                return m_columnCount;// + 1;
             }
             QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
             {
                 if (role != Qt::DisplayRole)
                     return QVariant();
                 if (orientation == Qt::Horizontal)
                 {
                     switch(section)
                     {
                     case 7:
                         return "Fruit";
                     case 1:
                         return "Count";
                     case 2:
                         return "Ordered";
                     default:
                         if (section%2 == 0)
                             return "x";
                         else
                             return "y";
                     }
                 }
                 else
                     return QString("%1").arg(section /*+ 1*/);
             }
             QVariant CustomTableModel::data(const QModelIndex & index, int role) const
             {
                 if (role == Qt::DisplayRole)
                 {
                     switch(index.column())
                     {
-                    case 7:
+            //        case 7:
-                        return m_labels[index.row()];
+            //            return m_labels[index.row()];
                     default:
                         return m_data[index.row()]->at(index.column());
                         break;
                     }
                 }
                 else if (role == Qt::EditRole)
                 {
                     switch(index.column())
                     {
-                    case 7:
+            //        case 7:
-                        return m_labels[index.row()];
+            //            return m_labels[index.row()];
                     default:
                         return m_data[index.row()]->at(index.column());
                         break;
                     }
                 }
                 else if (role == Qt::BackgroundRole)
                 {
                     QRect rect;
                     foreach(rect, m_mapping)
                         if(rect.contains(index.column(), index.row()))
                             return QColor(m_mapping.key(rect));
                     // cell not mapped return white color
                     return QColor(Qt::white);
                 }
                 return QVariant();
             }
             bool CustomTableModel::setData ( const QModelIndex & index, const QVariant & value, int role)
             {
                 if (index.isValid() && role == Qt::EditRole)
                 {
                     switch(index.column())
                     {
                     case 7:
                         m_labels.replace(index.row(), value.toString());
                         break;
                     default:
                         m_data[index.row()]->replace(index.column(), value.toDouble());
                         break;
                     }
                     emit dataChanged(index, index);
                     return true;
                 }
                 return false;
             }
             Qt::ItemFlags CustomTableModel::flags ( const QModelIndex & index ) const
             {
                 return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
             }
             bool CustomTableModel::insertRows ( int row, int count, const QModelIndex & parent)
             {
                 Q_UNUSED(parent)
                 if (row < 0)
                     row = 0;
                 beginInsertRows(QModelIndex(), row /*dataTable.count()*/, row + count - 1);
                 for (int i = row; i < row + count; i++)
                 {
                     //        m_points.insert(row, QPointF(10,20));
                     QVector<qreal>* dataVec = new QVector<qreal>(m_columnCount);
                     QVector<QColor>* colorVec = new QVector<QColor>(m_columnCount);
                     for (int k = 0; k < dataVec->size(); k++)
                     {
                         if (k%2 == 0)
                             //                dataVec->replace(k, i * 50 + qrand()%20);
                         {
                             int difference = 0;
                             if (i < m_data.size())
                             {
                                 if (i - 1 >= 0)
                                 {
                                     if (row > 0)
                                         difference = (int)((qAbs(m_data[i]->at(k) - m_data[row - 1]->at(k)))/count);
                                     else
                                         difference = (int)((qAbs(m_data[i]->at(k)/count)));
                                     dataVec->replace(k, m_data[i - 1]->at(k) + qrand()%qMax(1, difference));
                                 }
                                 else
                                     dataVec->replace(k, qrand()%40 + 10);
                             }
                             else
                             {
                                 if (i - 1 >= 0)
                                 {
                                     dataVec->replace(k, m_data[i - 1]->at(k) + qrand()%40 + 10);
                                 }
                                 else
                                 {
                                     dataVec->replace(k, qrand()%40 + 10);
                                 }
                             }
                         }
                         else
                             dataVec->replace(k, qrand()%100);
                         colorVec->replace(k, QColor(Qt::white));
                     }
                     m_data.insert(i, dataVec);
                     m_labels.insert(i,(QString("Row: %1").arg(i + 1)));
                 }
                 endInsertRows();
                 return true;
             }
             bool CustomTableModel::removeRows ( int row, int count, const QModelIndex & parent)
             {
                 if (row > this->rowCount() - 1)
                     return false;
                 if (row < 0)
                     row = 0;
                 if (row + count > rowCount())
                     return false;
                 beginRemoveRows(parent, row, row + count - 1);
                 for (int i = row; i < row + count; i++)
                 {
                     QVector<qreal>* item = m_data.at(row);
                     m_data.removeAt(row);
                     delete item;
                     m_labels.removeAt(row);
                 }
                 endRemoveRows();
                 return true;
             }
             bool CustomTableModel::insertColumns ( int column, int count, const QModelIndex & parent)
             {
                 if (column < 0)
                     column = 0;
                 beginInsertColumns(parent, column, column + count - 1);
                 m_columnCount += count;
                 for (int i = column; i < column + count; i++)
                     for (int k = 0; k < rowCount(); k++)
                         if (k - 1 >= 0) {
                             m_data[k]->insert(i, m_data[k - 1]->at(i) + qrand()%40 + 10);
                         } else {
                             m_data[k]->insert(i, qrand()%40);
                         }
                 endInsertColumns();
                 return true;
             }
             bool CustomTableModel::removeColumns ( int column, int count, const QModelIndex & parent)
             {
                 if (column > columnCount() - 1)
                     return false;
                 if (column < 0)
                     column = 0;
                 if (column + count > columnCount())
                     return false;
                 beginRemoveColumns(parent, column, column + count -1);
                 m_columnCount -= count;
                 for (int i = column; i < column + count; i++)
                     for (int k = 0; k < rowCount(); k++)
                         m_data[k]->remove(column);
                 endRemoveColumns();
                 return true;
             }
             void CustomTableModel::addMapping(QString color, QRect area)
             {
                 m_mapping.insertMulti(color, area);
             }
             void CustomTableModel::addMapping(QString color, int left, int top, int right, int bottom)
             {
                 addMapping(color, QRect(QPoint(left, top), QPoint(right, bottom)));
             }

tests/tablemodelchart/tablewidget.cpp +14 -14

             /****************************************************************************
             **
             ** 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 <QVXYModelMapper>
             #include <QHXYModelMapper>
             #include "customtablemodel.h"
             #include <QPieSeries>
             #include <QVPieModelMapper>
             #include <QPieSlice>
             #include <QAreaSeries>
             #include <QBarSeries>
             #include <QGroupedBarSeries>
             #include <QBarSet>
             #include <QVBarModelMapper>
             #include <QPushButton>
             #include <QRadioButton>
             #include <QLabel>
             #include <QSpinBox>
             #include <QTime>
             #include <QHeaderView>
             TableWidget::TableWidget(QWidget *parent)
                 : QWidget(parent),
                   m_series(0),
                   m_mapper(0),
                   m_model(0),
                   m_pieMapper(0),
                   m_pieMapper2(0)
                 //      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 using series API");
                 connect(specialPieButton, SIGNAL(clicked()), this, SLOT(testPie()));
                 QPushButton* specialPieButton2 = new QPushButton("Remove slices using series API");
                 connect(specialPieButton2, SIGNAL(clicked()), this, SLOT(testPie2()));
                 QPushButton* specialPieButton3 = new QPushButton("Modify slices using series API");
                 connect(specialPieButton3, SIGNAL(clicked()), this, SLOT(testPie3()));
                 QPushButton* xyTestButton = new QPushButton("Append XY point");
                 connect(xyTestButton, SIGNAL(clicked()), this, SLOT(testXY()));
                 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->addWidget(xyTestButton);
                 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_series = 0;
                     //        m_chart->axisX()->setNiceNumbersEnabled(false);
                     //        m_chart->axisY()->setNiceNumbersEnabled(false);
                     if (m_mapper) {
                         m_mapper->deleteLater();
                         m_mapper = 0;
                     }
                     if (m_pieMapper) {
                         m_pieMapper->deleteLater();
                         m_pieMapper = 0;
                     }
                     if (m_pieMapper2) {
                         m_pieMapper2->deleteLater();
                         m_pieMapper2 = 0;
                     }
                     //        if (m_series) {
                     //            delete m_series;
                     //            m_series = 0;
                     //        }
                     // 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);
+            //            m_chart->setAnimationOptions(QChart::NoAnimation);
                         // series 1
                         m_series = new QLineSeries;
-                        m_mapper = new QHXYModelMapper;
+            //            m_mapper = new QHXYModelMapper;
-                        m_mapper->setModel(m_model);
-                        m_mapper->setSeries(m_series);
-                        m_mapper->setXRow(0);
-                        m_mapper->setYRow(1);
-                        m_mapper->setFirst(3);
-                        m_mapper->setCount(4);
-            //            m_mapper = new QVXYModelMapper;
             //            m_mapper->setModel(m_model);
             //            m_mapper->setSeries(m_series);
-            //            m_mapper->setXColumn(0);
+            //            m_mapper->setXRow(0);
-            //            m_mapper->setYColumn(1);
+            //            m_mapper->setYRow(1);
             //            m_mapper->setFirst(3);
             //            m_mapper->setCount(4);
+                        m_mapper = new QVXYModelMapper;
+                        m_mapper->setModel(m_model);
+                        m_mapper->setSeries(m_series);
+                        m_mapper->setXColumn(0);
+                        m_mapper->setYColumn(1);
+                        m_mapper->setFirst(3);
+            //            m_mapper->setCount(4);
                         //            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);
             //            m_mapper = new QVXYModelMapper;
             //            m_mapper->setSeries(m_series);
             //            m_mapper->setModel(m_model);
             //            m_mapper->setXColumn(0);
             //            m_mapper->setYColumn(1);
             //            m_mapper->setFirst(0);
             //            m_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_mapper = new QVXYModelMapper;
             //            m_mapper->setSeries(m_series);
             //            m_mapper->setModel(m_model);
             //            m_mapper->setXColumn(0);
             //            m_mapper->setYColumn(1);
             //            m_mapper->setFirst(0);
             //            m_mapper->setCount(-1);
                         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);
                         //                    pieSeries->setModelMapper(mapper);
                         m_pieSeries->setLabelsVisible(true);
                         m_pieSeries->setPieSize(0.35);
                         m_pieSeries->setHorizontalPosition(0.25);
                         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(1, 2, 1, 50));
                         //                            pieSeries->slices().at(0)->setValue(400);
                         //                            pieSeries->slices().at(0)->setLabel(QString("36"));
                         // pie 2
                         m_pieSeries2 = new QPieSeries;
                         m_pieMapper2 = new QVPieModelMapper;
                         m_pieMapper2->setValuesColumn(0);
                         m_pieMapper2->setLabelsColumn(7);
                         m_pieMapper2->setModel(m_model);
                         m_pieMapper2->setSeries(m_pieSeries2);
                         m_pieMapper2->setFirst(2);
                         m_pieSeries2->setLabelsVisible(true);
                         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);
                         int first = 3;
             //            int count = 4;
                         QVBarModelMapper *mapper = new QVBarModelMapper;
                         mapper->setCategoriesSection(5);
                         mapper->setFirstBarSetSection(2);
                         mapper->setLastBarSetSection(4);
                         mapper->setFirst(first);
             //            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()));
                         }
                     }
                     if (!m_barRadioButton->isChecked()) {
-                        m_chart->axisX()->setRange(0, 500);
+            //            m_chart->axisX()->setRange(0, 500);
-                        m_chart->axisY()->setRange(0, 220);
+            //            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);
                 }
             }
             void TableWidget::testXY()
             {
                 //    if (m_series->type() != QAbstractSeries::SeriesTypeLine) {
                 //        m_series->append(QPointF(150, 75));
                 //    }
                 if (m_series->count() > 0) {
                     m_series->remove(m_series->points().last());
                 }
             }
             TableWidget::~TableWidget()
             {
             }

tests/tablemodelchart/tablewidget.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 TABLEWIDGET_H
             #define TABLEWIDGET_H
             #include <QtGui/QWidget>
             //#include <QChartGlobal>
             #include "qchartview.h"
             //#include "qxyseries.h"
             #include <QPieSeries>
             #include <QVPieModelMapper>
             #include <QVXYModelMapper>
             #include <QHXYModelMapper>
             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();
                 void testXY();
                 private:
                 QChartView* m_chartView;
                 QChart* m_chart;
                 QXYSeries* m_series;
-                QHXYModelMapper *m_mapper;
+                QVXYModelMapper *m_mapper;
                 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