HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1008:e02fb893688e

barchart: removed mousebuttons from clicked signal. removed selected signal. unified internal signal naming in barset and barseries private

sauimone -

r1008:e02fb893688e

parent child

Context file:

r1008:e02fb893688e

Collapse all files

examples/stackedbarchartdrilldown/drilldownchart.cpp +1 -1

                 axisY()->setNiceNumbersEnabled(true);
             }
-            void DrilldownChart::handleClicked(QBarSet *barset, QString category, Qt::MouseButtons button)
+            void DrilldownChart::handleClicked(QBarSet *barset, QString category)
             {
                 Q_UNUSED(barset)
                 Q_UNUSED(button)

examples/stackedbarchartdrilldown/drilldownchart.h +1 -1

                 void changeSeries(QAbstractSeries *series);
             public Q_SLOTS:
-                void handleClicked(QBarSet *barset, QString category, Qt::MouseButtons button);
+                void handleClicked(QBarSet *barset, QString category);
             private:
                 QAbstractSeries* m_currentSeries;

examples/stackedbarchartdrilldown/main.cpp +2 -2

                     }
                     // Use right click signal to implement drilldown
-                    QObject::connect(weeklySeries, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)), drilldownChart, SLOT(handleClicked(QBarSet*,QString,Qt::MouseButtons)));
+                    QObject::connect(weeklySeries, SIGNAL(clicked(QBarSet*,QString)), drilldownChart, SLOT(handleClicked(QBarSet*,QString)));
                 }
                 // Enable drilldown from season series using right click.
-                QObject::connect(seasonSeries, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)), drilldownChart, SLOT(handleClicked(QBarSet*,QString,Qt::MouseButtons)));
+                QObject::connect(seasonSeries, SIGNAL(clicked(QBarSet*,QString)), drilldownChart, SLOT(handleClicked(QBarSet*,QString)));
             //! [4]
             //! [5]

src/barchart/bar.cpp +2 -2

             void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit clicked(m_category, event->button());
+                emit clicked(m_category);
-                emit clicked(m_barset, m_category, event->button());
+                emit clicked(m_barset, m_category);
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)

src/barchart/bar_p.h +2 -2

                 void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
             Q_SIGNALS:
-                void clicked(QString category, Qt::MouseButtons button);
+                void clicked(QString category);
-                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
+                void clicked(QBarSet *barset, QString category);
                 void hovered(bool status);
                 void hovered(QBarSet *barset, bool status);

src/barchart/barchartitem.cpp +2 -2

                         QBarSet *set = m_series->d_func()->barsetAt(s);
                         Bar *bar = new Bar(set,category,this);
                         m_bars.append(bar);
-                        connect(bar, SIGNAL(clicked(QString,Qt::MouseButtons)), set, SIGNAL(clicked(QString,Qt::MouseButtons)));
+                        connect(bar, SIGNAL(clicked(QString)), set, SIGNAL(clicked(QString)));
-                        connect(bar, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)), m_series, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)));
+                        connect(bar, SIGNAL(clicked(QBarSet*,QString)), m_series, SIGNAL(clicked(QBarSet*,QString)));
                         connect(bar, SIGNAL(hovered(bool)), set, SIGNAL(hovered(bool)));
                         connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool)));
                         m_layout.append(QRectF(0, 0, 0, 0));

