HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r812:2e82e33f659e

combined clicked and rightclicked signals in barchart

sauimone -

r812:2e82e33f659e

parent child

Context file:

r812:2e82e33f659e

Collapse all files

src/barchart/bar.cpp +1 -5

             void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
-                if (event->button() == Qt::LeftButton) {
+                emit clicked(m_category, event->button());
-                    emit clicked(m_category);
-                } else if (event->button() == Qt::RightButton) {
-                    emit rightClicked(m_category);
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)

src/barchart/bar_p.h +1 -2

                 void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
             Q_SIGNALS:
-                void clicked(QString category);
+                void clicked(QString category, Qt::MouseButtons button);
-                void rightClicked(QString category);
                 void hoverEntered(QPoint pos);
                 void hoverLeaved();

src/barchart/barchartitem.cpp +1 -2

                         Bar *bar = new Bar(category,this);
                         childItems().append(bar);
                         m_bars.append(bar);
-                        connect(bar, SIGNAL(clicked(QString)), set, SIGNAL(clicked(QString)));
+                        connect(bar, SIGNAL(clicked(QString,Qt::MouseButtons)), set, SIGNAL(clicked(QString,Qt::MouseButtons)));
-                        connect(bar, SIGNAL(rightClicked(QString)), set, SIGNAL(rightClicked(QString)));
                         connect(bar, SIGNAL(hoverEntered(QPoint)), set, SLOT(barHoverEnterEvent(QPoint)));
                         connect(bar, SIGNAL(hoverLeaved()), set, SLOT(barHoverLeaveEvent()));
                         m_layout.append(QRectF(0, 0, 0, 0));

src/barchart/qbarseries.cpp +6 -17

             /*!
                 Adds a set of bars to series. Takes ownership of \a set.
-                Connects the clicked(QString) and rightClicked(QString) signals
+                Connects the clicked(QString, Qt::MouseButtons) signal
                 of \a set to this series
             */
             void QBarSeries::appendBarSet(QBarSet *set)
             {
                 m_internalModel->appendBarSet(set);
-                connect(set, SIGNAL(clicked(QString)), this, SLOT(barsetClicked(QString)));
+                connect(set, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
-                connect(set, SIGNAL(rightClicked(QString)), this, SLOT(barsetRightClicked(QString)));
                 connect(set, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
                 emit updatedBars();
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesnt delete \a set.
-                Disconnects the clicked(QString) and rightClicked(QString) signals
+                Disconnects the clicked(QString, Qt::MouseButtons) signal
                 of \a set from this series
             */
             void QBarSeries::removeBarSet(QBarSet *set)
             {
-                disconnect(set, SIGNAL(clicked(QString)), this, SLOT(barsetClicked(QString)));
+                disconnect(set, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
-                disconnect(set, SIGNAL(rightClicked(QString)), this, SLOT(barsetRightClicked(QString)));
                 m_internalModel->removeBarSet(set);
                 emit updatedBars();
             }
             /*!
                 \internal \a category
             */
-            void QBarSeries::barsetClicked(QString category)
+            void QBarSeries::barsetClicked(QString category, Qt::MouseButtons button)
             {
-                emit clicked(qobject_cast<QBarSet*>(sender()), category);
+                emit clicked(qobject_cast<QBarSet*>(sender()), category, button);
             }
             /*!
-                \internal \a category
-            */
-            void QBarSeries::barsetRightClicked(QString category)
-                emit rightClicked(qobject_cast<QBarSet*>(sender()), category);
-            /*!
                 \internal
             */
             qreal QBarSeries::min()

src/barchart/qbarseries.h +2 -5

                 // <--- TO PIMPL
             Q_SIGNALS:
-                //void changed(int index);
+                void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);        // Up to user of api, what to do with these signals
-                void clicked(QBarSet *barset, QString category);        // Up to user of api, what to do with these signals
-                void rightClicked(QBarSet *barset, QString category);
                 //
                 void updatedBars();
                 void setToolTipEnabled(bool enabled = true);           // enables tooltips
                 // TODO: TO PIMPL --->
-                void barsetClicked(QString category);
+                void barsetClicked(QString category, Qt::MouseButtons button);
-                void barsetRightClicked(QString category);
                 // <--- TO PIMPL
             private Q_SLOTS:

src/barchart/qbarset.cpp +2 -7

             */
             /*!
-                \fn void QBarSet::clicked(QString category)
+                \fn void QBarSet::clicked(QString category, Qt::MouseButtons button)
                 \brief signals that set has been clicked
                 Parameter \a category describes on which category was clicked
-            */
+                Parameter \a button mouse button
-            /*!
-                \fn void QBarSet::rightClicked(QString category)
-                \brief signals that set has been clicked with right mouse button
-                Parameter \a category describes on which category was clicked
             */
             /*!

src/barchart/qbarset.h +1 -2

                 QPen floatingValuePen() const;
             Q_SIGNALS:
-                void clicked(QString category);                         // Clicked and hover signals exposed to user
+                void clicked(QString category, Qt::MouseButtons button);                         // Clicked and hover signals exposed to user
-                void rightClicked(QString category);
                 void toggleFloatingValues();
                 // TODO: Expose this to user or not?

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