##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Linechartitem fix: drawing points
Marek Rosa -
r2259:8bb0a5119ae2
parent child
Show More
Side by Side Unified
Context file:
r2259:8bb0a5119ae2 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,152 +1,153
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2012 Digia Plc
3 ** Copyright (C) 2012 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Commercial Charts Add-on.
7 ** This file is part of the Qt Commercial Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Commercial licenses may use this file in
10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 ** accordance with the Qt Commercial License Agreement provided with the
11 ** accordance with the Qt Commercial License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "linechartitem_p.h"
21 #include "linechartitem_p.h"
22 #include "qlineseries.h"
22 #include "qlineseries.h"
23 #include "qlineseries_p.h"
23 #include "qlineseries_p.h"
24 #include "chartpresenter_p.h"
24 #include "chartpresenter_p.h"
25 #include <QPainter>
25 #include <QPainter>
26 #include <QGraphicsSceneMouseEvent>
26 #include <QGraphicsSceneMouseEvent>
27
27
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29
29
30 const qreal mouseEventMinWidth(12);
30 const qreal mouseEventMinWidth(12);
31
31
32 LineChartItem::LineChartItem(QLineSeries *series, ChartPresenter *presenter)
32 LineChartItem::LineChartItem(QLineSeries *series, ChartPresenter *presenter)
33 : XYChart(series, presenter),
33 : XYChart(series, presenter),
34 QGraphicsItem(presenter ? presenter->rootItem() : 0),
34 QGraphicsItem(presenter ? presenter->rootItem() : 0),
35 m_series(series),
35 m_series(series),
36 m_pointsVisible(false)
36 m_pointsVisible(false)
37 {
37 {
38 setAcceptHoverEvents(true);
38 setAcceptHoverEvents(true);
39 setZValue(ChartPresenter::LineChartZValue);
39 setZValue(ChartPresenter::LineChartZValue);
40 QObject::connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
40 QObject::connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
41 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
41 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
42 QObject::connect(series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));
42 QObject::connect(series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));
43 handleUpdated();
43 handleUpdated();
44 }
44 }
45
45
46 QRectF LineChartItem::boundingRect() const
46 QRectF LineChartItem::boundingRect() const
47 {
47 {
48 return m_rect;
48 return m_rect;
49 }
49 }
50
50
51 QPainterPath LineChartItem::shape() const
51 QPainterPath LineChartItem::shape() const
52 {
52 {
53 return m_path;
53 return m_path;
54 }
54 }
55
55
56 void LineChartItem::updateGeometry()
56 void LineChartItem::updateGeometry()
57 {
57 {
58 m_points = geometryPoints();
58 m_points = geometryPoints();
59
59
60 if (m_points.size() == 0) {
60 if (m_points.size() == 0) {
61 prepareGeometryChange();
61 prepareGeometryChange();
62 m_path = QPainterPath();
62 m_path = QPainterPath();
63 m_rect = QRect();
63 m_rect = QRect();
64 return;
64 return;
65 }
65 }
66
66
67 QPainterPath linePath(m_points.at(0));
67 QPainterPath linePath(m_points.at(0));
68
68
69 if (m_pointsVisible) {
69 if (m_pointsVisible) {
70
70
71 int size = m_linePen.width();
71 int size = m_linePen.width();
72 linePath.addEllipse(m_points.at(0), size, size);
72 linePath.addEllipse(m_points.at(0), size, size);
73 for (int i = 1; i < m_points.size(); i++) {
73 for (int i = 1; i < m_points.size(); i++) {
74 linePath.lineTo(m_points.at(i));
74 linePath.lineTo(m_points.at(i));
75 linePath.addEllipse(m_points.at(i), size, size);
75 linePath.addEllipse(m_points.at(i), size, size);
76 linePath.moveTo(m_points.at(i));
76 }
77 }
77
78
78 } else {
79 } else {
79 for (int i = 1; i < m_points.size(); i++)
80 for (int i = 1; i < m_points.size(); i++)
80 linePath.lineTo(m_points.at(i));
81 linePath.lineTo(m_points.at(i));
81 }
82 }
82
83
83 m_linePath = linePath;
84 m_linePath = linePath;
84
85
85 QPainterPathStroker stroker;
86 QPainterPathStroker stroker;
86 // QPainter::drawLine does not respect join styles, for example BevelJoin becomes MiterJoin.
87 // QPainter::drawLine does not respect join styles, for example BevelJoin becomes MiterJoin.
87 // This is why we are prepared for the "worst case" scenario, i.e. use always MiterJoin and
88 // This is why we are prepared for the "worst case" scenario, i.e. use always MiterJoin and
88 // multiply line width with square root of two when defining shape and bounding rectangle.
89 // multiply line width with square root of two when defining shape and bounding rectangle.
89 stroker.setWidth(m_linePen.width() * 1.42);
90 stroker.setWidth(m_linePen.width() * 1.42);
90 stroker.setJoinStyle(Qt::MiterJoin);
91 stroker.setJoinStyle(Qt::MiterJoin);
91 stroker.setCapStyle(Qt::SquareCap);
92 stroker.setCapStyle(Qt::SquareCap);
92 stroker.setMiterLimit(m_linePen.miterLimit());
93 stroker.setMiterLimit(m_linePen.miterLimit());
93
94
94 prepareGeometryChange();
95 prepareGeometryChange();
95
96
96 m_path = stroker.createStroke(linePath);
97 m_path = stroker.createStroke(linePath);
97 m_rect = m_path.boundingRect();
98 m_rect = m_path.boundingRect();
98
99
99 setPos(origin());
100 setPos(origin());
100 }
101 }
101
102
102 void LineChartItem::handleUpdated()
103 void LineChartItem::handleUpdated()
103 {
104 {
104 setVisible(m_series->isVisible());
105 setVisible(m_series->isVisible());
105 setOpacity(m_series->opacity());
106 setOpacity(m_series->opacity());
106 m_pointsVisible = m_series->pointsVisible();
107 m_pointsVisible = m_series->pointsVisible();
107 m_linePen = m_series->pen();
108 m_linePen = m_series->pen();
108 update();
109 update();
109 }
110 }
110
111
111 void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
112 void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
112 {
113 {
113 Q_UNUSED(widget)
114 Q_UNUSED(widget)
114 Q_UNUSED(option)
115 Q_UNUSED(option)
115
116
116 painter->save();
117 painter->save();
117 painter->setPen(m_linePen);
118 painter->setPen(m_linePen);
118 painter->setBrush(m_linePen.color());
119 painter->setBrush(m_linePen.color());
119 painter->setClipRect(clipRect());
120 painter->setClipRect(clipRect());
120
121
121 if (m_pointsVisible) {
122 if (m_pointsVisible) {
122 painter->drawPath(m_linePath);
123 painter->drawPath(m_linePath);
123 } else {
124 } else {
124 for (int i(1); i < m_points.size(); i++)
125 for (int i(1); i < m_points.size(); i++)
125 painter->drawLine(m_points.at(i - 1), m_points.at(i));
126 painter->drawLine(m_points.at(i - 1), m_points.at(i));
126 }
127 }
127 painter->restore();
128 painter->restore();
128 }
129 }
129
130
130 void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
131 void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
131 {
132 {
132 emit XYChart::clicked(calculateDomainPoint(event->pos()));
133 emit XYChart::clicked(calculateDomainPoint(event->pos()));
133 QGraphicsItem::mousePressEvent(event);
134 QGraphicsItem::mousePressEvent(event);
134 }
135 }
135
136
136 void LineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
137 void LineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
137 {
138 {
138 emit XYChart::hovered(calculateDomainPoint(event->pos()), true);
139 emit XYChart::hovered(calculateDomainPoint(event->pos()), true);
139 event->accept();
140 event->accept();
140 // QGraphicsItem::hoverEnterEvent(event);
141 // QGraphicsItem::hoverEnterEvent(event);
141 }
142 }
142
143
143 void LineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
144 void LineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
144 {
145 {
145 emit XYChart::hovered(calculateDomainPoint(event->pos()), false);
146 emit XYChart::hovered(calculateDomainPoint(event->pos()), false);
146 event->accept();
147 event->accept();
147 // QGraphicsItem::hoverEnterEvent(event);
148 // QGraphicsItem::hoverEnterEvent(event);
148 }
149 }
149
150
150 #include "moc_linechartitem_p.cpp"
151 #include "moc_linechartitem_p.cpp"
151
152
152 QTCOMMERCIALCHART_END_NAMESPACE
153 QTCOMMERCIALCHART_END_NAMESPACE
General Comments 0
You need to be logged in to leave comments. Login now