projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Combined appearance change signals into appearance_changed()
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index aba51510db59ad964d9f4213b994c05caf5275d8..3b92abe484c14efd5964789eed731077fed21344 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-48,7
+48,7
@@
Trace::Trace(QString name) :
{
}
{
}
-QString Trace::
get_
name() const
+QString Trace::name() const
{
return _name;
}
{
return _name;
}
@@
-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));
@@
-145,7
+143,7
@@
pv::widgets::Popup* Trace::create_popup(QWidget *parent)
return _popup;
}
return _popup;
}
-QRectF Trace::label_rect(int right)
+QRectF Trace::label_rect(int right)
const
{
using pv::view::View;
{
using pv::view::View;
@@
-225,13
+223,13
@@
void Trace::on_popup_closed()
void Trace::on_text_changed(const QString &text)
{
set_name(text);
void Trace::on_text_changed(const QString &text)
{
set_name(text);
-
text
_changed();
+
appearance
_changed();
}
void Trace::on_colour_changed(const QColor &colour)
{
set_colour(colour);
}
void Trace::on_colour_changed(const QColor &colour)
{
set_colour(colour);
-
colour
_changed();
+
appearance
_changed();
}
} // namespace view
}
} // namespace view