src/barchart/qbarseries.cpp +11 -24

             */
             /*!
-                \fn void QBarSeries::clicked(QBarSet *barset, QString category, Qt::MouseButtons button)
+                \fn void QBarSeries::clicked(QBarSet *barset, QString category)
-                The signal is emitted if the user clicks with a mouse \a button on top of QBarSet \a barset of category \a category
+                The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset of category \a category
                 contained by the series.
             */
             /*!
-                \fn void QBarSeries::selected()
-                The signal is emitted if the user selects/deselects the series. The logic for storing selections should be
-                implemented by the user of QBarSeries API.
-            */
-            /*!
                 \fn void QBarSeries::hovered(QBarSet* barset, bool status)
                 The signal is emitted if mouse is hovered on top of series.
             /*!
                 Adds a set of bars to series. Takes ownership of \a set.
-                Connects the clicked(QString, Qt::MouseButtons) signal
-                of \a set to this series
             */
             void QBarSeries::appendBarSet(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 d->m_barSets.append(set);
-                QObject::connect(set->d_ptr.data(), SIGNAL(valueChanged()), d, SLOT(barsetChanged()));
+                QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
                 emit d->restructuredBars();
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
-                Disconnects the clicked(QString, Qt::MouseButtons) signal
-                of \a set from this series
             */
             void QBarSeries::removeBarSet(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 if (d->m_barSets.contains(set)) {
                     d->m_barSets.removeOne(set);
+                    QObject::disconnect(set, SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
                     emit d->restructuredBars();
                 }
             }
             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
-                Connects the clicked(QString, Qt::MouseButtons) signals
-                of \a sets to this series
             */
             void QBarSeries::appendBarSets(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
-                foreach (QBarSet* barset, sets) {
+                foreach (QBarSet* set, sets) {
-                    d->m_barSets.append(barset);
+                    d->m_barSets.append(set);
-                    QObject::connect(barset, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
+                    QObject::connect(set, SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
                 }
                 emit d->restructuredBars();
             }
             /*!
                 Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
-                Disconnects the clicked(QString, Qt::MouseButtons) signal
-                of \a sets from this series
             */
             void QBarSeries::removeBarSets(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
-                foreach (QBarSet* barset, sets) {
+                foreach (QBarSet* set, sets) {
-                    if (d->m_barSets.contains(barset)) {
+                    if (d->m_barSets.contains(set)) {
-                        d->m_barSets.removeOne(barset);
+                        d->m_barSets.removeOne(set);
+                        QObject::disconnect(set, SIGNAL(updatedBars()), this, SLOT(barsetChanged()));
                     }
                 }
                 emit d->restructuredBars();

src/barchart/qbarseries.h +1 -2

                 explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0);
             Q_SIGNALS:
-                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
+                void clicked(QBarSet *barset, QString category);
-                void selected();
                 void hovered(QBarSet* barset, bool status);
             protected:

src/barchart/qbarseries_p.h +1 -2

                 qreal maxCategorySum();
             Q_SIGNALS:
-                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
+                void clicked(QBarSet *barset, QString category);
-                void selected();
                 void updatedBars();
                 void restructuredBars();

src/barchart/qbarset.cpp +10 -14

             */
             /*!
-                \fn void QBarSet::clicked(QString category, Qt::MouseButtons button)
+                \fn void QBarSet::clicked(QString category)
                 \brief signals that set has been clicked
                 Parameter \a category describes on which category was clicked
-                Parameter \a button mouse button
-            */
-            /*!
-                \fn void QBarSet::selected()
-                \brief signals that set has been selected
             */
             /*!
             void QBarSet::append(const qreal value)
             {
                 d_ptr->m_values.append(value);
-                emit d_ptr->structureChanged();
+                emit d_ptr->restructuredBars();
             }
             /*!
             void QBarSet::insert(const int index, const qreal value)
             {
                 d_ptr->m_values.insert(index, value);
+                emit d_ptr->updatedBars();
             }
             /*!
             void QBarSet::remove(const int index)
             {
                 d_ptr->m_values.removeAt(index);
+                emit d_ptr->updatedBars();
             }
             /*!
             void QBarSet::replace(const int index, const qreal value)
             {
                 d_ptr->m_values.replace(index,value);
-                emit d_ptr->valueChanged();
+                emit d_ptr->updatedBars();
             }
             /*!
             {
                   if(d_ptr->m_pen!=pen){
                       d_ptr->m_pen = pen;
-                      emit d_ptr->valueChanged();
+                      emit d_ptr->updatedBars();
                   }
             }
             {
                 if(d_ptr->m_brush!=brush){
                   d_ptr->m_brush = brush;
-                  emit d_ptr->valueChanged();
+                  emit d_ptr->updatedBars();
                 }
             }
             {
                 if(d_ptr->m_labelPen!=pen){
                     d_ptr->m_labelPen = pen;
-                    emit d_ptr->valueChanged();
+                    emit d_ptr->updatedBars();
                 }
             }
             {
                 if(d_ptr->m_labelBrush!=brush){
                     d_ptr->m_labelBrush = brush;
-                    emit d_ptr->valueChanged();
+                    emit d_ptr->updatedBars();
                 }
             }
             {
                 if(d_ptr->m_labelFont!=font) {
                     d_ptr->m_labelFont = font;
-                    emit d_ptr->valueChanged();
+                    emit d_ptr->updatedBars();
                 }
             }

src/barchart/qbarset.h +1 -2

                 bool labelsVisible() const;
             Q_SIGNALS:
-                void clicked(QString category, Qt::MouseButtons button);
+                void clicked(QString category);
-                void selected();
                 void hovered(bool status);
             private:

src/barchart/qbarset_p.h +3 -3

                 ~QBarSetPrivate();
             Q_SIGNALS:
-                void clicked(QString category, Qt::MouseButtons button);
+                void clicked(QString category);
-                void structureChanged();
+                void restructuredBars();
-                void valueChanged();
+                void updatedBars();
                 void labelsVisibleChanged(bool visible);
             public:

src/legend/legendmarker.cpp +1 -1

             m_barset(barset)
             {
                 QObject::connect(this, SIGNAL(selected()),barseries, SIGNAL(selected()));
-                QObject::connect(barset->d_ptr.data(), SIGNAL(valueChanged()), this, SLOT(updated()));
+                QObject::connect(barset->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(updated()));
                 updated();
             }

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