HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1166:740d4c3988ce

Removed unnecessary model related function from xyseries and pieseries

Marek Rosa -

r1166:740d4c3988ce

parent child

Context file:

r1166:740d4c3988ce

Collapse all files

src/piechart/qpieseries.cpp +25 -16

                 if(model)
                 {
                     d->m_model = model;
+                    // 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)));
                     if (d->m_mapper)
-                        d->setMapping();
+                        d->initializePieFromModel();
                 }
                 else
                 {
                 if (mapper) {
                     d->m_mapper = mapper;
+                    // connect the signal from the mapper
+                    connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializePieFromModel()));
                     if (d->m_model)
-                        d->setMapping();
+                        d->initializePieFromModel();
                 } else {
                     d->m_mapper = 0;
                 }
             void QPieSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
+                if (m_mapper) {
                     for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                         for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                             if (m_mapper->orientation() == Qt::Vertical)
                         }
                     }
                 }
+            }
             void QPieSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Vertical)
                         insertData(start, end);
                     else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
                         initializePieFromModel();
                 }
+            }
             void QPieSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Vertical)
                         removeData(start, end);
                     else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
                         initializePieFromModel();
                 }
+            }
             void QPieSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Horizontal)
                         insertData(start, end);
                     else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
                         initializePieFromModel();
                 }
+            }
             void QPieSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Horizontal)
                         removeData(start, end);
                     else if (start <= m_mapper->mapValues() || start <= m_mapper->mapLabels()) // if the changes affect the map - reinitialize the pie
                         initializePieFromModel();
                 }
+            }
             void QPieSeriesPrivate::insertData(int start, int end)
             {
                 Q_Q(QPieSeries);
+                if (m_mapper) {
                     if (m_mapper->count() != -1 && start >= m_mapper->first() + m_mapper->count()) {
                         return;
                     } else {
                                 q->remove(q->slices().at(i));
                     }
                 }
+            }
             void QPieSeriesPrivate::removeData(int start, int end)
             {
                 Q_Q(QPieSeries);
+                if (m_mapper) {
                     int removedCount = end - start + 1;
                     if (m_mapper->count() != -1 && start >= m_mapper->first() + m_mapper->count()) {
                         return;
                         }
                     }
                 }
-            void QPieSeriesPrivate::setMapping()
-                initializePieFromModel();
-                // connect signals from the model
-                connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelRowsAdded(QModelIndex,int,int)));
-                connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelRowsRemoved(QModelIndex,int,int)));
-                connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelColumnsAdded(QModelIndex,int,int)));
-                connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
-                // connect the signal from the mapper
-                connect(m_mapper, SIGNAL(updated()), this, SLOT(initializePieFromModel()));
             }
             void QPieSeriesPrivate::initializePieFromModel()

src/piechart/qpieseries_p.h 0 -1

                 bool setRealValue(qreal &value, qreal newValue, qreal max, qreal min = 0.0);
             private:
-                void setMapping();
                 void insertData(int start, int end);
                 void removeData(int start, int end);

src/xychart/qxyseries.cpp +23 -17

                 // set new model
                 if (model) {
                     d->m_model = model;
-                    if (d->m_mapper)
+                    emit d->reinitialized();
-                        d->setMapping();
+                    // 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)));
                 } else {
                     d->m_model = 0;
                 }
                 if (mapper) {
                     d->m_mapper = mapper;
-                    if (d->m_model)
+                    emit d->reinitialized();
-                        d->setMapping();
+                    // connect the signal from the mapper
+                    connect(d->m_mapper, SIGNAL(updated()), d, SLOT(mappingUpdated()));
                 } else {
                     d->m_mapper = 0;
                 }
                 return list << new XYLegendMarker(q,legend);
             }
-            void QXYSeriesPrivate::setMapping()
-                // connect signals from the model
-                connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                connect(m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelRowsAdded(QModelIndex,int,int)));
-                connect(m_model,SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelRowsRemoved(QModelIndex,int,int)));
-                connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelColumnsAdded(QModelIndex,int,int)));
-                connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
-                // connect the signal from the mapper
-                connect(m_mapper, SIGNAL(updated()), this, SLOT(mappingUpdated()));
             void QXYSeriesPrivate::mappingUpdated()
             {
+                if (m_model)
                     emit reinitialized();
             }
             void QXYSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
+                if (m_mapper) {
                     for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                         for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                             if (m_mapper->orientation() == Qt::Vertical) {
                         }
                     }
                 }
+            }
             void QXYSeriesPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Vertical)
                         emit pointsAdded(start, end);
                     else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
                         emit reinitialized();
                 }
+            }
             void QXYSeriesPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Vertical)
                         emit pointsRemoved(start, end);
                     else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
                         emit reinitialized();
                 }
+            }
             void QXYSeriesPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Horizontal)
                         emit pointsAdded(start, end);
                     else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
                         emit reinitialized();
                 }
+            }
             void QXYSeriesPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
+                if (m_mapper) {
                     if (m_mapper->orientation() == Qt::Horizontal)
                         emit pointsRemoved(start, end);
                     else if (start <= m_mapper->mapX() || start <= m_mapper->mapY())
                         emit reinitialized();
                 }
+            }
             #include "moc_qxyseries.cpp"
             #include "moc_qxyseries_p.cpp"

src/xychart/qxyseries_p.h 0 -1

                 virtual void mappingUpdated();
             private:
-                void setMapping();
                 void insertData(int start, int end);
                 void removeData(int start, int end);

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