X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=6fda499b47d1ac551431f41c48c67e983bf754c0;hb=1f4caa772cd691da7578816bf3744496c9cde1cf;hp=76890aa0d5880d1c17b862f4e72d0ed2ad766989;hpb=923f8b22b50aa5858c66bfc900f3288990032483;p=pulseview.git diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 76890aa..6fda499 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -72,10 +72,12 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(shared_ptr device, - shared_ptr channel, - shared_ptr data) : - Signal(channel), +LogicSignal::LogicSignal( + pv::SigSession &session, + shared_ptr device, + shared_ptr channel, + shared_ptr data) : + Signal(session, channel), _device(device), _data(data), _trigger_none(NULL), @@ -92,7 +94,7 @@ LogicSignal::LogicSignal(shared_ptr device, /* Populate this channel's trigger setting with whatever we * find in the current session trigger, if anything. */ _trigger_match = nullptr; - if ((trigger = SigSession::_sr_session->trigger())) + if ((trigger = _session.session()->trigger())) for (auto stage : trigger->stages()) for (auto match : stage->matches()) if (match->channel() == _channel)