X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsignal.cpp;h=04c579232e4c6a2966680b0ad68a39ddf796aacf;hb=b3b57abc4fcfea1471529e9d116eaf11905f6639;hp=7d3dd66362f4c5ab182b4503ab2e0294d5f93066;hpb=a29bb7fb6aa3665c21da1e06a3d3c4ca80f4437f;p=pulseview.git

diff --git a/pv/signal.cpp b/pv/signal.cpp
index 7d3dd663..04c57923 100644
--- a/pv/signal.cpp
+++ b/pv/signal.cpp
@@ -21,10 +21,10 @@
 #include <extdef.h>
 
 #include "signal.h"
+#include "view/view.h"
 
 namespace pv {
 
-const QSizeF Signal::LabelPadding(4, 0);
 const int Signal::LabelHitPadding = 2;
 
 Signal::Signal(QString name) :
@@ -37,13 +37,30 @@ QString Signal::get_name() const
 	return _name;
 }
 
+void Signal::set_name(QString name)
+{
+	_name = name;
+}
+
+QColor Signal::get_colour() const
+{
+	return _colour;
+}
+
+void Signal::set_colour(QColor colour)
+{
+	_colour = colour;
+}
+
 void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
-	p.setBrush(get_colour());
+	p.setBrush(_colour);
 
 	const QColor colour = get_colour();
 	const float nominal_offset = get_nominal_offset(rect);
-	const QRectF label_rect = get_label_rect(p, rect);
+
+	compute_text_size(p);
+	const QRectF label_rect = get_label_rect(rect);
 
 	// Paint the label
 	const QPointF points[] = {
@@ -79,10 +96,9 @@ void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
 	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
-bool Signal::pt_in_label_rect(QPainter &p,
-	const QRect &rect, const QPoint &point)
+bool Signal::pt_in_label_rect(const QRect &rect, const QPoint &point)
 {
-	const QRectF label = get_label_rect(p, rect);
+	const QRectF label = get_label_rect(rect);
 	return QRectF(
 		QPointF(label.left() - LabelHitPadding,
 			label.top() - LabelHitPadding),
@@ -91,18 +107,23 @@ bool Signal::pt_in_label_rect(QPainter &p,
 		).contains(point);
 }
 
-QRectF Signal::get_label_rect(QPainter &p, const QRect &rect)
+void Signal::compute_text_size(QPainter &p)
 {
-	const QSizeF text_size = p.boundingRect(
-		QRectF(0, 0, rect.width(), 0), 0, _name).size();
+	_text_size = p.boundingRect(QRectF(), 0, _name).size();
+}
 
-	const float nominal_offset = get_nominal_offset(rect);
+QRectF Signal::get_label_rect(const QRect &rect)
+{
+	using pv::view::View;
+
+	const float nominal_offset = get_nominal_offset(rect) + 0.5;
 	const QSizeF label_size(
-		text_size.width() + LabelPadding.width() * 2,
-		text_size.height() + LabelPadding.height() * 2);
+		_text_size.width() + View::LabelPadding.width() * 2,
+		_text_size.height() + View::LabelPadding.height() * 2);
 	const float label_arrow_length = label_size.height() / 2;
 	return QRectF(
-		rect.right() - label_arrow_length - label_size.width(),
+		rect.right() - label_arrow_length -
+			label_size.width() - 0.5,
 		nominal_offset - label_size.height() / 2,
 		label_size.width(), label_size.height());
 }