X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=f6fb7085582a7ce19a1941c71e5effa3a040c91c;hp=fd428ed0ebacd0b5ebe628c2b9893c51101ef8b1;hb=33e1afbe17cfa91c24adb775aba923f07fbeed01;hpb=0f8f8c180b32413177f3940ea6f216d1cbadf09b diff --git a/pv/session.cpp b/pv/session.cpp index fd428ed0..f6fb7085 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -26,12 +26,15 @@ #include #include -#ifdef ENABLE_DECODE -#include -#endif +#include -#include "session.hpp" +#include +#include +#include + +#include +#include "session.hpp" #include "devicemanager.hpp" #include "data/analog.hpp" @@ -53,16 +56,12 @@ #include "view/signal.hpp" #include "view/view.hpp" -#include -#include -#include - -#include - -#include - #include +#ifdef ENABLE_DECODE +#include +#endif + using boost::shared_lock; using boost::shared_mutex; using boost::unique_lock; @@ -98,8 +97,10 @@ using Glib::VariantBase; using Glib::Variant; namespace pv { -Session::Session(DeviceManager &device_manager) : +Session::Session(DeviceManager &device_manager, QString name) : device_manager_(device_manager), + default_name_(name), + name_(name), capture_state_(Stopped), cur_samplerate_(0) { @@ -133,6 +134,26 @@ shared_ptr Session::device() const return device_; } +QString Session::name() const +{ + return name_; +} + +void Session::set_name(QString name) +{ + if (default_name_.isEmpty()) + default_name_ = name; + + name_ = name; + + name_changed(); +} + +const std::list< std::shared_ptr > Session::views() const +{ + return views_; +} + std::shared_ptr Session::main_view() const { return main_view_; @@ -148,6 +169,186 @@ shared_ptr Session::main_bar() const return main_bar_; } +void Session::save_settings(QSettings &settings) const +{ + map dev_info; + list key_list; + int stacks = 0, views = 0; + + if (device_) { + shared_ptr hw_device = + dynamic_pointer_cast< devices::HardwareDevice >(device_); + + if (hw_device) { + settings.setValue("device_type", "hardware"); + settings.beginGroup("device"); + + key_list.push_back("vendor"); + key_list.push_back("model"); + key_list.push_back("version"); + key_list.push_back("serial_num"); + key_list.push_back("connection_id"); + + dev_info = device_manager_.get_device_info(device_); + + for (string key : key_list) { + if (dev_info.count(key)) + settings.setValue(QString::fromUtf8(key.c_str()), + QString::fromUtf8(dev_info.at(key).c_str())); + else + settings.remove(QString::fromUtf8(key.c_str())); + } + + settings.endGroup(); + } + + shared_ptr sessionfile_device = + dynamic_pointer_cast< devices::SessionFile >(device_); + + if (sessionfile_device) { + settings.setValue("device_type", "sessionfile"); + settings.beginGroup("device"); + settings.setValue("filename", QString::fromStdString( + sessionfile_device->full_name())); + settings.endGroup(); + } + + // Save channels and decoders + for (shared_ptr base : signalbases_) { +#ifdef ENABLE_DECODE + if (base->is_decode_signal()) { + shared_ptr decoder_stack = + base->decoder_stack(); + std::shared_ptr top_decoder = + decoder_stack->stack().front(); + + settings.beginGroup("decoder_stack" + QString::number(stacks++)); + settings.setValue("id", top_decoder->decoder()->id); + settings.setValue("name", top_decoder->decoder()->name); + settings.endGroup(); + } else +#endif + { + settings.beginGroup(base->internal_name()); + base->save_settings(settings); + settings.endGroup(); + } + } + + settings.setValue("decoder_stacks", stacks); + + // Save view states and their signal settings + // Note: main_view must be saved as view0 + settings.beginGroup("view" + QString::number(views++)); + main_view_->save_settings(settings); + settings.endGroup(); + + for (shared_ptr view : views_) { + if (view != main_view_) { + settings.beginGroup("view" + QString::number(views++)); + view->save_settings(settings); + settings.endGroup(); + } + } + + settings.setValue("views", views); + } +} + +void Session::restore_settings(QSettings &settings) +{ + shared_ptr device; + + QString device_type = settings.value("device_type").toString(); + + if (device_type == "hardware") { + map dev_info; + list key_list; + + // Re-select last used device if possible but only if it's not demo + settings.beginGroup("device"); + key_list.push_back("vendor"); + key_list.push_back("model"); + key_list.push_back("version"); + key_list.push_back("serial_num"); + key_list.push_back("connection_id"); + + for (string key : key_list) { + const QString k = QString::fromStdString(key); + if (!settings.contains(k)) + continue; + + const string value = settings.value(k).toString().toStdString(); + if (!value.empty()) + dev_info.insert(std::make_pair(key, value)); + } + + if (dev_info.count("model") > 0) + device = device_manager_.find_device_from_info(dev_info); + + if (device) + set_device(device); + + settings.endGroup(); + } + + if (device_type == "sessionfile") { + settings.beginGroup("device"); + QString filename = settings.value("filename").toString(); + settings.endGroup(); + + if (QFileInfo(filename).isReadable()) { + device = std::make_shared(device_manager_.context(), + filename.toStdString()); + set_device(device); + + // TODO Perform error handling + start_capture([](QString infoMessage) { (void)infoMessage; }); + + set_name(QFileInfo(filename).fileName()); + } + } + + if (device) { + // Restore channels + for (shared_ptr base : signalbases_) { + settings.beginGroup(base->internal_name()); + base->restore_settings(settings); + settings.endGroup(); + } + + // Restore decoders +#ifdef ENABLE_DECODE + int stacks = settings.value("decoder_stacks").toInt(); + + for (int i = 0; i < stacks; i++) { + settings.beginGroup("decoder_stack" + QString::number(i++)); + + QString id = settings.value("id").toString(); + add_decoder(srd_decoder_get_by_id(id.toStdString().c_str())); + + settings.endGroup(); + } +#endif + + // Restore views + int views = settings.value("views").toInt(); + + for (int i = 0; i < views; i++) { + settings.beginGroup("view" + QString::number(i)); + + if (i > 0) { + view::ViewType type = (view::ViewType)settings.value("type").toInt(); + add_view(name_, type, this); + views_.back()->restore_settings(settings); + } else + main_view_->restore_settings(settings); + + settings.endGroup(); + } + } +} + void Session::set_device(shared_ptr device) { assert(device); @@ -160,6 +361,10 @@ void Session::set_device(shared_ptr device) device_.reset(); + // Revert name back to default name (e.g. "Untitled-1") as the data is gone + name_ = default_name_; + name_changed(); + // Remove all stored data for (std::shared_ptr view : views_) { view->clear_signals(); @@ -188,7 +393,7 @@ void Session::set_device(shared_ptr device) device_->open(); } catch (const QString &e) { device_.reset(); - device_selected(); + device_changed(); throw; } @@ -198,7 +403,7 @@ void Session::set_device(shared_ptr device) }); update_signals(); - device_selected(); + device_changed(); } void Session::set_default_device() @@ -248,6 +453,10 @@ void Session::start_capture(function error_handler) for (const shared_ptr d : all_signal_data_) d->clear(); + // Revert name back to default name (e.g. "Untitled-1") as the data is gone + name_ = default_name_; + name_changed(); + // Begin the session sampling_thread_ = std::thread( &Session::sample_thread_proc, this, error_handler); @@ -269,12 +478,15 @@ void Session::register_view(std::shared_ptr view) main_view_ = view; } - views_.insert(view); + views_.push_back(view); + + update_signals(); } void Session::deregister_view(std::shared_ptr view) { - views_.erase(view); + views_.remove_if([&](std::shared_ptr v) { + return v == view; }); if (views_.empty()) { main_view_.reset(); @@ -284,6 +496,15 @@ void Session::deregister_view(std::shared_ptr view) } } +bool Session::has_view(std::shared_ptr view) +{ + for (std::shared_ptr v : views_) + if (v == view) + return true; + + return false; +} + double Session::get_samplerate() const { double samplerate = 0.0; @@ -346,6 +567,7 @@ bool Session::add_decoder(srd_decoder *const dec) shared_ptr(new data::SignalBase(nullptr)); signalbase->set_decoder_stack(decoder_stack); + signalbases_.insert(signalbase); for (std::shared_ptr view : views_) view->add_decode_trace(signalbase); @@ -450,6 +672,7 @@ void Session::update_signals() if (iter != prev_sigs.end()) { // Copy the signal from the old set to the new signal = *iter; + view->add_signal(signal); } else { // Find the signalbase for this channel if possible signalbase.reset();