SigSession: Made _sr_session non-static

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 7541bd1375aa90908d903ed9e3277e7b500d5614..6fda499b47d1ac551431f41c48c67e983bf754c0 100644 (file)
--- 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> device,
-               shared_ptr<Channel> channel,
-               shared_ptr<data::Logic> data) :
-       Signal(channel),
+LogicSignal::LogicSignal(
+       pv::SigSession &session,
+       shared_ptr<Device> device,
+       shared_ptr<Channel> channel,
+       shared_ptr<data::Logic> data) :
+       Signal(session, channel),
        _device(device),
        _data(data),
        _trigger_none(NULL),
@@ -92,7 +94,7 @@ LogicSignal::LogicSignal(shared_ptr<Device> 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)
@@ -329,10 +331,10 @@ void LogicSignal::on_trigger()
 {
        QAction *action;
 
-       match_action(_trigger_match)->setChecked(FALSE);
+       match_action(_trigger_match)->setChecked(false);
 
        action = (QAction *)sender();
-       action->setChecked(TRUE);
+       action->setChecked(true);
        _trigger_match = action_match(action);
 
 }