HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1478:6ccf26849c06

Added NOTIFY to BarModelMapper properties

Marek Rosa -

r1478:6ccf26849c06

parent child

Context file:

r1478:6ccf26849c06

Collapse all files

src/barchart/qbarmodelmapper.cpp +40 -4

             */
             /*!
+                \fn void QBarModelMapper::seriesReplaced()
+                Emitted when the series to which mapper is connected to has changed.
+            */
+            /*!
+                \fn void QBarModelMapper::modelReplaced()
+                Emitted when the model to which mapper is connected to has changed.
+            */
+            /*!
+                \fn void QBarModelMapper::firstChanged()
+                Emitted when the value for the first has changed.
+            */
+            /*!
+                \fn void QBarModelMapper::countChanged()
+                Emitted when the value for the count has changed.
+            */
+            /*!
                 Constructs a mapper object which is a child of \a parent.
             */
             QBarModelMapper::QBarModelMapper(QObject *parent) :
                 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();
             }
             QBarSeries* 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*>)));
+                emit seriesReplaced();
             }
             int QBarModelMapper::first() const
             void QBarModelMapper::setFirst(int first)
             {
                 Q_D(QBarModelMapper);
-                d->m_first = qMax(first, 0);
+                if (first != d->m_first) {
-                d->initializeBarFromModel();
+                    d->m_first = qMax(first, 0);
+                    d->initializeBarFromModel();
+                    emit firstChanged();
+                }
             }
             int QBarModelMapper::count() const
             void QBarModelMapper::setCount(int count)
             {
                 Q_D(QBarModelMapper);
-                d->m_count = qMax(count, -1);
+                if (count != d->m_count) {
-                d->initializeBarFromModel();
+                    d->m_count = qMax(count, -1);
+                    d->initializeBarFromModel();
+                    emit countChanged();
+                }
             }
             /*!

src/barchart/qbarmodelmapper.h +10 -4

             class QTCOMMERCIALCHART_EXPORT QBarModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QBarSeries *series READ series WRITE setSeries)
+                Q_PROPERTY(QBarSeries *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:
                 QBarModelMapperPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QBarModelMapper)

src/barchart/qhbarmodelmapper.cpp +20 -2

             */
             /*!
+                \fn void QHBarModelMapper::firstBarSetRowChanged()
+                Emitted when the firstBarSetRow has changed.
+            */
+            /*!
+                \fn void QHBarModelMapper::lastBarSetRowChanged()
+                Emitted when the lastBarSetRow has changed.
+            */
+            /*!
                 Constructs a mapper object which is a child of \a parent.
             */
             QHBarModelMapper::QHBarModelMapper(QObject *parent) :
             void QHBarModelMapper::setFirstBarSetRow(int firstBarSetRow)
             {
-                return QBarModelMapper::setFirstBarSetSection(firstBarSetRow);
+                if (firstBarSetRow != firstBarSetSection()) {
+                    return QBarModelMapper::setFirstBarSetSection(firstBarSetRow);
+                    emit firstBarSetRowChanged();
+                }
             }
             int QHBarModelMapper::lastBarSetRow() const
             void QHBarModelMapper::setLastBarSetRow(int lastBarSetRow)
             {
-                return QBarModelMapper::setLastBarSetSection(lastBarSetRow);
+                if (lastBarSetRow != lastBarSetSection()) {
+                    return QBarModelMapper::setLastBarSetSection(lastBarSetRow);
+                    emit lastBarSetRowChanged();
+                }
             }
             #include "moc_qhbarmodelmapper.cpp"

src/barchart/qhbarmodelmapper.h +6 -2

             class QTCOMMERCIALCHART_EXPORT QHBarModelMapper : public QBarModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow)
+                Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow NOTIFY firstBarSetRowChanged)
-                Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow)
+                Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow NOTIFY lastBarSetRowChanged)
             public:
                 explicit QHBarModelMapper(QObject *parent = 0);
                 int lastBarSetRow() const;
                 void setLastBarSetRow(int lastBarSetRow);
+            Q_SIGNALS:
+                void firstBarSetRowChanged();
+                void lastBarSetRowChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qvbarmodelmapper.cpp +20 -2

             */
             /*!
+                \fn void QVBarModelMapper::firstBarSetColumnChanged()
+                Emitted when the firstBarSetColumn has changed.
+            */
+            /*!
+                \fn void QVBarModelMapper::lastBarSetColumnChanged()
+                Emitted when the lastBarSetColumn has changed.
+            */
+            /*!
                 Constructs a mapper object which is a child of \a parent.
             */
             QVBarModelMapper::QVBarModelMapper(QObject *parent) :
             void QVBarModelMapper::setFirstBarSetColumn(int firstBarSetColumn)
             {
-                return QBarModelMapper::setFirstBarSetSection(firstBarSetColumn);
+                if (firstBarSetColumn != firstBarSetSection()) {
+                    return QBarModelMapper::setFirstBarSetSection(firstBarSetColumn);
+                    emit firstBarSetColumnChanged();
+                }
             }
             int QVBarModelMapper::lastBarSetColumn() const
             void QVBarModelMapper::setLastBarSetColumn(int lastBarSetColumn)
             {
-                return QBarModelMapper::setLastBarSetSection(lastBarSetColumn);
+                if (lastBarSetColumn != lastBarSetSection()) {
+                    return QBarModelMapper::setLastBarSetSection(lastBarSetColumn);
+                    emit lastBarSetColumnChanged();
+                }
             }
             #include "moc_qvbarmodelmapper.cpp"

src/barchart/qvbarmodelmapper.h +6 -2

             class QTCOMMERCIALCHART_EXPORT QVBarModelMapper : public QBarModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn)
+                Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn NOTIFY firstBarSetColumnChanged)
-                Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn)
+                Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn NOTIFY lastBarSetColumnChanged)
             public:
                 explicit QVBarModelMapper(QObject *parent = 0);
                 int lastBarSetColumn() const;
                 void setLastBarSetColumn(int lastBarSetColumn);
+            Q_SIGNALS:
+                void firstBarSetColumnChanged();
+                void lastBarSetColumnChanged();
             };
             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