HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2169:04485231feed

fix to example. Event handling prototyping.

sauimone -

r2169:04485231feed

parent child

Context file:

r2169:04485231feed

examples/newlegend/mainwidget.cpp +1 -1

                 QPushButton *disConnectButton = new QPushButton("Disconnect markers");
                 connect(disConnectButton, SIGNAL(clicked()), this, SLOT(disconnectMarkers()));
-                m_buttonLayout->addWidget(connectButton, 8, 0);
+                m_buttonLayout->addWidget(disConnectButton, 9, 0);
                 m_legendPosX = new QDoubleSpinBox();

src/legend/legendmarkeritem.cpp +2 -2

                 m_space(4)
             {
             //    qDebug() << "LegendMarkerItem created for marker:" << m_marker;
-                setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
+            //    setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 m_rectItem->setRect(m_markerRect);
             //    setZValue(zValue() + 20);
             //    qDebug() << "z:" << this->zValue();
                 qDebug() << "LegendMarkerItem::mousePressEvent";
             //    QGraphicsObject::mousePressEvent(event);
                 //TODO: selected signal removed for now
-                emit m_marker->handleMousePressEvent(event);
+                m_marker->handleMousePressEvent(event);
                 QGraphicsItem::mousePressEvent(event);
             }

src/legend/qlegend.cpp +1 -1

                   m_attachedToChart(true),
                   m_backgroundVisible(false)
             {
+                m_items->setHandlesChildEvents(false);
             }
             QLegendPrivate::~QLegendPrivate()

src/legend/qlegendmarker.cpp +5 -2

             #include "legendmarkeritem_p.h"
             #include <QDebug>
             #include <QFontMetrics>
+            #include <QGraphicsSceneEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*
             void QLegendMarkerPrivate::handleMousePressEvent(QGraphicsSceneEvent *event)
             {
-                // Just emit clicked signal for now
+                // Just emit clicked signal for now (our default logic for events)
-                Q_UNUSED(event);
+                // This could propably be on the LegendMarkerItem?
+                // TODO: how to handle scrolling vs clicking? drag event?
+                event->accept();
                 Q_Q(QLegendMarker);
                 emit q->clicked();
             }

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