X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=99de77495307386a01be90099c6a6a28402871f5;hp=fd428ed0ebacd0b5ebe628c2b9893c51101ef8b1;hb=101e7a9b40cc97fcd94aca7a1bed086b1f56f269;hpb=0f8f8c180b32413177f3940ea6f216d1cbadf09b

diff --git a/pv/session.cpp b/pv/session.cpp
index fd428ed0..99de7749 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -98,8 +98,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)
 {
@@ -133,6 +134,21 @@ shared_ptr<devices::Device> 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<pv::view::View> Session::main_view() const
 {
 	return main_view_;
@@ -148,6 +164,71 @@ shared_ptr<pv::toolbars::MainBar> Session::main_bar() const
 	return main_bar_;
 }
 
+void Session::save_settings(QSettings &settings) const
+{
+	map<string, string> dev_info;
+	list<string> 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<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));
+	}
+
+	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<devices::Device> device)
 {
 	assert(device);
@@ -160,6 +241,10 @@ void Session::set_device(shared_ptr<devices::Device> 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<pv::view::View> view : views_) {
 		view->clear_signals();
@@ -248,6 +333,10 @@ void Session::start_capture(function<void (const QString)> error_handler)
 	for (const shared_ptr<data::SignalData> 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);
@@ -284,6 +373,11 @@ void Session::deregister_view(std::shared_ptr<pv::view::View> view)
 	}
 }
 
+bool Session::has_view(std::shared_ptr<pv::view::View> view)
+{
+	return views_.find(view) != views_.end();
+}
+
 double Session::get_samplerate() const
 {
 	double samplerate = 0.0;