#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
+#include <QFileInfo>
+
#include <cassert>
#include <mutex>
#include <stdexcept>
namespace pv {
Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
+ default_name_(name),
name_(name),
capture_state_(Stopped),
cur_samplerate_(0)
name_changed();
}
+const std::list< std::shared_ptr<pv::view::View> > Session::views() const
+{
+ return views_;
+}
+
std::shared_ptr<pv::view::View> Session::main_view() const
{
return main_view_;
{
map<string, string> dev_info;
list<string> key_list;
- int stacks = 0;
+ int stacks = 0, views = 0;
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");
+ shared_ptr<devices::HardwareDevice> 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()));
+ }
- dev_info = device_manager_.get_device_info(device_);
+ settings.endGroup();
+ }
- 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()));
+ shared_ptr<devices::SessionFile> 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
}
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::View> 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)
{
- map<string, string> dev_info;
- list<string> key_list;
- shared_ptr<devices::HardwareDevice> 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));
+ shared_ptr<devices::Device> device;
+
+ QString device_type = settings.value("device_type").toString();
+
+ if (device_type == "hardware") {
+ map<string, string> dev_info;
+ list<string> 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 (dev_info.count("model") > 0)
- device = device_manager_.find_device_from_info(dev_info);
+ if (device_type == "sessionfile") {
+ settings.beginGroup("device");
+ QString filename = settings.value("filename").toString();
+ settings.endGroup();
- if (device) {
- set_device(device);
+ if (QFileInfo(filename).isReadable()) {
+ device = std::make_shared<devices::SessionFile>(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<data::SignalBase> base : signalbases_) {
settings.beginGroup(base->internal_name());
settings.endGroup();
}
#endif
- }
- settings.endGroup();
+ // 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<devices::Device> device)
main_view_ = view;
}
- views_.insert(view);
+ views_.push_back(view);
+
+ update_signals();
}
void Session::deregister_view(std::shared_ptr<pv::view::View> view)
{
- views_.erase(view);
+ views_.remove_if([&](std::shared_ptr<pv::view::View> v) {
+ return v == view; });
if (views_.empty()) {
main_view_.reset();
bool Session::has_view(std::shared_ptr<pv::view::View> view)
{
- return views_.find(view) != views_.end();
+ for (std::shared_ptr<pv::view::View> v : views_)
+ if (v == view)
+ return true;
+
+ return false;
}
double Session::get_samplerate() const
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();
projects / pulseview.git / blobdiff