HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2188:ad6cfe65c3e1

fixed mouse event delta handling

sauimone -

r2188:ad6cfe65c3e1

parent child

Context file:

r2188:ad6cfe65c3e1

Collapse all files

src/legend/legendmarkeritem.cpp +6 -2

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsSimpleTextItem>
             #include <QDebug>
             #include "qlegend.h"
             #include "qlegend_p.h"
             #include "qlegendmarker.h"
             #include "qlegendmarker_p.h"
             #include "legendmarkeritem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             LegendMarkerItem::LegendMarkerItem(QLegendMarkerPrivate *marker, QGraphicsObject *parent) :
                 QGraphicsObject(parent),
                 m_marker(marker),
                 m_markerRect(0,0,10.0,10.0),
                 m_boundingRect(0,0,0,0),
                 m_textItem(new QGraphicsSimpleTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
                 m_margin(4),
                 m_space(4)
             {
                 m_rectItem->setRect(m_markerRect);
             }
             void LegendMarkerItem::setPen(const QPen &pen)
             {
                 m_rectItem->setPen(pen);
             }
             QPen LegendMarkerItem::pen() const
             {
                 return m_rectItem->pen();
             }
             void LegendMarkerItem::setBrush(const QBrush &brush)
             {
                 m_rectItem->setBrush(brush);
             }
             QBrush LegendMarkerItem::brush() const
             {
                 return m_rectItem->brush();
             }
             void LegendMarkerItem::setFont(const QFont &font)
             {
                 m_textItem->setFont(font);
                 QFontMetrics fn(font);
                 m_markerRect = QRectF(0,0,fn.height()/2,fn.height()/2);
                 updateGeometry();
             }
             QFont LegendMarkerItem::font() const
             {
                 return m_textItem->font();
             }
             void LegendMarkerItem::setLabel(const QString label)
             {
                 m_label = label;
                 updateGeometry();
             }
             QString LegendMarkerItem::label() const
             {
                 return m_label;
             }
             void LegendMarkerItem::setLabelBrush(const QBrush &brush)
             {
                 m_textItem->setBrush(brush);
             }
             QBrush LegendMarkerItem::labelBrush() const
             {
                 return m_textItem->brush();
             }
             void LegendMarkerItem::setGeometry(const QRectF& rect)
             {
                 QFontMetrics fn (m_font);
                 int width = rect.width();
                 qreal x = m_margin + m_markerRect.width() +  m_space + m_margin;
                 qreal y = qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin);
                 if (fn.boundingRect(m_label).width() + x > width)
                 {
                     QString string = m_label + "...";
                     while(fn.boundingRect(string).width() + x > width && string.length() > 3)
                         string.remove(string.length() - 4, 1);
                     m_textItem->setText(string);
                 }
                 else
                     m_textItem->setText(m_label);
                 const QRectF& textRect = m_textItem->boundingRect();
                 m_textItem->setPos(x-m_margin,y/2 - textRect.height()/2);
                 m_rectItem->setRect(m_markerRect);
                 m_rectItem->setPos(m_margin,y/2  - m_markerRect.height()/2);
                 prepareGeometryChange();
                 m_boundingRect = QRectF(0,0,x+textRect.width()+m_margin,y);
             }
             QRectF LegendMarkerItem::boundingRect() const
             {
                 return m_boundingRect;
             }
             void LegendMarkerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 Q_UNUSED(painter)
             }
             QSizeF LegendMarkerItem::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(m_textItem->font());
                 QSizeF sh;
                   switch (which) {
                     case Qt::MinimumSize:
                         sh = QSizeF(fn.boundingRect("...").width() + 2*m_margin + m_space +m_markerRect.width(),qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin));
                         break;
                     case Qt::PreferredSize:
                         sh = QSizeF(fn.boundingRect(m_label).width() + 2*m_margin + m_space +m_markerRect.width(),qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin));
                         break;
                     default:
                       break;
                   }
                   return sh;
             }
             void LegendMarkerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 MouseEventHandler::handleMousePressEvent(event);
             }
             void LegendMarkerItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             {
                 MouseEventHandler::handleMouseMoveEvent(event);
             }
             void LegendMarkerItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 MouseEventHandler::handleMouseReleaseEvent(event);
             }
             void LegendMarkerItem::mouseClicked()
             {
                 emit m_marker->q_func()->clicked();
             }
             void LegendMarkerItem::mouseMoved(QPointF delta)
             {
-                m_marker->m_legend->d_ptr->setOffset(-delta.x(), -delta.y());
+                qreal dx = m_marker->m_legend->d_ptr->offset().x() - delta.x();
+                qreal dy = m_marker->m_legend->d_ptr->offset().y() - delta.y();
+                m_marker->m_legend->d_ptr->setOffset(dx, dy);
             }
             void LegendMarkerItem::mouseReleased(QPointF delta)
             {
-                m_marker->m_legend->d_ptr->setOffset(-delta.x(), -delta.y());
+                qreal dx = m_marker->m_legend->d_ptr->offset().x() - delta.x();
+                qreal dy = m_marker->m_legend->d_ptr->offset().y() - delta.y();
+                m_marker->m_legend->d_ptr->setOffset(dx, dy);
             }
             #include "moc_legendmarkeritem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/mouseeventhandler.cpp +7 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "mouseeventhandler_p.h"
             #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             MouseEventHandler::MouseEventHandler() :
