X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.cpp;h=79065ebd4740fbb7ffc215abcded4f18d53d15b9;hp=38f204b6e255c2bf93940a7b3b70d2baac91cd9e;hb=2795de2e7fdaeb6e9f672e0dc73dea328f35e585;hpb=f02b6a98dc19c0c076760239e6a394fb370a24ef

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 38f204b..79065eb 100644
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -103,6 +103,7 @@ LogicSignal::LogicSignal(
 	shared_ptr<data::SignalBase> base) :
 	Signal(session, base),
 	device_(device),
+	trigger_types_(get_trigger_types()),
 	trigger_none_(nullptr),
 	trigger_rising_(nullptr),
 	trigger_high_(nullptr),
@@ -293,38 +294,40 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 {
 	// Draw the trigger marker
-	if (!trigger_match_ || !base_->enabled())
-		return;
+	if (base_->enabled() && trigger_match_) {
+		const int y = get_visual_y();
 
-	const int y = get_visual_y();
-	const vector<int32_t> trig_types = get_trigger_types();
-	for (int32_t type_id : trig_types) {
-		const TriggerMatchType *const type =
-			TriggerMatchType::get(type_id);
-		if (trigger_match_ != type || type_id < 0 ||
-			(size_t)type_id >= countof(TriggerMarkerIcons) ||
-			!TriggerMarkerIcons[type_id])
-			continue;
-
-		const QPixmap *const pixmap = get_pixmap(
-			TriggerMarkerIcons[type_id]);
-		if (!pixmap)
-			continue;
-
-		const float pad = TriggerMarkerPadding - 0.5f;
-		const QSize size = pixmap->size();
-		const QPoint point(
-			pp.right() - size.width() - pad * 2,
-			y - (signal_height_ + size.height()) / 2);
-
-		p.setPen(QPen(TriggerMarkerBackgroundColor.darker()));
-		p.setBrush(TriggerMarkerBackgroundColor);
-		p.drawRoundedRect(QRectF(point, size).adjusted(
-			-pad, -pad, pad, pad), pad, pad);
-		p.drawPixmap(point, *pixmap);
-
-		break;
+		for (int32_t type_id : trigger_types_) {
+			const TriggerMatchType *const type =
+				TriggerMatchType::get(type_id);
+			if (trigger_match_ != type || type_id < 0 ||
+				(size_t)type_id >= countof(TriggerMarkerIcons) ||
+				!TriggerMarkerIcons[type_id])
+				continue;
+
+			const QPixmap *const pixmap = get_pixmap(
+				TriggerMarkerIcons[type_id]);
+			if (!pixmap)
+				continue;
+
+			const float pad = TriggerMarkerPadding - 0.5f;
+			const QSize size = pixmap->size();
+			const QPoint point(
+				pp.right() - size.width() - pad * 2,
+				y - (signal_height_ + size.height()) / 2);
+
+			p.setPen(QPen(TriggerMarkerBackgroundColor.darker()));
+			p.setBrush(TriggerMarkerBackgroundColor);
+			p.drawRoundedRect(QRectF(point, size).adjusted(
+				-pad, -pad, pad, pad), pad, pad);
+			p.drawPixmap(point, *pixmap);
+
+			break;
+		}
 	}
+
+	if (show_hover_marker_)
+		paint_hover_marker(p);
 }
 
 void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,