HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1656:449d9eb6f2f2

Model mappers now connected to series and model destroy signals

Marek Rosa -

r1656:449d9eb6f2f2

parent child

Context file:

r1656:449d9eb6f2f2

Collapse all files

src/barchart/qbarmodelmapper.cpp +12 0

                 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)));
+                connect(d->m_model, SIGNAL(destroyed()), d, SLOT(handleModelDestroyed()));
             }
             QAbstractBarSeries* QBarModelMapper::series() const
                 // connect the signals from the series
                 connect(d->m_series, SIGNAL(barsetsAdded(QList<QBarSet*>)), d, SLOT(barSetsAdded(QList<QBarSet*>)));
                 connect(d->m_series, SIGNAL(barsetsRemoved(QList<QBarSet*>)), d, SLOT(barSetsRemoved(QList<QBarSet*>)));
+                connect(d->m_series, SIGNAL(destroyed()), d, SLOT(handleSeriesDestroyed()));
             }
             /*!
                     return m_model->index(barSection, posInBar + m_first);
             }
+            void QBarModelMapperPrivate::handleSeriesDestroyed()
+            {
+                m_series = 0;
+            }
             void QBarModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 Q_UNUSED(topLeft)
                 blockSeriesSignals(false);
             }
+            void QBarModelMapperPrivate::handleModelDestroyed()
+            {
+                m_model = 0;
+            }
             void QBarModelMapperPrivate::insertData(int start, int end)
             {
                 Q_UNUSED(end)

src/barchart/qbarmodelmapper_p.h +2 0

                 void modelRowsRemoved(QModelIndex parent, int start, int end);
                 void modelColumnsAdded(QModelIndex parent, int start, int end);
                 void modelColumnsRemoved(QModelIndex parent, int start, int end);
+                void handleModelDestroyed();
                 // for the series
                 void barSetsAdded(QList<QBarSet*> sets);
                 void valuesRemoved(int index, int count);
                 void barLabelChanged();
                 void barValueChanged(int index);
+                void handleSeriesDestroyed();
                 void initializeBarFromModel();

src/piechart/qpiemodelmapper.cpp +12 0

                 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)));
+                connect(d->m_model, SIGNAL(destroyed()), d, SLOT(handleModelDestroyed()));
             }
             QPieSeries* QPieModelMapper::series() const
                 // 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_series, SIGNAL(destroyed()), d, SLOT(handleSeriesDestroyed()));
             }
             /*!
                 blockModelSignals(false);
             }
+            void QPieModelMapperPrivate::handleSeriesDestroyed()
+            {
+                m_series = 0;
+            }
             void QPieModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 if (m_model == 0 || m_series == 0)
                 blockSeriesSignals(false);
             }
+            void QPieModelMapperPrivate::handleModelDestroyed()
+            {
+                m_model = 0;
+            }
             void QPieModelMapperPrivate::insertData(int start, int end)
             {
                 if (m_model == 0 || m_series == 0)

src/piechart/qpiemodelmapper_p.h +2 0

                 void modelRowsRemoved(QModelIndex parent, int start, int end);
                 void modelColumnsAdded(QModelIndex parent, int start, int end);
                 void modelColumnsRemoved(QModelIndex parent, int start, int end);
+                void handleModelDestroyed();
                 // for the series
                 void slicesAdded(QList<QPieSlice*> slices);
                 void slicesRemoved(QList<QPieSlice*> slices);
                 void sliceLabelChanged();
                 void sliceValueChanged();
+                void handleSeriesDestroyed();
                 void initializePieFromModel();

src/xychart/qxymodelmapper.cpp +12 0

                 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)));
+                connect(d->m_model, SIGNAL(destroyed()), d, SLOT(handleModelDestroyed()));
             }
             /*!
                 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)));
+                connect(d->m_series, SIGNAL(destroyed()), d, SLOT(handleSeriesDestroyed()));
             }
             /*!
                 blockModelSignals(false);
             }
+            void QXYModelMapperPrivate::handleSeriesDestroyed()
+            {
+                m_series = 0;
+            }
             void QXYModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 if (m_model == 0 || m_series == 0)
                 blockSeriesSignals(false);
             }
+            void QXYModelMapperPrivate::handleModelDestroyed()
+            {
+                m_model = 0;
+            }
             void QXYModelMapperPrivate::insertData(int start, int end)
             {
                 if (m_model == 0 || m_series == 0)

src/xychart/qxymodelmapper_p.h +2 0

                 void modelRowsRemoved(QModelIndex parent, int start, int end);
                 void modelColumnsAdded(QModelIndex parent, int start, int end);
                 void modelColumnsRemoved(QModelIndex parent, int start, int end);
+                void handleModelDestroyed();
                 // for the series
                 void handlePointAdded(int pointPos);
                 void handlePointRemoved(int pointPos);
                 void handlePointReplaced(int pointPos);
+                void handleSeriesDestroyed();
                 void initializeXYFromModel();

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