-                m_pressedPos(0,0),
+                m_lastPos(0,0),
                 m_state(Idle),
                 m_treshold(10)
             {
             }
             MouseEventHandler::~MouseEventHandler()
             {
             }
             void MouseEventHandler::setMoveTreshold(qreal treshold)
             {
                 m_treshold = treshold;
             }
             void MouseEventHandler::handleMousePressEvent(QGraphicsSceneMouseEvent* event)
             {
-                m_pressedPos = event->pos();
+                m_lastPos = event->screenPos();
                 m_state = Pressed;
                 event->accept();
             }
             void MouseEventHandler::handleMouseMoveEvent(QGraphicsSceneMouseEvent* event)
             {
-                QPointF delta = event->pos() - m_pressedPos;
+                QPointF delta = event->screenPos() - m_lastPos;
                 switch (m_state) {
                 case Pressed: {
                     // calculate treshold. If enough, change to move state and send out move deltas.
                     if (qAbs(delta.x()) > m_treshold || qAbs(delta.y()) > m_treshold) {
                         m_state = Moved;
+                        m_lastPos = event->screenPos();
                         mouseMoved(delta);
                     }
                     event->accept();
                     break;
                 }
                 case Moved: {
+                    m_lastPos = event->screenPos();
                     mouseMoved(delta);
                     event->accept();
                     break;
                 }
                 case Idle:
                 default: {
                     event->ignore();
                     break;
                 }
                 }
             }
             void MouseEventHandler::handleMouseReleaseEvent(QGraphicsSceneMouseEvent* event)
             {
-                QPointF delta = event->pos() - m_pressedPos;
+                QPointF delta = event->screenPos() - m_lastPos;
+                m_lastPos = event->screenPos();
                 switch (m_state) {
                 case Pressed:
                 {
                     m_state = Idle;
                     mouseClicked();
                     event->accept();
                     break;
                 }
                 case Moved:
                 {
                     m_state = Idle;
                     mouseReleased(delta);
                     event->accept();
                     break;
                 }
                 default:
                 {
                     m_state = Idle;
                     event->ignore();
                     break;
                 }
                 }
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/mouseeventhandler_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             /*
                 Purpose of this class is to resolve what happens during MousePress - MouseMove - MouseRelease event chain.
                 Threre can be many MouseMove events and if they all are below our treshold, the result is clicked call.
                 If any move event goes over treshold, result will be many moved(QPointF delta) calls,
                 where delta is calculated from original position.
                 Reason for this is, that legend marker don't know when it should emit clicked and when it should
                 allow legend to scroll. We only get this information when some move goes beyond treshold, but
                 then it will be too late to let the scroller handle events, because marker is already handling.
                 By handling clicked calls in markers and moved calls in scroller, the problem is solved.
                 Derived class descides, should the virtual method be implemented as signal or not.
                 This could be implemented in LegendMarkerItem, but this way the code is reusable and in one place only.
             */
             #ifndef MOUSEEVENTHANDLER_H
             #define MOUSEEVENTHANDLER_H
             #include "qchartglobal.h"
             #include <QBasicTimer>
             #include <QTime>
             #include <QPointF>
             class QGraphicsSceneMouseEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class MouseEventHandler
             {
             public:
                 enum State {
                     Idle,
                     Pressed,
                     Moved,
                     Released
                 };
                 MouseEventHandler();
                 virtual ~MouseEventHandler();
                 void setMoveTreshold(qreal treshold);
                 virtual void mouseClicked() = 0;
                 virtual void mouseMoved(QPointF delta) = 0;
                 virtual void mouseReleased(QPointF delta) = 0;
                 void handleMousePressEvent(QGraphicsSceneMouseEvent* event);
                 void handleMouseMoveEvent(QGraphicsSceneMouseEvent* event);
                 void handleMouseReleaseEvent(QGraphicsSceneMouseEvent* event);
             private:
-                QPointF m_pressedPos;
+                QPointF m_lastPos;
                 State m_state;
                 qreal m_treshold;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // MOUSEEVENTHANDLER_H

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