RowItemOwner: Replaced parent notification scheme

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 1231eae4830b61ccc0429566963408e5bcbd175a..9caa8f012adf57310f4ca65fe29c3254380b7c38 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -42,15 +42,13 @@ const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
-       _view(NULL),
        _name(name),
-       _v_offset(0),
        _popup(NULL),
        _popup_form(NULL)
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
        return _name;
 }
@@ -60,7 +58,7 @@ void Trace::set_name(QString name)
        _name = name;
 }
 
-QColor Trace::get_colour() const
+QColor Trace::colour() const
 {
        return _colour;
 }
@@ -70,54 +68,15 @@ void Trace::set_colour(QColor colour)
        _colour = colour;
 }
 
-int Trace::get_v_offset() const
-{
-       return _v_offset;
-}
-
-void Trace::set_v_offset(int v_offset)
-{
-       _v_offset = v_offset;
-}
-
-void Trace::set_view(pv::view::View *view)
-{
-       assert(view);
-       _view = view;
-}
-
-void Trace::paint_back(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
-}
-
-void Trace::paint_mid(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
-}
-
-void Trace::paint_fore(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
-}
-
 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;
 
-       const QColor colour = get_colour();
-
        const QRectF r = label_rect(right);
 
        // Paint the label
@@ -144,14 +103,14 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
        }
 
        p.setPen(Qt::transparent);
-       p.setBrush(hover ? colour.lighter() : colour);
+       p.setBrush(hover ? _colour.lighter() : _colour);
        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.setPen(colour.darker());
+       p.setPen(_colour.darker());
        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 
@@ -184,13 +143,7 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        return _popup;
 }
 
-int Trace::get_y() const
-{
-       assert(_view);
-       return _v_offset - _view->v_offset();
-}
-
-QRectF Trace::label_rect(int right)
+QRectF Trace::label_rect(int right) const
 {
        using pv::view::View;
 
@@ -204,15 +157,11 @@ QRectF Trace::label_rect(int right)
        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());
 }
 
-void Trace::hover_point_changed()
-{
-}
-
 QColor Trace::get_text_colour() const
 {
        return (_colour.lightness() > 64) ? Qt::black : Qt::white;
@@ -274,13 +223,17 @@ void Trace::on_popup_closed()
 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);
-       colour_changed();
+
+       if (_owner)
+               _owner->appearance_changed(true, false);
 }
 
 } // namespace view