Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ae8ee901a27316738434c6f8e64a29376a77496f..d10448f3eac071b535df4c25148a42700eb70486 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -32,6 +32,7 @@
 #include "view.h"
 
 #include <pv/widgets/colourbutton.h>
+#include <pv/widgets/popup.h>
 
 namespace pv {
 namespace view {
@@ -39,8 +40,7 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
-Trace::Trace(pv::SigSession &session, QString name) :
-       _session(session),
+Trace::Trace(QString name) :
        _name(name),
        _v_offset(0),
        _popup(NULL),
@@ -165,7 +165,7 @@ bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
        (void)left;
 
        const QRectF label = get_label_rect(right);
-       return QRectF(
+       return enabled() && QRectF(
                QPointF(label.left() - LabelHitPadding,
                        label.top() - LabelHitPadding),
                QPointF(right, label.bottom() + LabelHitPadding)