Fix #770 by adding a vertical hover line and a setting for it

[pulseview.git] / pv / views / trace / logicsignal.cpp

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 77e92c0cc2788f97eadedd8de04d560fcf571002..870af9c5fce2caa04dc718afd66209ae7b1c23e9 100644 (file)
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -293,38 +293,41 @@ 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 vector<int32_t> trig_types = get_trigger_types();
 
-       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 : 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;
+               }
        }
+
+       if (show_hover_marker_)
+               paint_hover_marker(p);
 }
 
 void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
@@ -508,6 +511,12 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
                        trigger_bar_->addAction(action);
                        action->setChecked(trigger_match_ == type);
                }
+
+               // Only allow triggers to be changed when we're stopped
+               if (session_.get_capture_state() != Session::Stopped)
+                       for (QAction* action : trigger_bar_->findChildren<QAction*>())
+                               action->setEnabled(false);
+
                form->addRow(tr("Trigger"), trigger_bar_);
        }
 }