SignalBase: Don't check for signal types, check based on data

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

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 0b09439bb8bb4e28976b30102995aa5e60607d8d..93c7c5a93cdd3bae6af7db425b612e12618ab200 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -161,7 +161,8 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 
        // Determine shortest string we want to see displayed in full
        QFontMetrics m(QApplication::font());
-       min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
+       // e.g. two hex characters
+       min_useful_label_width_ = util::text_width(m, "XX");
 
        default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4;
        annotation_height_ = (ViewItemPaintParams::text_height() * 5) / 4;
@@ -612,9 +613,12 @@ void DecodeTrace::hover_point_changed(const QPoint &hp)
                r.expand_marker_highlighted = false;
 
        if (hover_row) {
-               int row_y = get_row_y(hover_row);
+               const pair<int, int> extents = v_extents();
+               const int trace_top = get_visual_y() + extents.first;
+               const int trace_btm = get_visual_y() + extents.second;
+
                if ((hp.x() > 0) && (hp.x() < (int)(ArrowSize + 3 + hover_row->title_width)) &&
-                       (hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) {
+                       (hp.y() > trace_top) && (hp.y() < trace_btm)) {
 
                        hover_row->expand_marker_highlighted = true;
                        show_hidden_rows_ = true;
@@ -697,7 +701,7 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event)
 void DecodeTrace::draw_annotations(deque<const Annotation*>& annotations,
                QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row)
 {
-       Annotation::Class block_class = 0;
+       uint32_t block_class = 0;
        bool block_class_uniform = true;
        qreal block_start = 0;
        int block_ann_count = 0;
@@ -802,7 +806,7 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p,
 }
 
 void DecodeTrace::draw_annotation_block(qreal start, qreal end,
-       Annotation::Class ann_class, bool use_ann_format, QPainter &p, int y,
+       uint32_t ann_class, bool use_ann_format, QPainter &p, int y,
        const DecodeTraceRow& row) const
 {
        const double top = y + .5 - annotation_height_ / 2;