HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1474:99b2f41bb95e

Added NOTIFY to PieModelMapper class properties

Marek Rosa -

r1474:99b2f41bb95e

parent child

Context file:

r1474:99b2f41bb95e

Collapse all files

src/piechart/qhpiemodelmapper.cpp +8 -2

             */
             void QHPieModelMapper::setValuesRow(int valuesRow)
             {
-                QPieModelMapper::setValuesSection(valuesRow);
+                if (valuesRow != valuesSection()) {
+                    QPieModelMapper::setValuesSection(valuesRow);
+                    emit valuesRowChanged();
+                }
             }
             /*!
             */
             void QHPieModelMapper::setLabelsRow(int labelsRow)
             {
-                QPieModelMapper::setLabelsSection(labelsRow);
+                if (labelsRow != labelsSection()) {
+                    QPieModelMapper::setLabelsSection(labelsRow);
+                    emit labelsRowChanged();
+                }
             }
             #include "moc_qhpiemodelmapper.cpp"

src/piechart/qhpiemodelmapper.h +6 -2

             class QTCOMMERCIALCHART_EXPORT QHPieModelMapper : public QPieModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int valuesRow READ valuesRow WRITE setValuesRow)
+                Q_PROPERTY(int valuesRow READ valuesRow WRITE setValuesRow NOTIFY valuesRowChanged)
-                Q_PROPERTY(int labelsRow READ labelsRow WRITE setLabelsRow)
+                Q_PROPERTY(int labelsRow READ labelsRow WRITE setLabelsRow NOTIFY labelsRowChanged)
             public:
                 explicit QHPieModelMapper(QObject *parent = 0);
                 int labelsRow() const;
                 void setLabelsRow(int labelsRow);
+            Q_SIGNALS:
+                void valuesRowChanged();
+                void labelsRowChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpiemodelmapper.cpp +18 -6

                 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)));
+                emit modelReplaced();
             }
             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*>)));
+                emit seriesReplaced();
             }
             int QPieModelMapper::first() const
             void QPieModelMapper::setFirst(int first)
             {
                 Q_D(QPieModelMapper);
-                d->m_first = qMax(first, 0);
+                if (first != d->m_first) {
-                d->initializePieFromModel();
+                    d->m_first = qMax(first, 0);
+                    d->initializePieFromModel();
+                    emit firstChanged();
+                }
             }
             int QPieModelMapper::count() const
             void QPieModelMapper::setCount(int count)
             {
                 Q_D(QPieModelMapper);
-                d->m_count = qMax(count, -1);
+                if (count != d->m_count) {
-                d->initializePieFromModel();
+                    d->m_count = qMax(count, -1);
+                    d->initializePieFromModel();
+                    emit countChanged();
+                }
             }
             /*!
                         if (valueIndex.isValid() && labelIndex.isValid()) {
                             QPieSlice *slice = new QPieSlice;
                             slice->setValue(m_model->data(valueIndex, Qt::DisplayRole).toDouble());
                             slice->setLabel(m_model->data(labelIndex, Qt::DisplayRole).toString());
                             connect(slice, SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
                             connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                             m_series->insert(i - m_first, slice);
                     slicePos++;
                     valueIndex = valueModelIndex(slicePos);
                     labelIndex = labelModelIndex(slicePos);
+                }
                 blockSeriesSignals(false);
             }

src/piechart/qpiemodelmapper.h +10 -4

             class QTCOMMERCIALCHART_EXPORT QPieModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QPieSeries *series READ series WRITE setSeries)
+                Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
-                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel)
+                Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
-                Q_PROPERTY(int first READ first WRITE setFirst)
+                Q_PROPERTY(int first READ first WRITE setFirst NOTIFY firstChanged)
-                Q_PROPERTY(int count READ count WRITE setCount)
+                Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
                 Q_ENUMS(Qt::Orientation)
             protected:
                 Qt::Orientation orientation() const;
                 void setOrientation(Qt::Orientation orientation);
+            Q_SIGNALS:
+                void seriesReplaced();
+                void modelReplaced();
+                void firstChanged();
+                void countChanged();
             protected:
                 QPieModelMapperPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QPieModelMapper)

src/piechart/qvpiemodelmapper.cpp +8 -2

             */
             void QVPieModelMapper::setValuesColumn(int valuesColumn)
             {
-                QPieModelMapper::setValuesSection(valuesColumn);
+                if (valuesColumn != valuesSection()) {
+                    QPieModelMapper::setValuesSection(valuesColumn);
+                    emit valuesColumnChanged();
+                }
             }
             /*!
             */
             void QVPieModelMapper::setLabelsColumn(int labelsColumn)
             {
-                QPieModelMapper::setLabelsSection(labelsColumn);
+                if (labelsColumn != labelsSection()) {
+                    QPieModelMapper::setLabelsSection(labelsColumn);
+                    emit labelsColumnChanged();
+                }
             }
             #include "moc_qvpiemodelmapper.cpp"

src/piechart/qvpiemodelmapper.h +6 -2

             class QTCOMMERCIALCHART_EXPORT QVPieModelMapper : public QPieModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int valuesColumn READ valuesColumn WRITE setValuesColumn)
+                Q_PROPERTY(int valuesColumn READ valuesColumn WRITE setValuesColumn NOTIFY valuesColumnChanged)
-                Q_PROPERTY(int labelsColumn READ labelsColumn WRITE setLabelsColumn)
+                Q_PROPERTY(int labelsColumn READ labelsColumn WRITE setLabelsColumn NOTIFY labelsColumnChanged)
             public:
                 explicit QVPieModelMapper(QObject *parent = 0);
                 int labelsColumn() const;
                 void setLabelsColumn(int labelsColumn);
+            Q_SIGNALS:
+                void valuesColumnChanged();
+                void labelsColumnChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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