X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=da9da12628690cc0b408c1cd5c9eb449bd78ceea;hb=91f8fe8c30131fb438dbdb1b58d69ede7ba9247b;hp=852de2981eb7bd43d9e82cf03154ae7bbeadbff7;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index 852de29..da9da12 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -26,12 +26,13 @@ #include #include -#ifdef ENABLE_DECODE -#include -#endif +#include +#include +#include -#include "session.hpp" +#include +#include "session.hpp" #include "devicemanager.hpp" #include "data/analog.hpp" @@ -45,22 +46,20 @@ #include "devices/hardwaredevice.hpp" #include "devices/sessionfile.hpp" +#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 -#include -#include - -#include - -#include - #include +#ifdef ENABLE_DECODE +#include +#endif + using boost::shared_lock; using boost::shared_mutex; using boost::unique_lock; @@ -96,8 +95,9 @@ using Glib::VariantBase; using Glib::Variant; namespace pv { -Session::Session(DeviceManager &device_manager) : +Session::Session(DeviceManager &device_manager, QString name) : device_manager_(device_manager), + name_(name), capture_state_(Stopped), cur_samplerate_(0) { @@ -131,6 +131,101 @@ 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(); +} + +std::shared_ptr Session::main_view() const +{ + return main_view_; +} + +void Session::set_main_bar(std::shared_ptr main_bar) +{ + main_bar_ = main_bar; +} + +shared_ptr Session::main_bar() const +{ + return main_bar_; +} + +void Session::save_settings(QSettings &settings) const +{ + map dev_info; + list key_list; + + if (device_) { + 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())); + } + + // TODO Save channel settings and decoders + + settings.endGroup(); + } +} + +void Session::restore_settings(QSettings &settings) +{ + map dev_info; + list key_list; + shared_ptr device; + + // 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); + + // TODO Restore channel settings and decoders + } + + settings.endGroup(); +} + void Session::set_device(shared_ptr device) { assert(device); @@ -143,9 +238,17 @@ 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_) + for (std::shared_ptr view : views_) { view->clear_signals(); +#ifdef ENABLE_DECODE + view->clear_decode_traces(); +#endif + } for (const shared_ptr d : all_signal_data_) d->clear(); all_signal_data_.clear(); @@ -158,7 +261,6 @@ void Session::set_device(shared_ptr device) } logic_data_.reset(); - decode_traces_.clear(); signals_changed(); @@ -168,7 +270,7 @@ void Session::set_device(shared_ptr device) device_->open(); } catch (const QString &e) { device_.reset(); - device_selected(); + device_changed(); throw; } @@ -178,7 +280,7 @@ void Session::set_device(shared_ptr device) }); update_signals(); - device_selected(); + device_changed(); } void Session::set_default_device() @@ -228,6 +330,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); @@ -245,12 +351,28 @@ void Session::stop_capture() void Session::register_view(std::shared_ptr view) { + if (views_.empty()) { + main_view_ = view; + } + views_.insert(view); } void Session::deregister_view(std::shared_ptr view) { views_.erase(view); + + if (views_.empty()) { + main_view_.reset(); + + // Without a view there can be no main bar + main_bar_.reset(); + } +} + +bool Session::has_view(std::shared_ptr view) +{ + return views_.find(view) != views_.end(); } double Session::get_samplerate() const @@ -314,10 +436,10 @@ bool Session::add_decoder(srd_decoder *const dec) shared_ptr signalbase = shared_ptr(new data::SignalBase(nullptr)); - shared_ptr d( - new view::DecodeTrace(*this, signalbase, decoder_stack, - decode_traces_.size())); - decode_traces_.push_back(d); + signalbase->set_decoder_stack(decoder_stack); + + for (std::shared_ptr view : views_) + view->add_decode_trace(signalbase); } catch (std::runtime_error e) { return false; } @@ -330,19 +452,10 @@ bool Session::add_decoder(srd_decoder *const dec) return true; } -vector< shared_ptr > Session::get_decode_signals() const +void Session::remove_decode_signal(shared_ptr signalbase) { - return decode_traces_; -} - -void Session::remove_decode_signal(view::DecodeTrace *signal) -{ - for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++) - if ((*i).get() == signal) { - decode_traces_.erase(i); - signals_changed(); - return; - } + for (std::shared_ptr view : views_) + view->remove_decode_trace(signalbase); } #endif @@ -365,8 +478,12 @@ void Session::update_signals() if (!device_) { signalbases_.clear(); logic_data_.reset(); - for (std::shared_ptr view : views_) + for (std::shared_ptr view : views_) { view->clear_signals(); +#ifdef ENABLE_DECODE + view->clear_decode_traces(); +#endif + } return; } @@ -376,8 +493,12 @@ void Session::update_signals() if (!sr_dev) { signalbases_.clear(); logic_data_.reset(); - for (std::shared_ptr view : views_) + for (std::shared_ptr view : views_) { view->clear_signals(); +#ifdef ENABLE_DECODE + view->clear_decode_traces(); +#endif + } return; }