HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2189:4cb139890ac2

Kinetic scrolling is back for legend

sauimone -

r2189:4cb139890ac2

parent child

Context file:

r2189:4cb139890ac2

Collapse all files

src/legend/legendmarkeritem.cpp +7 -9

                 m_textItem(new QGraphicsSimpleTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
                 m_margin(4),
-                m_space(4)
+                m_space(4),
+                m_pressPos(0, 0)
             {
                 m_rectItem->setRect(m_markerRect);
             }
             void LegendMarkerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 MouseEventHandler::handleMousePressEvent(event);
+                m_pressPos = event->screenPos();
             }
             void LegendMarkerItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                 emit m_marker->q_func()->clicked();
             }
-            void LegendMarkerItem::mouseMoved(QPointF delta)
+            void LegendMarkerItem::mouseMoved(const QPointF &delta)
             {
-                qreal dx = m_marker->m_legend->d_ptr->offset().x() - delta.x();
+                m_marker->m_legend->d_ptr->move(delta);
-                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)
+            void LegendMarkerItem::mouseReleased(const QPointF &pos)
             {
-                qreal dx = m_marker->m_legend->d_ptr->offset().x() - delta.x();
+                m_marker->m_legend->d_ptr->release(pos - m_pressPos);
-                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"

src/legend/legendmarkeritem_p.h +4 -2

                 // Filtered callbacks from MouseEventHandler
                 void mouseClicked();
-                void mouseMoved(QPointF delta);
+                void mouseMoved(const QPointF &delta);
-                void mouseReleased(QPointF delta);
+                void mouseReleased(const QPointF &pos);
             protected:
                 QLegendMarkerPrivate *m_marker; // Knows
                 QBrush m_brush;
                 bool m_visible;
+                QPointF m_pressPos;
                 friend class QLegendMarker;
                 friend class QLegendMarkerPrivate;
                 friend class LegendMarkerItem;

src/legend/legendscroller_p.h +2 -9

             #include "qlegend.h"
             #include "qlegend_p.h"
-            #include "scroller_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class LegendScroller: public QLegend, public Scroller
+            class LegendScroller: public QLegend
             {
             public:
                 LegendScroller(QChart *chart): QLegend(chart) { }
-                void setOffset(const QPointF &point) { d_ptr->setOffset(point.x(), point.y()); }
+                void setOffset(const QPointF &point) { d_ptr->setOffset(point); }
                 QPointF offset() const { return d_ptr->offset(); }
-                void mousePressEvent(QGraphicsSceneMouseEvent *event) { Scroller::mousePressEvent(event); }
-                void mouseMoveEvent(QGraphicsSceneMouseEvent *event) { Scroller::mouseMoveEvent(event); }
-                void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Scroller::mouseReleaseEvent(event); }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/mouseeventhandler.cpp +2 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             MouseEventHandler::MouseEventHandler() :
-                m_lastPos(0,0),
+                m_lastPos(0, 0),
                 m_state(Idle),
                 m_treshold(10)
             {
             void MouseEventHandler::handleMouseReleaseEvent(QGraphicsSceneMouseEvent* event)
             {
-                QPointF delta = event->screenPos() - m_lastPos;
                 m_lastPos = event->screenPos();
                 switch (m_state) {
                 case Moved:
                 {
                     m_state = Idle;
-                    mouseReleased(delta);
+                    mouseReleased(m_lastPos);
                     event->accept();
                     break;
                 }

src/legend/mouseeventhandler_p.h +2 -2

                 void setMoveTreshold(qreal treshold);
                 virtual void mouseClicked() = 0;
-                virtual void mouseMoved(QPointF delta) = 0;
+                virtual void mouseMoved(const QPointF &delta) = 0;
-                virtual void mouseReleased(QPointF delta) = 0;
+                virtual void mouseReleased(const QPointF &pos) = 0;
                 void handleMousePressEvent(QGraphicsSceneMouseEvent* event);
                 void handleMouseMoveEvent(QGraphicsSceneMouseEvent* event);

src/legend/qlegend.cpp +2 -2

             }
-            void QLegendPrivate::setOffset(qreal x, qreal y)
+            void QLegendPrivate::setOffset(const QPointF &offset)
             {
-                m_layout->setOffset(x, y);
+                m_layout->setOffset(offset.x(), offset.y());
             }
             QPointF QLegendPrivate::offset() const

src/legend/qlegend_p.h +3 -2

             #define QLEGEND_P_H
             #include "qlegend.h"
+            #include "scroller_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Domain;
             class QLegendMarker;
-            class QLegendPrivate : public QObject
+            class QLegendPrivate : public QObject, public Scroller
             {
                 Q_OBJECT
             public:
                 QLegendPrivate(ChartPresenter *presenter, QChart *chart, QLegend *q);
                 ~QLegendPrivate();
-                void setOffset(qreal x, qreal y);
+                void setOffset(const QPointF &offset);
                 QPointF offset() const;
                 int roundness(qreal size);

src/scroller.cpp +43 -131

@@ -27,9 +27,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27		27
28	Scroller::Scroller()	28	Scroller::Scroller()
29	: m_ticker(this),	29	: m_ticker(this),
30	m_state(Idle),	30	m_timeTresholdMin(50),
31	m_moveThreshold(10),	31	m_timeTresholdMax(300),
32	m_timeTreshold(50)	32	m_state(Idle)
33	{	33	{
34		34
35	}	35	}
@@ -38,146 +38,80 Scroller::~Scroller()
38	{	38	{
39	}	39	}
40		40
41	void Scroller::mousePressEvent(QGraphicsSceneMouseEvent *event)	41	void Scroller::move(const QPointF &delta)
42	{	42	{
43	if (event->button() == Qt::LeftButton) {
44	switch (m_state) {
45	case Idle:
46	m_state = Pressed;
47	m_offset = offset();
48	m_press = event->pos();
49	m_timeStamp = QTime::currentTime();
50	event->accept();
51	break;
52	case Scroll:
53	m_state = Stop;
54	m_speed = QPointF(0, 0);
55	m_offset = offset();
56	m_press = event->pos();
57	event->accept();
58	break;
59	case Pressed:
60	case Move:
61	case Stop:
62	qWarning() << __FUNCTION__ << "Scroller unexpected state" << m_state;
63	event->ignore();
64	break;
65	}
66	}
67	}
68
69	void Scroller::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
70	{
71	QPointF delta = event->pos() - m_press;
72
73	switch (m_state) {	43	switch (m_state) {
74	case Pressed:
75	case Stop:
76	if (qAbs(delta.x()) > m_moveThreshold \|\| qAbs(delta.y()) > m_moveThreshold) {
77	m_state = Move;
78	m_timeStamp = QTime::currentTime();
79	m_distance = QPointF(0, 0);
80	m_press = event->pos();
81	event->accept();
82	} else {
83	event->ignore();
84	}
85	break;
86	case Move:
87	setOffset(m_offset - delta);
88	calculateSpeed(event->pos());
89	event->accept();
90	break;
91	case Idle:	44	case Idle:
		45	m_timeStamp = QTime::currentTime();
		46	m_state = Move;
		47	break;
92	case Scroll:	48	case Scroll:
93	qWarning() << __FUNCTION__ << "Scroller unexpected state" << m_state;	49	stopTicker();
94	event->ignore();	50	m_timeStamp = QTime::currentTime();
		51	m_state = Move;
		52	break;
		53	default:
95	break;	54	break;
96	}	55	}
		56	setOffset(offset() - delta);
97	}	57	}
98		58
99	void Scroller::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)	59	void Scroller::release(const QPointF &delta)
100	{	60	{
101	if (event->button() == Qt::LeftButton) {	61	// Starts scrolling, if at least m_timeTresholdMin msecs has gone since timestamp
		62	// current time is no more than m_timeTresholdMax from timestamp
102		63
103	switch (m_state) {	64	if ((m_timeStamp.elapsed() > m_timeTresholdMin) && (m_timeStamp.msecsTo(QTime::currentTime()) < m_timeTresholdMax)) {
		65	// Release was quick enough. Start scrolling.
		66	// Magic number is to make scroll bit slower (the resolution of screen may affect this)
		67	m_speed = delta / 5;
104		68
105	case Scroll:	69	qreal fraction = qMax(qAbs(m_speed.x()), qAbs(m_speed.y()));
106	m_state = Stop;	70
107	m_speed = QPointF(0, 0);	71	if (!qFuzzyIsNull(fraction)) {
108	m_offset = offset();	72	m_fraction.setX(qAbs(m_speed.x() / fraction));
109	event->accept();	73	m_fraction.setY(qAbs(m_speed.y() / fraction));
110	break;	74	} else {
111	case Pressed:	75	m_fraction.setX(1);
112	m_state = Idle;	76	m_fraction.setY(1);
113	//if (m_timeStamp.elapsed() < m_clickedPressDelay) {
114	//emit clicked(m_offset.toPoint());
115	//}
116	event->accept();
117	break;
118	case Move:
119	calculateSpeed(event->pos());
120	m_offset = offset();
121	m_press = event->pos();
122	if (m_speed == QPointF(0, 0)) {
123	m_state = Idle;
124	} else {
125	m_speed /= 3.75;
126	m_state = Scroll;
127	m_ticker.start(25);
128	}
129	event->accept();
130	break;
131	case Stop:
132	case Idle:
133	qWarning() << __FUNCTION__ << "Scroller unexpected state" << m_state;
134	event->ignore();
135	break;
136	}	77	}
		78	startTicker(25);
		79	m_state = Scroll;
		80	} else {
		81	stopTicker(); // Stop ticker, if one is running.
		82	m_state = Idle;
137	}	83	}
138	}	84	}
139		85
140	void Scroller::scr~~oll~~(~~cons~~t ~~QPointF~~ &~~velocity~~)	86	void Scroller::startTicker(int interval)
141	{	87	{
142	Q_UNUSED(velocity);	88	m_state = Scroll;
143	// TODO:	89	m_ticker.start(interval);
144	/*
145	m_offset = offset();
146	m_speed = velocity;
147	if (m_speed == QPointF(0, 0)) {
148	m_state = Idle;
149	}
150	else {
151	m_speed /= 3.75;
152	m_state = Scroll;
153	m_ticker.start(25);
154	}
155	*/
156	}	90	}
157		91
		92	void Scroller::stopTicker()
		93	{
		94	m_state = Idle;
		95	m_ticker.stop();
		96	}
158		97
159	void Scroller::scrollTick()	98	void Scroller::scrollTick()
160	{	99	{
161	switch (m_state) {	100	switch (m_state) {
162	case Scroll:	101	case Scroll:
163	lowerSpeed(m_speed);	102	lowerSpeed(m_speed);
164	setOffset(m_offset - m_speed);	103	setOffset(offset() - m_speed);
165	m_offset = offset();
166	if (m_speed == QPointF(0, 0)) {	104	if (m_speed == QPointF(0, 0)) {
167	m_state = Idle;	105	m_state = Idle;
168	m_ticker.stop();	106	m_ticker.stop();
169	}	107	}
170	break;	108	break;
171	case Stop:
172	m_ticker.stop();
173	break;
174	case Idle:	109	case Idle:
175	case Move:	110	case Move:
176	case Pressed:
177	qWarning() << __FUNCTION__ << "Scroller unexpected state" << m_state;	111	qWarning() << __FUNCTION__ << "Scroller unexpected state" << m_state;
178	m_ticker.stop();	112	m_ticker.stop();
		113	m_state = Idle;
179	break;	114	break;
180
181	}	115	}
182	}	116	}
183		117
@@ -194,28 +128,6 void Scroller::lowerSpeed(QPointF &speed, qreal maxSpeed)
194	speed.setY(y);	128	speed.setY(y);
195	}	129	}
196		130
197	void Scroller::calculateSpeed(const QPointF &position)
198	{
199	if (m_timeStamp.elapsed() > m_timeTreshold) {
200
201	QPointF distance = position - m_press;
202
203	m_timeStamp = QTime::currentTime();
204	m_speed = distance - m_distance;
205	m_distance = distance;
206
207	qreal fraction = qMax(qAbs(m_speed.x()), qAbs(m_speed.y()));
208
209	if (fraction != 0) {
210	m_fraction.setX(qAbs(m_speed.x() / fraction));
211	m_fraction.setY(qAbs(m_speed.y() / fraction));
212	} else {
213	m_fraction.setX(1);
214	m_fraction.setY(1);
215	}
216	}
217	}
218
219	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	131	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
220		132
221	ScrollTicker::ScrollTicker(Scroller scroller, QObject parent)	133	ScrollTicker::ScrollTicker(Scroller scroller, QObject parent)

src/scroller_p.h +11 -15

             public:
                 enum State {
                     Idle,
-                    Pressed,
                     Move,
-                    Scroll,
+                    Scroll
-                    Stop
                 };
                 Scroller();
                 virtual void setOffset(const QPointF &point) = 0;
                 virtual QPointF offset() const = 0;
-                void scroll(const QPointF& velocity);
+                void move(const QPointF &delta);
+                void release(const QPointF &delta);
-            public:
                 void scrollTick();
-            public:
+            private:
-                void mousePressEvent(QGraphicsSceneMouseEvent *event);
+                void startTicker(int interval);
-                void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+                void stopTicker();
-                void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
             private:
                 void calculateSpeed(const QPointF &position);
             private:
                 ScrollTicker m_ticker;
-                State m_state;
                 QTime m_timeStamp;
-                QPointF m_press;
-                QPointF m_offset;
                 QPointF m_speed;
-                QPointF m_distance;
                 QPointF m_fraction;
-                int m_moveThreshold;
+                int m_timeTresholdMin;
-                int m_timeTreshold;
+                int m_timeTresholdMax;
+                State m_state;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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