X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=aa528d191fe6750958bd2cbf8491fe8bb35383d0;hb=09594425dde6ba633136888ea8a75544c9a6b831;hp=66d80f1a4bde58b649cc571d1194431824f6f516;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index 66d80f1..aa528d1 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -734,22 +734,22 @@ void Session::update_signals() // Make the signals list for (shared_ptr viewbase : views_) { - views::TraceView::View *trace_view = - qobject_cast(viewbase.get()); + views::trace::View *trace_view = + qobject_cast(viewbase.get()); if (trace_view) { - unordered_set< shared_ptr > + unordered_set< shared_ptr > prev_sigs(trace_view->signals()); trace_view->clear_signals(); for (auto channel : sr_dev->channels()) { shared_ptr signalbase; - shared_ptr signal; + shared_ptr signal; // Find the channel in the old signals const auto iter = find_if( prev_sigs.cbegin(), prev_sigs.cend(), - [&](const shared_ptr &s) { + [&](const shared_ptr &s) { return s->base()->channel() == channel; }); if (iter != prev_sigs.end()) { @@ -777,8 +777,8 @@ void Session::update_signals() signalbase.get(), SLOT(on_capture_state_changed(int))); } - signal = shared_ptr( - new views::TraceView::LogicSignal(*this, + signal = shared_ptr( + new views::trace::LogicSignal(*this, device_, signalbase)); trace_view->add_signal(signal); break; @@ -798,8 +798,8 @@ void Session::update_signals() signalbase.get(), SLOT(on_capture_state_changed(int))); } - signal = shared_ptr( - new views::TraceView::AnalogSignal( + signal = shared_ptr( + new views::trace::AnalogSignal( *this, signalbase)); trace_view->add_signal(signal); break;