projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceGroup: Implemented stacking
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index 367891a22c67e72b21a68057ba553c9d0ba50e7a..9caa8f012adf57310f4ca65fe29c3254380b7c38 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;
}
@@
-70,15
+70,13
@@
void Trace::set_colour(QColor colour)
void Trace::paint_label(QPainter &p, int right, bool hover)
{
void Trace::paint_label(QPainter &p, int right, bool hover)
{
- const int y = get_y();
+ const int y = get_
visual_
y();
p.setBrush(_colour);
if (!enabled())
return;
p.setBrush(_colour);
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;
@@
-159,7
+157,7
@@
QRectF Trace::label_rect(int right)
const float half_height = label_size.height() / 2;
return QRectF(
right - half_height - label_size.width() - 0.5,
const float half_height = label_size.height() / 2;
return QRectF(
right - half_height - label_size.width() - 0.5,
- get_y() + 0.5f - half_height,
+ get_
visual_
y() + 0.5f - half_height,
label_size.width() + half_height,
label_size.height());
}
label_size.width() + half_height,
label_size.height());
}
@@
-225,13
+223,17
@@
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();
+
+ if (_owner)
+ _owner->extents_changed(true, false);
}
void Trace::on_colour_changed(const QColor &colour)
{
set_colour(colour);
}
void Trace::on_colour_changed(const QColor &colour)
{
set_colour(colour);
- colour_changed();
+
+ if (_owner)
+ _owner->appearance_changed(true, false);
}
} // namespace view
}
} // namespace view