X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=ae180e19a47a228a35f8d1151658b3f1b14973c2;hb=a2ae0205f2737dfd8f7647f9eae2fdcb47a0ad25;hp=48e47f27aa9a49304dddc6d1feef879463183cf4;hpb=b47d951efad3b51674e5af2fcfc29526cad6697f;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 48e47f2..ae180e1 100644
--- 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>
@@ -31,15 +32,15 @@ namespace pv {
 namespace view {
 
 const int Signal::LabelHitPadding = 2;
-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 +73,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,10 +102,8 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 		QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
 	};
 
-	if (_selected) {
-		p.setPen(QPen(QApplication::palette().brush(
-			QPalette::Highlight), LabelHighlightRadius,
-			Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+	if (selected()) {
+		p.setPen(highlight_pen());
 		p.setBrush(Qt::transparent);
 		p.drawPolygon(points, countof(points));
 	}