projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Renamed get_colour() to colour()
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index 367891a22c67e72b21a68057ba553c9d0ba50e7a..f6c27430942a4d258cb93297b86114c9397354c3 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-58,7
+58,7
@@
void Trace::set_name(QString name)
_name = name;
}
_name = name;
}
-QColor Trace::
get_
colour() const
+QColor Trace::colour() const
{
return _colour;
}
{
return _colour;
}
@@
-77,8
+77,6
@@
void Trace::paint_label(QPainter &p, int right, bool hover)
if (!enabled())
return;
if (!enabled())
return;
- const QColor colour = get_colour();
-
const QRectF r = label_rect(right);
// Paint the label
const QRectF r = label_rect(right);
// Paint the label
@@
-105,14
+103,14
@@
void Trace::paint_label(QPainter &p, int right, bool hover)
}
p.setPen(Qt::transparent);
}
p.setPen(Qt::transparent);
- p.setBrush(hover ?
colour.lighter() :
colour);
+ p.setBrush(hover ?
_colour.lighter() : _
colour);
p.drawPolygon(points, countof(points));
p.drawPolygon(points, countof(points));
- p.setPen(colour.lighter());
+ p.setPen(
_
colour.lighter());
p.setBrush(Qt::transparent);
p.drawPolygon(highlight_points, countof(highlight_points));
p.setBrush(Qt::transparent);
p.drawPolygon(highlight_points, countof(highlight_points));
- p.setPen(colour.darker());
+ p.setPen(
_
colour.darker());
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));