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