Added _session reference to Signal objects

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 367b5890d7d6ef46f078c732cd579a2b4a5daa09..6b81fda77da324d8db0dec9ce6803758fad45a6a 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -41,19 +41,26 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
-       int probe_index) :
-       Signal(name),
+AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+       shared_ptr<data::Analog> data) :
+       Signal(session, probe),
        _data(data),
        _scale(1.0f)
 {
-       _colour = SignalColours[probe_index % countof(SignalColours)];
+       _colour = SignalColours[probe->index % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
 {
 }
 
+const list<QAction*> AnalogSignal::get_context_bar_actions()
+{
+       list<QAction*> actions;
+       actions.push_back(&_name_action);
+       return actions;
+}
+
 void AnalogSignal::set_scale(float scale)
 {
        _scale = scale;
@@ -66,6 +73,9 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
        assert(_data);
        assert(right >= left);
 
+       if (!_probe->enabled)
+               return;
+
        paint_axis(p, y, left, right);
 
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =