X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.cpp;h=85b6c0b4968795666cb422e2919afb892eb58fe8;hb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29;hp=b3f8ba87de7e31aa57bbc7dba5b4687fd45557f7;hpb=e887fe9e6ede73b9fe9ace9c6bfd4f6a096eb3b2;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index b3f8ba87..85b6c0b4 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -67,8 +67,8 @@ using std::bad_alloc; using std::dynamic_pointer_cast; using std::find_if; using std::function; -using std::lock_guard; using std::list; +using std::lock_guard; using std::make_pair; using std::make_shared; using std::map; @@ -84,7 +84,6 @@ using std::string; using std::unique_lock; #endif using std::unique_ptr; -using std::unordered_set; using std::vector; using sigrok::Analog; @@ -116,6 +115,7 @@ namespace pv { shared_ptr Session::sr_context; Session::Session(DeviceManager &device_manager, QString name) : + shutting_down_(false), device_manager_(device_manager), default_name_(name), name_(name), @@ -127,6 +127,8 @@ Session::Session(DeviceManager &device_manager, QString name) : Session::~Session() { + shutting_down_ = true; + // Stop and join to the thread stop_capture(); } @@ -168,7 +170,7 @@ void Session::set_name(QString name) name_changed(); } -const list< shared_ptr > Session::views() const +const vector< shared_ptr > Session::views() const { return views_; } @@ -233,31 +235,40 @@ void Session::save_setup(QSettings &settings) const settings.setValue("views", i); + int view_id = 0; i = 0; - shared_ptr tv = dynamic_pointer_cast(main_view_); - for (const shared_ptr& time_item : tv->time_items()) { - - const shared_ptr flag = - dynamic_pointer_cast(time_item); - if (flag) { - if (!flag->enabled()) - continue; + for (const shared_ptr& vb : views_) { + shared_ptr tv = dynamic_pointer_cast(vb); + if (tv) { + for (const shared_ptr& time_item : tv->time_items()) { + + const shared_ptr flag = + dynamic_pointer_cast(time_item); + if (flag) { + if (!flag->enabled()) + continue; + + settings.beginGroup("meta_obj" + QString::number(i++)); + settings.setValue("type", "time_marker"); + settings.setValue("assoc_view", view_id); + GlobalSettings::store_timestamp(settings, "time", flag->time()); + settings.setValue("text", flag->get_text()); + settings.endGroup(); + } + } - settings.beginGroup("meta_obj" + QString::number(i++)); - settings.setValue("type", "time_marker"); - GlobalSettings::store_timestamp(settings, "time", flag->time()); - settings.setValue("text", flag->get_text()); - settings.endGroup(); + if (tv->cursors_shown()) { + settings.beginGroup("meta_obj" + QString::number(i++)); + settings.setValue("type", "selection"); + settings.setValue("assoc_view", view_id); + const shared_ptr cp = tv->cursors(); + GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time()); + GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time()); + settings.endGroup(); + } } - } - if (tv->cursors_shown()) { - settings.beginGroup("meta_obj" + QString::number(i++)); - settings.setValue("type", "selection"); - const shared_ptr cp = tv->cursors(); - GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time()); - GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time()); - settings.endGroup(); + view_id++; } settings.setValue("meta_objs", i); @@ -360,18 +371,26 @@ void Session::restore_setup(QSettings &settings) // Restore meta objects like markers and cursors int meta_objs = settings.value("meta_objs").toInt(); - shared_ptr tv = dynamic_pointer_cast(main_view_); for (int i = 0; i < meta_objs; i++) { settings.beginGroup("meta_obj" + QString::number(i)); + + shared_ptr vb; + shared_ptr tv; + if (settings.contains("assoc_view")) + vb = views_.at(settings.value("assoc_view").toInt()); + + if (vb) + tv = dynamic_pointer_cast(vb); + const QString type = settings.value("type").toString(); - if (type == "time_marker") { + if ((type == "time_marker") && tv) { Timestamp ts = GlobalSettings::restore_timestamp(settings, "time"); shared_ptr flag = tv->add_flag(ts); flag->set_text(settings.value("text").toString()); } - if (type == "selection") { + if ((type == "selection") && tv) { Timestamp start = GlobalSettings::restore_timestamp(settings, "start_time"); Timestamp end = GlobalSettings::restore_timestamp(settings, "end_time"); tv->set_cursors(start, end); @@ -484,7 +503,7 @@ void Session::set_device(shared_ptr device) // Remove all stored data and reset all views for (shared_ptr view : views_) { - view->clear_signals(); + view->clear_signalbases(); #ifdef ENABLE_DECODE view->clear_decode_signals(); #endif @@ -744,7 +763,7 @@ void Session::register_view(shared_ptr view) update_signals(); // Add all other signals - unordered_set< shared_ptr > view_signalbases = view->signalbases(); + vector< shared_ptr > view_signalbases = view->signalbases(); for (const shared_ptr& signalbase : signalbases_) { const int sb_exists = count_if( @@ -774,7 +793,9 @@ void Session::register_view(shared_ptr view) void Session::deregister_view(shared_ptr view) { - views_.remove_if([&](shared_ptr v) { return v == view; }); + views_.erase(std::remove_if(views_.begin(), views_.end(), + [&](shared_ptr v) { return v == view; }), + views_.end()); if (views_.empty()) { main_view_.reset(); @@ -834,11 +855,36 @@ vector Session::get_triggers(uint32_t segment_id) const return result; } -const unordered_set< shared_ptr > Session::signalbases() const +const vector< shared_ptr > Session::signalbases() const { return signalbases_; } +void Session::add_generated_signal(shared_ptr signal) +{ + signalbases_.push_back(signal); + + for (shared_ptr& view : views_) + view->add_signalbase(signal); + + update_signals(); +} + +void Session::remove_generated_signal(shared_ptr signal) +{ + if (shutting_down_) + return; + + signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(), + [&](shared_ptr s) { return s == signal; }), + signalbases_.end()); + + for (shared_ptr& view : views_) + view->remove_signalbase(signal); + + update_signals(); +} + bool Session::all_segments_complete(uint32_t segment_id) const { bool all_complete = true; @@ -859,7 +905,7 @@ shared_ptr Session::add_decode_signal() // Create the decode signal signal = make_shared(*this); - signalbases_.insert(signal); + signalbases_.push_back(signal); // Add the decode signal to all views for (shared_ptr& view : views_) @@ -876,7 +922,12 @@ shared_ptr Session::add_decode_signal() void Session::remove_decode_signal(shared_ptr signal) { - signalbases_.erase(signal); + if (shutting_down_) + return; + + signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(), + [&](shared_ptr s) { return s == signal; }), + signalbases_.end()); for (shared_ptr& view : views_) view->remove_decode_signal(signal); @@ -885,6 +936,11 @@ void Session::remove_decode_signal(shared_ptr signal) } #endif +MetadataObjManager* Session::metadata_obj_manager() +{ + return &metadata_obj_manager_; +} + void Session::set_capture_state(capture_state state) { bool changed; @@ -910,7 +966,7 @@ void Session::update_signals() signalbases_.clear(); logic_data_.reset(); for (shared_ptr& view : views_) { - view->clear_signals(); + view->clear_signalbases(); #ifdef ENABLE_DECODE view->clear_decode_signals(); #endif @@ -925,7 +981,7 @@ void Session::update_signals() signalbases_.clear(); logic_data_.reset(); for (shared_ptr& view : views_) { - view->clear_signals(); + view->clear_signalbases(); #ifdef ENABLE_DECODE view->clear_decode_signals(); #endif @@ -940,7 +996,7 @@ void Session::update_signals() [] (shared_ptr channel) { return channel->type() == sigrok::ChannelType::LOGIC; }); - // Create data containers for the logic data segments + // Create a common data container for the logic signalbases { lock_guard data_lock(data_mutex_); @@ -948,100 +1004,77 @@ void Session::update_signals() logic_data_.reset(); } else if (!logic_data_ || logic_data_->num_channels() != logic_channel_count) { - logic_data_.reset(new data::Logic( - logic_channel_count)); + logic_data_.reset(new data::Logic(logic_channel_count)); assert(logic_data_); } } - // Make the signals list - for (shared_ptr& viewbase : views_) { - views::trace::View *trace_view = - qobject_cast(viewbase.get()); - - if (trace_view) { - 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; - - // Find the channel in the old signals - const auto iter = find_if( - prev_sigs.cbegin(), prev_sigs.cend(), - [&](const shared_ptr &s) { - return s->base()->channel() == channel; - }); - if (iter != prev_sigs.end()) { - // Copy the signal from the old set to the new - signal = *iter; - trace_view->add_signal(signal); - } else { - // Find the signalbase for this channel if possible - signalbase.reset(); - for (const shared_ptr& b : signalbases_) - if (b->channel() == channel) - signalbase = b; - - shared_ptr signal; - - switch(channel->type()->id()) { - case SR_CHANNEL_LOGIC: - if (!signalbase) { - signalbase = make_shared(channel, - data::SignalBase::LogicChannel); - signalbases_.insert(signalbase); - - all_signal_data_.insert(logic_data_); - signalbase->set_data(logic_data_); - - connect(this, SIGNAL(capture_state_changed(int)), - signalbase.get(), SLOT(on_capture_state_changed(int))); - } - - signal = shared_ptr(new LogicSignal(*this, device_, signalbase)); - break; - - case SR_CHANNEL_ANALOG: - { - if (!signalbase) { - signalbase = make_shared(channel, - data::SignalBase::AnalogChannel); - signalbases_.insert(signalbase); - - shared_ptr data(new data::Analog()); - all_signal_data_.insert(data); - signalbase->set_data(data); - - connect(this, SIGNAL(capture_state_changed(int)), - signalbase.get(), SLOT(on_capture_state_changed(int))); - } - - signal = shared_ptr(new AnalogSignal(*this, signalbase)); - break; - } - - default: - assert(false); - break; - } - - // New views take their signal settings from the main view - if (!viewbase->is_main_view()) { - shared_ptr main_tv = - dynamic_pointer_cast(main_view_); - shared_ptr main_signal = - main_tv->get_signal_by_signalbase(signalbase); - signal->restore_settings(main_signal->save_settings()); - } - - trace_view->add_signal(signal); - } + // Create signalbases if necessary + for (auto channel : sr_dev->channels()) { + + // Try to find the channel in the list of existing signalbases + const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(), + [&](const shared_ptr &sb) { return sb->channel() == channel; }); + + // Not found, let's make a signalbase for it + if (iter == signalbases_.cend()) { + shared_ptr signalbase; + switch(channel->type()->id()) { + case SR_CHANNEL_LOGIC: + signalbase = make_shared(channel, data::SignalBase::LogicChannel); + signalbases_.push_back(signalbase); + + all_signal_data_.insert(logic_data_); + signalbase->set_data(logic_data_); + + connect(this, SIGNAL(capture_state_changed(int)), + signalbase.get(), SLOT(on_capture_state_changed(int))); + break; + + case SR_CHANNEL_ANALOG: + signalbase = make_shared(channel, data::SignalBase::AnalogChannel); + signalbases_.push_back(signalbase); + + shared_ptr data(new data::Analog()); + all_signal_data_.insert(data); + signalbase->set_data(data); + + connect(this, SIGNAL(capture_state_changed(int)), + signalbase.get(), SLOT(on_capture_state_changed(int))); + break; } } } + for (shared_ptr& viewbase : views_) { + vector< shared_ptr > view_signalbases = + viewbase->signalbases(); + + // Add all non-decode signalbases that don't yet exist in the view + for (shared_ptr& session_sb : signalbases_) { + if (session_sb->type() == SignalBase::DecodeChannel) + continue; + + const auto iter = find_if(view_signalbases.cbegin(), view_signalbases.cend(), + [&](const shared_ptr &sb) { return sb == session_sb; }); + + if (iter == view_signalbases.cend()) + viewbase->add_signalbase(session_sb); + } + + // Remove all non-decode signalbases that no longer exist + for (shared_ptr& view_sb : view_signalbases) { + if (view_sb->type() == SignalBase::DecodeChannel) + continue; + + const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(), + [&](const shared_ptr &sb) { return sb == view_sb; }); + + if (iter == signalbases_.cend()) + viewbase->remove_signalbase(view_sb); + } + } + signals_changed(); } @@ -1104,6 +1137,8 @@ void Session::sample_thread_proc(function error_handler) lock_guard lock(data_mutex_); cur_logic_segment_.reset(); cur_analog_segments_.clear(); + for (shared_ptr sb : signalbases_) + sb->clear_sample_data(); } highest_segment_id_ = -1; frame_began_ = false; @@ -1346,7 +1381,7 @@ void Session::feed_in_frame_end() signal_segment_completed(); } -void Session::feed_in_logic(shared_ptr logic) +void Session::feed_in_logic(shared_ptr logic) { if (logic->data_length() == 0) { qDebug() << "WARNING: Received logic packet with 0 samples."; @@ -1390,7 +1425,7 @@ void Session::feed_in_logic(shared_ptr logic) data_received(); } -void Session::feed_in_analog(shared_ptr analog) +void Session::feed_in_analog(shared_ptr analog) { if (analog->num_samples() == 0) { qDebug() << "WARNING: Received analog packet with 0 samples.";