HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r790:68c6a254cbfa

Fix attempt to wrong graphics items hadnling

Michal Klocek -

r790:68c6a254cbfa

parent child

Context file:

r790:68c6a254cbfa

Collapse all files

src/legendscrollbutton.cpp +7 -4

             #include "legendscrollbutton_p.h"
+            #include "qlegend.h"
             #include <QGraphicsSceneEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            LegendScrollButton::LegendScrollButton(ScrollButtonId id, QGraphicsItem *parent)
+            LegendScrollButton::LegendScrollButton(ScrollButtonId id, QLegend *legend)
-                : QGraphicsPolygonItem(parent)
+                : QGraphicsPolygonItem(legend),
-                ,m_id(id)
+                m_id(id),
+                m_ledgend(legend)
             {
                 setAcceptedMouseButtons(Qt::LeftButton);
             }
             void LegendScrollButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
-                emit clicked(event);
+                Q_UNUSED(event);
+                m_ledgend->scrollButtonClicked(this);
             }
             #include "moc_legendscrollbutton_p.cpp"

src/legendscrollbutton_p.h +5 -9

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class LegendScrollButton : public QObject, public QGraphicsPolygonItem
+            class QLegend;
+            class LegendScrollButton : public QGraphicsPolygonItem
             {
-                Q_OBJECT
             public:
                 enum ScrollButtonId {
                     ScrollButtonIdLeft,
                     ScrollButtonIdDown
                 };
-                explicit LegendScrollButton(ScrollButtonId id, QGraphicsItem *parent = 0);
+                explicit LegendScrollButton(ScrollButtonId id, QLegend *legend);
                 ScrollButtonId id();
                 virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-            Q_SIGNALS:
-                void clicked(QGraphicsSceneMouseEvent* event);
-            public Q_SLOTS:
             private:
                 ScrollButtonId m_id;
+                QLegend *m_ledgend;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +1 0

             protected:
                 QScopedPointer<QChartPrivate> d_ptr;
                 friend class QChartView;
+                friend class QLegend;
                 Q_DISABLE_COPY(QChart)
             };

src/qlegend.cpp +4 -17

-            #include "qchartglobal.h"
             #include "qlegend.h"
+            #include "qchart_p.h"
             #include "qseries.h"
             #include "legendmarker_p.h"
             #include "legendscrollbutton_p.h"
             /*!
                 Constructs the legend object and sets the parent to \a parent
             */
-            QLegend::QLegend(QGraphicsItem *parent) : QGraphicsObject(parent),
+            QLegend::QLegend(QChart *chart):QGraphicsWidget(chart->d_ptr->m_presenter->rootItem()),
                 m_margin(5),
                 m_pos(0,0),
                 m_minimumSize(50,20),                // TODO: magic numbers
                 m_scrollButtonRight = new LegendScrollButton(LegendScrollButton::ScrollButtonIdRight, this);
                 m_scrollButtonUp = new LegendScrollButton(LegendScrollButton::ScrollButtonIdUp, this);
                 m_scrollButtonDown = new LegendScrollButton(LegendScrollButton::ScrollButtonIdDown, this);
-                connect(m_scrollButtonLeft, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
-                        this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
-                connect(m_scrollButtonRight, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
-                        this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
-                connect(m_scrollButtonUp, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
-                        this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
-                connect(m_scrollButtonDown, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
-                        this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
                 setZValue(ChartPresenter::LegendZValue);
             }
             /*!
                 \internal \a event Handles clicked signals from scroll buttons
             */
-            void QLegend::handleScrollButtonClicked(QGraphicsSceneMouseEvent *event)
+            void QLegend::scrollButtonClicked(LegendScrollButton *scrollButton)
             {
-                Q_UNUSED(event);    // Maybe later something happens with right click...
+                 Q_ASSERT(scrollButton);
-                LegendScrollButton* scrollButton = static_cast<LegendScrollButton *> (sender());
-                Q_ASSERT(scrollButton);
                 switch (scrollButton->id()) {
                 case LegendScrollButton::ScrollButtonIdLeft:

src/qlegend.h +11 -6

             #ifndef QLEGEND_H
             #define QLEGEND_H
-            #include <qchartglobal.h>
+            #include <QChartGlobal>
-            #include <QGraphicsObject>
+            #include <QGraphicsWidget>
             #include <QPen>
             #include <QBrush>
             class QPieSeries;
             class LegendScrollButton;
             class QSeries;
+            class QChart;
             // TODO: This as widget
-            class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsObject
+            class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                     LayoutLeft = Qt::AlignLeft,
                     LayoutRight = Qt::AlignRight
                 };
+            private:
+                explicit QLegend(QChart *chart);
-                explicit QLegend(QGraphicsItem *parent = 0);
+            public:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
                 void setSize(const QSizeF size);
                 void setPos(const QPointF &pos);
+                void scrollButtonClicked(LegendScrollButton *scrollButton);
             Q_SIGNALS:
                 // for interactions.
                 void clicked(QSeries *series, Qt::MouseButton button);
                 void handleAdded(QList<QPieSlice *> slices);
                 void handleRemoved(QList<QPieSlice *> slices);
                 void handleMarkerDestroyed();
-                void handleScrollButtonClicked(QGraphicsSceneMouseEvent *event);
                 // PIMPL <---
             private:
                 LegendScrollButton *m_scrollButtonUp;
                 LegendScrollButton *m_scrollButtonDown;
+                friend class QChart;
                 // <--- PIMPL
             };

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