HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r707:0529e02041c3

Add mousebuttons to pie clicked signals

Jani Honkonen -

r707:0529e02041c3

parent child

Context file:

r707:0529e02041c3

demos/piechartcustomization/main.cpp +4 -2

                     *m_series << new CustomSlice(50.0, "Slice 5");
                     m_chartView->addSeries(m_series);
-                    connect(m_series, SIGNAL(clicked(QPieSlice*)), this, SLOT(handleSliceClicked(QPieSlice*)));
+                    connect(m_series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*, Qt::MouseButtons)));
                     // chart settings
                     m_themeComboBox = new QComboBox();
                     m_slice->setExplodeDistanceFactor(m_sliceExplodedFactor->value());
                 }
-                void handleSliceClicked(QPieSlice* slice)
+                void handleSliceClicked(QPieSlice* slice, Qt::MouseButtons buttons)
                 {
+                    Q_UNUSED(buttons);
                     m_slice = static_cast<CustomSlice*>(slice);
                     // name

examples/piechartdrilldown/main.cpp +2 -2

                     foreach (QString month, months)
                         *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
-                    QObject::connect(series, SIGNAL(clicked(QPieSlice*)), drilldownChart, SLOT(handleSliceClicked(QPieSlice*)));
+                    QObject::connect(series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), drilldownChart, SLOT(handleSliceClicked(QPieSlice*)));
                     *yearSeries << new DrilldownSlice(series->total(), name, series);
                 }
-                QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*)), drilldownChart, SLOT(handleSliceClicked(QPieSlice*)));
+                QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), drilldownChart, SLOT(handleSliceClicked(QPieSlice*)));
                 drilldownChart->changeSeries(yearSeries);

src/piechart/piechartitem.cpp +1 -1

                     PieSliceItem* item = new PieSliceItem(this);
                     m_slices.insert(s, item);
                     connect(s, SIGNAL(changed()), this, SLOT(handleSliceChanged()));
-                    connect(item, SIGNAL(clicked()), s, SIGNAL(clicked()));
+                    connect(item, SIGNAL(clicked(Qt::MouseButtons)), s, SIGNAL(clicked(Qt::MouseButtons)));
                     connect(item, SIGNAL(hoverEnter()), s, SIGNAL(hoverEnter()));
                     connect(item, SIGNAL(hoverLeave()), s, SIGNAL(hoverLeave()));

src/piechart/piesliceitem.cpp +3 -3

                 :QGraphicsObject(parent)
             {
                 setAcceptHoverEvents(true);
-                setAcceptedMouseButtons(Qt::LeftButton);
+                setAcceptedMouseButtons(Qt::MouseButtonMask);
                 setZValue(ChartPresenter::PieSeriesZValue);
             }
                 emit hoverLeave();
             }
-            void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
+            void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit clicked();
+                emit clicked(event->buttons());
             }
             void PieSliceItem::setSliceData(PieSliceData sliceData)

src/piechart/piesliceitem_p.h +1 -1

                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
             Q_SIGNALS:
-                void clicked();
+                void clicked(Qt::MouseButtons buttons);
                 void hoverEnter();
                 void hoverLeave();

src/piechart/qpieseries.cpp +3 -3

                 updateDerivativeData();
             }
-            void QPieSeriesPrivate::sliceClicked()
+            void QPieSeriesPrivate::sliceClicked(Qt::MouseButtons buttons)
             {
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 Q_Q(QPieSeries);
-                emit q->clicked(slice);
+                emit q->clicked(slice, buttons);
             }
             void QPieSeriesPrivate::sliceHoverEnter()
                 foreach (QPieSlice* s, slices) {
                     connect(s, SIGNAL(changed()), d, SLOT(sliceChanged()));
-                    connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
+                    connect(s, SIGNAL(clicked(Qt::MouseButtons)), d, SLOT(sliceClicked(Qt::MouseButtons)));
                     connect(s, SIGNAL(hoverEnter()), d, SLOT(sliceHoverEnter()));
                     connect(s, SIGNAL(hoverLeave()), d, SLOT(sliceHoverLeave()));
                 }

src/piechart/qpieseries.h +1 -1

                 void setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::Orientation orientation = Qt::Vertical);
             Q_SIGNALS:
-                void clicked(QPieSlice* slice);
+                void clicked(QPieSlice* slice, Qt::MouseButtons buttons);
                 void hoverEnter(QPieSlice* slice);
                 void hoverLeave(QPieSlice* slice);
                 void added(QList<QPieSlice*> slices);

src/piechart/qpieseriesprivate_p.h +2 -2

                 void updateDerivativeData();
-            public Q_SLOTS: // TODO: should be private and not visible in the interface at all
+            public Q_SLOTS:
                 void sliceChanged();
-                void sliceClicked();
+                void sliceClicked(Qt::MouseButtons buttons);
                 void sliceHoverEnter();
                 void sliceHoverLeave();
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);

src/piechart/qpieslice.h +1 -1

                 qreal explodeDistanceFactor() const;
             Q_SIGNALS:
-                void clicked();
+                void clicked(Qt::MouseButtons buttons);
                 void hoverEnter();
                 void hoverLeave();
                 void changed();

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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