X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=aa528d191fe6750958bd2cbf8491fe8bb35383d0;hb=5ea53b3c20d5cd80c096fb2f8d1334ae17fbce7b;hp=eec1a051b5a8838ba3f81b58c0759adbadb024a9;hpb=303eec78f3c499cd30fc88b282aa1f336e82a806;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index eec1a051..aa528d19 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -43,11 +43,11 @@ #include "toolbars/mainbar.hpp" -#include "view/analogsignal.hpp" -#include "view/decodetrace.hpp" -#include "view/logicsignal.hpp" -#include "view/signal.hpp" -#include "view/view.hpp" +#include "views/trace/analogsignal.hpp" +#include "views/trace/decodetrace.hpp" +#include "views/trace/logicsignal.hpp" +#include "views/trace/signal.hpp" +#include "views/trace/view.hpp" #include @@ -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; @@ -849,7 +849,14 @@ void Session::sample_thread_proc(function error_handler) set_capture_state(device_->session()->trigger() ? AwaitingTrigger : Running); - device_->run(); + try { + device_->run(); + } catch (Error e) { + error_handler(e.what()); + set_capture_state(Stopped); + return; + } + set_capture_state(Stopped); // Confirm that SR_DF_END was received