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

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

Fix lineseries points related drawing problems...
Miikka Heikkinen -
r2451:a5b974d85d04
parent child
Show More
Side by Side Unified
Context file:
r2451:a5b974d85d04 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,151 +1,160
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2013 Digia Plc
3 ** Copyright (C) 2013 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 "abstractdomain_p.h"
25 #include "abstractdomain_p.h"
26 #include <QPainter>
26 #include <QPainter>
27 #include <QGraphicsSceneMouseEvent>
27 #include <QGraphicsSceneMouseEvent>
28
28
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30
30
31 const qreal mouseEventMinWidth(12);
31 const qreal mouseEventMinWidth(12);
32
32
33 LineChartItem::LineChartItem(QLineSeries *series,QGraphicsItem* item)
33 LineChartItem::LineChartItem(QLineSeries *series,QGraphicsItem* item)
34 : XYChart(series,item),
34 : XYChart(series,item),
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_linePath = QPainterPath();
63 m_rect = QRect();
64 m_rect = QRect();
64 return;
65 return;
65 }
66 }
66
67
67 QPainterPath linePath(m_points.at(0));
68 QPainterPath linePath(m_points.at(0));
68
69
69 if (m_pointsVisible) {
70 if (m_pointsVisible) {
70
71
71 int size = m_linePen.width();
72 int size = m_linePen.width();
72 linePath.addEllipse(m_points.at(0), size, size);
73 linePath.addEllipse(m_points.at(0), size, size);
74 linePath.moveTo(m_points.at(0));
73 for (int i = 1; i < m_points.size(); i++) {
75 for (int i = 1; i < m_points.size(); i++) {
74 linePath.lineTo(m_points.at(i));
76 linePath.lineTo(m_points.at(i));
75 linePath.addEllipse(m_points.at(i), size, size);
77 linePath.addEllipse(m_points.at(i), size, size);
76 linePath.moveTo(m_points.at(i));
78 linePath.moveTo(m_points.at(i));
77 }
79 }
78
80
79 } else {
81 } else {
80 for (int i = 1; i < m_points.size(); i++)
82 for (int i = 1; i < m_points.size(); i++)
81 linePath.lineTo(m_points.at(i));
83 linePath.lineTo(m_points.at(i));
82 }
84 }
83
85
84 m_linePath = linePath;
86 m_linePath = linePath;
85
87
86 QPainterPathStroker stroker;
88 QPainterPathStroker stroker;
87 // QPainter::drawLine does not respect join styles, for example BevelJoin becomes MiterJoin.
89 // QPainter::drawLine does not respect join styles, for example BevelJoin becomes MiterJoin.
88 // This is why we are prepared for the "worst case" scenario, i.e. use always MiterJoin and
90 // This is why we are prepared for the "worst case" scenario, i.e. use always MiterJoin and
89 // multiply line width with square root of two when defining shape and bounding rectangle.
91 // multiply line width with square root of two when defining shape and bounding rectangle.
90 stroker.setWidth(m_linePen.width() * 1.42);
92 stroker.setWidth(m_linePen.width() * 1.42);
91 stroker.setJoinStyle(Qt::MiterJoin);
93 stroker.setJoinStyle(Qt::MiterJoin);
92 stroker.setCapStyle(Qt::SquareCap);
94 stroker.setCapStyle(Qt::SquareCap);
93 stroker.setMiterLimit(m_linePen.miterLimit());
95 stroker.setMiterLimit(m_linePen.miterLimit());
94
96
95 prepareGeometryChange();
97 prepareGeometryChange();
96
98
97 m_path = stroker.createStroke(linePath);
99 m_path = stroker.createStroke(linePath);
98 m_rect = m_path.boundingRect();
100 m_rect = m_path.boundingRect();
99 }
101 }
100
102
101 void LineChartItem::handleUpdated()
103 void LineChartItem::handleUpdated()
102 {
104 {
105 // If points visiblity has changed, a geometry update is needed.
106 // Also, if pen changes when points are visible, geometry update is needed.
107 bool doGeometryUpdate =
108 (m_pointsVisible != m_series->pointsVisible())
109 || (m_series->pointsVisible() && (m_linePen != m_series->pen()));
103 setVisible(m_series->isVisible());
110 setVisible(m_series->isVisible());
104 setOpacity(m_series->opacity());
111 setOpacity(m_series->opacity());
105 m_pointsVisible = m_series->pointsVisible();
112 m_pointsVisible = m_series->pointsVisible();
106 m_linePen = m_series->pen();
113 m_linePen = m_series->pen();
114 if (doGeometryUpdate)
115 updateGeometry();
107 update();
116 update();
108 }
117 }
109
118
110 void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
119 void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
111 {
120 {
112 Q_UNUSED(widget)
121 Q_UNUSED(widget)
113 Q_UNUSED(option)
122 Q_UNUSED(option)
114
123
115 painter->save();
124 painter->save();
116 painter->setPen(m_linePen);
125 painter->setPen(m_linePen);
117 painter->setBrush(m_linePen.color());
126 painter->setBrush(m_linePen.color());
118 painter->setClipRect(QRectF(QPointF(0,0),domain()->size()));
127 painter->setClipRect(QRectF(QPointF(0,0),domain()->size()));
119
128
120 if (m_pointsVisible) {
129 if (m_pointsVisible) {
121 painter->drawPath(m_linePath);
130 painter->drawPath(m_linePath);
122 } else {
131 } else {
123 for (int i(1); i < m_points.size(); i++)
132 for (int i(1); i < m_points.size(); i++)
124 painter->drawLine(m_points.at(i - 1), m_points.at(i));
133 painter->drawLine(m_points.at(i - 1), m_points.at(i));
125 }
134 }
126 painter->restore();
135 painter->restore();
127 }
136 }
128
137
129 void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
138 void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
130 {
139 {
131 emit XYChart::clicked(domain()->calculateDomainPoint(event->pos()));
140 emit XYChart::clicked(domain()->calculateDomainPoint(event->pos()));
132 QGraphicsItem::mousePressEvent(event);
141 QGraphicsItem::mousePressEvent(event);
133 }
142 }
134
143
135 void LineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
144 void LineChartItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
136 {
145 {
137 emit XYChart::hovered(domain()->calculateDomainPoint(event->pos()), true);
146 emit XYChart::hovered(domain()->calculateDomainPoint(event->pos()), true);
138 // event->accept();
147 // event->accept();
139 QGraphicsItem::hoverEnterEvent(event);
148 QGraphicsItem::hoverEnterEvent(event);
140 }
149 }
141
150
142 void LineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
151 void LineChartItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
143 {
152 {
144 emit XYChart::hovered(domain()->calculateDomainPoint(event->pos()), false);
153 emit XYChart::hovered(domain()->calculateDomainPoint(event->pos()), false);
145 // event->accept();
154 // event->accept();
146 QGraphicsItem::hoverEnterEvent(event);
155 QGraphicsItem::hoverEnterEvent(event);
147 }
156 }
148
157
149 #include "moc_linechartitem_p.cpp"
158 #include "moc_linechartitem_p.cpp"
150
159
151 QTCOMMERCIALCHART_END_NAMESPACE
160 QTCOMMERCIALCHART_END_NAMESPACE
General Comments 0
You need to be logged in to leave comments. Login now