Moved Signal selection behaviour into SelectableItem

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 48e47f27aa9a49304dddc6d1feef879463183cf4..dd50243a7095c468f4a424ca0e46f9251919c1dc 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,7 @@
 
 #include <extdef.h>
 
+#include <assert.h>
 #include <math.h>
 
 #include <QApplication>
@@ -35,11 +36,12 @@ const int Signal::LabelHighlightRadius = 6;
 
 const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
 
-Signal::Signal(QString name) :
-       _name(name),
-       _v_offset(0),
-       _selected(false)
+Signal::Signal(const sr_probe *const probe) :
+       _probe(probe),
+       _name(probe->name),
+       _v_offset(0)
 {
+       assert(_probe);
 }
 
 QString Signal::get_name() const
@@ -72,20 +74,13 @@ void Signal::set_v_offset(int v_offset)
        _v_offset = v_offset;
 }
 
-bool Signal::selected() const
-{
-       return _selected;
-}
-
-void Signal::select(bool select)
-{
-       _selected = select;
-}
-
 void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 {
        p.setBrush(_colour);
 
+       if (!_probe->enabled)
+               return;
+
        const QColor colour = get_colour();
 
        compute_text_size(p);
@@ -108,7 +103,7 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
                QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
        };
 
-       if (_selected) {
+       if (selected()) {
                p.setPen(QPen(QApplication::palette().brush(
                        QPalette::Highlight), LabelHighlightRadius,
                        Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));