X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.cpp;h=8396323f4ee05623c3e49d747ef9b44caf47cc15;hp=870af9c5fce2caa04dc718afd66209ae7b1c23e9;hb=cc844e861276b56837c345d69975c50f009d57af;hpb=1931b5f932cf068d073bc798f11dd21ede5389a2

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 870af9c5..8396323f 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),
@@ -163,18 +164,6 @@ pair<int, int> LogicSignal::v_extents() const
 	return make_pair(-signal_height_ - signal_margin, signal_margin);
 }
 
-int LogicSignal::scale_handle_offset() const
-{
-	return -signal_height_;
-}
-
-void LogicSignal::scale_handle_dragged(int offset)
-{
-	const int font_height = QFontMetrics(QApplication::font()).height();
-	const int units = (-offset / font_height);
-	signal_height_ = ((units < 1) ? 1 : units) * font_height;
-}
-
 void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	QLineF *line;
@@ -292,42 +281,43 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 
 void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 {
-	// Draw the trigger marker
-	if (base_->enabled() && trigger_match_) {
-		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;
+	if (base_->enabled()) {
+		if (trigger_match_) {
+			// Draw the trigger marker
+			const int y = get_visual_y();
+
+			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 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);
+				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);
+				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;
+				break;
+			}
 		}
-	}
 
-	if (show_hover_marker_)
-		paint_hover_marker(p);
+		if (show_hover_marker_)
+			paint_hover_marker(p);
+	}
 }
 
 void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,