HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1477:6fa77806900a

Added NOTIFY to XYModelMapper properties

Marek Rosa -

r1477:6fa77806900a

parent child

Context file:

r1477:6fa77806900a

Collapse all files

src/xychart/qhxymodelmapper.cpp +20 -2

             */
             /*!
+                \fn void QHXYModelMapper::xRowChanged()
+                Emitted when the xRow has changed.
+            */
+            /*!
+                \fn void QHXYModelMapper::yRowChanged()
+                Emitted when the yRow has changed.
+            */
+            /*!
                 Constructs a mapper object which is a child of \a parent.
             */
             QHXYModelMapper::QHXYModelMapper(QObject *parent) :
             void QHXYModelMapper::setXRow(int xRow)
             {
-                return QXYModelMapper::setXSection(xRow);
+                if (xRow != xSection()) {
+                    return QXYModelMapper::setXSection(xRow);
+                    emit xRowChanged();
+                }
             }
             int QHXYModelMapper::yRow() const
             void QHXYModelMapper::setYRow(int yRow)
             {
-                return QXYModelMapper::setYSection(yRow);
+                if (yRow != ySection()) {
+                    return QXYModelMapper::setYSection(yRow);
+                    emit yRowChanged();
+                }
             }
             #include "moc_qhxymodelmapper.cpp"

src/xychart/qhxymodelmapper.h +7 -3

             class QTCOMMERCIALCHART_EXPORT QHXYModelMapper : public QXYModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int xRow READ xRow WRITE setXRow)
+                Q_PROPERTY(int xRow READ xRow WRITE setXRow NOTIFY xRowChanged)
-                Q_PROPERTY(int yRow READ yRow WRITE setYRow)
+                Q_PROPERTY(int yRow READ yRow WRITE setYRow NOTIFY yRowChanged)
             public:
                 explicit QHXYModelMapper(QObject *parent = 0);
                 void setXRow(int xRow);
                 int yRow() const;
                 void setYRow(int yRow);
+            Q_SIGNALS:
+                void xRowChanged();
+                void yRowChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qvxymodelmapper.cpp +20 -2

             */
             /*!
+                \fn void QVXYModelMapper::xColumnChanged()
+                Emitted when the xColumn has changed.
+            */
+            /*!
+                \fn void QVXYModelMapper::yColumnChanged()
+                Emitted when the yColumn has changed.
+            */
+            /*!
                 Constructs a mapper object which is a child of \a parent.
             */
             QVXYModelMapper::QVXYModelMapper(QObject *parent) :
             void QVXYModelMapper::setXColumn(int xColumn)
             {
-                return QXYModelMapper::setXSection(xColumn);
+                if (xColumn != xSection()) {
+                    return QXYModelMapper::setXSection(xColumn);
+                    emit xColumnChanged();
+                }
             }
             int QVXYModelMapper::yColumn() const
             void QVXYModelMapper::setYColumn(int yColumn)
             {
-                return QXYModelMapper::setYSection(yColumn);
+                if (yColumn != ySection()) {
+                    return QXYModelMapper::setYSection(yColumn);
+                    emit yColumnChanged();
+                }
             }
             #include "moc_qvxymodelmapper.cpp"

src/xychart/qvxymodelmapper.h +6 -2

             class QTCOMMERCIALCHART_EXPORT QVXYModelMapper : public QXYModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn)
+                Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn NOTIFY xColumnChanged)
-                Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn)
+                Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn NOTIFY yColumnChanged)
             public:
                 explicit QVXYModelMapper(QObject *parent = 0);
                 int yColumn() const;
                 void setYColumn(int yColumn);
+            Q_SIGNALS:
+                void xColumnChanged();
+                void yColumnChanged();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxymodelmapper.cpp +40 -4

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

src/xychart/qxymodelmapper.h +10 -4

             class QTCOMMERCIALCHART_EXPORT QXYModelMapper : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QXYSeries *series READ series WRITE setSeries)
+                Q_PROPERTY(QXYSeries *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:
                 int ySection() const;
                 void setYSection(int ySection);
+            Q_SIGNALS:
+                void seriesReplaced();
+                void modelReplaced();
+                void firstChanged();
+                void countChanged();
             protected:
                 QXYModelMapperPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QXYModelMapper)

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