X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=cdbb65b1638e5ac145c1aaa66cf6c3d99bf12971;hb=cec48d1618edd0f28f21d5351f53692876222e16;hp=ed414c7c510c13b60c0f6225bd93d69a443b16c2;hpb=3ef6182a4cb1d50262f019e5d78bd5c00fc08ca5;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ed414c7c..cdbb65b1 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,9 @@
 
 #include <extdef.h>
 
+#include <assert.h>
+#include <math.h>
+
 #include <QApplication>
 
 #include "signal.h"
@@ -33,11 +36,13 @@ const int Signal::LabelHighlightRadius = 6;
 
 const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
 
-Signal::Signal(QString name) :
-	_name(name),
+Signal::Signal(const sr_probe *const probe) :
+	_probe(probe),
+	_name(probe->name),
 	_v_offset(0),
 	_selected(false)
 {
+	assert(_probe);
 }
 
 QString Signal::get_name() const
@@ -84,6 +89,9 @@ 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);
@@ -134,6 +142,8 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 bool Signal::pt_in_label_rect(int y, int left, int right,
 	const QPoint &point)
 {
+	(void)left;
+
 	const QRectF label = get_label_rect(y, right);
 	return QRectF(
 		QPointF(label.left() - LabelHitPadding,
@@ -150,7 +160,9 @@ void Signal::paint_axis(QPainter &p, int y, int left, int right)
 
 void Signal::compute_text_size(QPainter &p)
 {
-	_text_size = p.boundingRect(QRectF(), 0, _name).size();
+	_text_size = QSize(
+		p.boundingRect(QRectF(), 0, _name).width(),
+		p.boundingRect(QRectF(), 0, "Tg").height());
 }
 
 QRectF Signal::get_label_rect(int y, int right)
@@ -159,7 +171,7 @@ QRectF Signal::get_label_rect(int y, int right)
 
 	const QSizeF label_size(
 		_text_size.width() + View::LabelPadding.width() * 2,
-		_text_size.height() + View::LabelPadding.height() * 2);
+		ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
 	const float label_arrow_length = label_size.height() / 2;
 	return QRectF(
 		right - label_arrow_length - label_size.width() - 0.5,