HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1295:2f3c0756d825

BarModelMapper: implemented model updated slots. Some more work needed with categories

Marek Rosa -

r1295:2f3c0756d825

parent child

Context file:

r1295:2f3c0756d825

Collapse all files

src/barchart/qbarmodelmapper.cpp +50 -34

                 m_seriesSignalsBlock = block;
             }
+            QBarSet* QBarModelMapperPrivate::barSet(QModelIndex index)
+            {
+                if (!index.isValid())
+                    return 0;
+                if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSection && index.column() <= m_lastBarSection) {
+                    if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count))
+                        return m_series->barSets().at(index.column() - m_firstBarSection);
+                } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSection && index.row() <= m_lastBarSection) {
+                    if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
+                        return m_series->barSets().at(index.row() - m_firstBarSection);
+                }
+                return 0; // This part of model has not been mapped to any slice
+            }
             QModelIndex QBarModelMapperPrivate::barModelIndex(int barSection, int posInBar)
             {
                 if (m_count != -1 && posInBar >= m_count)
                 if (m_modelSignalsBlock)
                     return;
-                //    blockSeriesSignals();
+                blockSeriesSignals();
-                //    QModelIndex index;
+                QModelIndex index;
                 //    QPointF oldPoint;
                 //    QPointF newPoint;
-                //    for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
+                for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
-                //        for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
+                    for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
-                //            index = topLeft.sibling(row, column);
+                        index = topLeft.sibling(row, column);
-                //            if (m_orientation == Qt::Vertical && (index.column() == m_xSection|| index.column() == m_ySection)) {
+                        QBarSet* bar = barSet(index);
-                //                if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
+                        if (bar) {
-                //                    oldPoint = m_series->points().at(index.row() - m_first);
+                            if (m_orientation == Qt::Vertical)
-                //                    newPoint.setX(m_model->data(m_model->index(index.row(), m_xSection)).toReal());
+                                bar->replace(row - m_first, m_model->data(index).toReal());
-                //                    newPoint.setY(m_model->data(m_model->index(index.row(), m_ySection)).toReal());
+                            else
-                //                }
+                                bar->replace(column - m_first, m_model->data(index).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);
-                //                    newPoint.setX(m_model->data(m_model->index(m_xSection, index.column())).toReal());
+                blockSeriesSignals(false);
-                //                    newPoint.setY(m_model->data(m_model->index(m_ySection, index.column())).toReal());
-                //                }
-                //            } else {
-                //                continue;
-                //            }
-                //            m_series->replace(oldPoint, newPoint);
-                //        }
-                //        blockSeriesSignals(false);
-                //    }
             }
             void QBarModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                Q_UNUSED(end)
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Vertical)
-                    insertData(start, end);
+                    //        insertData(start, end);
+                    initializeBarFromModel();
                 else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             void QBarModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                Q_UNUSED(end)
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Vertical)
-                    removeData(start, end);
+                    //        removeData(start, end);
+                    initializeBarFromModel();
                 else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             void QBarModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                Q_UNUSED(end)
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Horizontal)
-                    insertData(start, end);
+                    //        insertData(start, end);
+                    initializeBarFromModel();
                 else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             void QBarModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                Q_UNUSED(end)
                 if (m_modelSignalsBlock)
                     return;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Horizontal)
-                    removeData(start, end);
+                    //        removeData(start, end);
+                    initializeBarFromModel();
                 else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
                         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++) {
+                    for (int k = 0; k < m_series->barSets().count(); k++) {
-                        QPointF point;
+                        for (int i = first; i <= last; i++) {
-                        point.setX(m_model->data(xModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                            QBar point;
-                        point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                            point.setX(m_model->data(xModelIndex(i - m_first), Qt::DisplayRole).toDouble());
-                        m_series->insert(i - m_first, point);
+                            point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                            m_series->insert(i - m_first, point);
+                        }
                     }
                     // remove excess of slices (abouve m_count)
                 blockSeriesSignals();
                 // clear current content
-                //    m_series->clear();
+                m_series->clear();
                 // create the initial bar sets
                 for (int i = m_firstBarSection; i <= m_lastBarSection; i++) {

src/barchart/qbarmodelmapper_p.h +3 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QBarSet;
             class QBarModelMapperPrivate : public QObject
             {
                 Q_OBJECT
                 void initializeBarFromModel();
             private:
+                QBarSet* barSet(QModelIndex index);
                 QModelIndex barModelIndex(int barSection, int posInBar);
                 QModelIndex categoriesModelIndex(int posInCategories);
                 void insertData(int start, int end);

src/barchart/qbarseries.cpp +7 0

                 return d->remove(sets);
             }
+            void QBarSeries::clear()
+            {
+                Q_D(QBarSeries);
+                d->m_barSets.clear();
+                d->m_categories.clear();
+            }
             /*!
                 Returns number of sets in series.
             */

src/barchart/qbarseries.h +1 0

                 int categoryCount() const;
                 QList<QBarSet*> barSets() const;
                 QBarCategories categories() const;
+                void clear();
                 void setVisible(bool visible = true);
                 bool isVisible() const;

src/xychart/qxymodelmapper.cpp +2 -2

             {
                 Q_D(QXYModelMapper);
                 disconnect(d->m_model, 0, d, 0);
-            //    disconnect(d->m_series, 0, d, 0);
+                //    disconnect(d->m_series, 0, d, 0);
             }
             QAbstractItemModel* QXYModelMapper::model() const
                         }
                         m_series->replace(oldPoint, newPoint);
                     }
-                    blockSeriesSignals(false);
                 }
+                blockSeriesSignals(false);
             }
             void QXYModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end)

tests/tablemodelchart/tablewidget.cpp +3 -3

                         //                    barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                         int first = 3;
-                        int count = 4;
+            //            int count = 4;
                         QVBarModelMapper *mapper = new QVBarModelMapper;
                         mapper->setCategoriesSection(5);
                         mapper->setFirstBarSection(2);
                         mapper->setLastBarSection(4);
                         mapper->setFirst(first);
-                        mapper->setCount(count);
+            //            mapper->setCount(count);
                         mapper->setSeries(barSeries);
                         mapper->setModel(m_model);
             //            barSeries->setModelMapper(mapper);
                         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, count));
+                            m_model->addMapping(seriesColorHex, QRect(2 + i, first, 1, barsets.at(i)->count()));
                         }
                     }

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