X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=3c5bcc426cd750fcca98ab1a56c9b97c70a86009;hp=b18d27ff9e8065f796b8434c21808a5568130737;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=1e4d7c4d21f72aa6b7078e92c0d159d2bd35eb4a

diff --git a/pv/session.cpp b/pv/session.cpp
index b18d27ff..3c5bcc42 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -26,6 +26,8 @@
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
+#include <QFileInfo>
+
 #include <cassert>
 #include <mutex>
 #include <stdexcept>
@@ -97,6 +99,7 @@ using Glib::Variant;
 namespace pv {
 Session::Session(DeviceManager &device_manager, QString name) :
 	device_manager_(device_manager),
+	default_name_(name),
 	name_(name),
 	capture_state_(Stopped),
 	cur_samplerate_(0)
@@ -146,7 +149,12 @@ void Session::set_name(QString name)
 	name_changed();
 }
 
-std::shared_ptr<pv::view::View> Session::main_view() const
+const std::list< std::shared_ptr<views::ViewBase> > Session::views() const
+{
+	return views_;
+}
+
+std::shared_ptr<views::ViewBase> Session::main_view() const
 {
 	return main_view_;
 }
@@ -165,65 +173,180 @@ void Session::save_settings(QSettings &settings) const
 {
 	map<string, string> dev_info;
 	list<string> key_list;
+	int stacks = 0, views = 0;
 
 	if (device_) {
-		settings.beginGroup("Device");
+		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()));
+			}
+
+			settings.endGroup();
+		}
+
+		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
+		for (shared_ptr<data::SignalBase> base : signalbases_) {
+#ifdef ENABLE_DECODE
+			if (base->is_decode_signal()) {
+				shared_ptr<pv::data::DecoderStack> decoder_stack =
+						base->decoder_stack();
+				std::shared_ptr<data::decode::Decoder> 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<views::ViewBase> 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<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");
 
-		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()));
+			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));
 		}
 
-		// TODO Save channel settings and decoders
+		if (dev_info.count("model") > 0)
+			device = device_manager_.find_device_from_info(dev_info);
+
+		if (device)
+			set_device(device);
 
 		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 (device_type == "sessionfile") {
+		settings.beginGroup("device");
+		QString filename = settings.value("filename").toString();
+		settings.endGroup();
 
-	if (dev_info.count("model") > 0)
-		device = device_manager_.find_device_from_info(dev_info);
+		if (QFileInfo(filename).isReadable()) {
+			device = std::make_shared<devices::SessionFile>(device_manager_.context(),
+				filename.toStdString());
+			set_device(device);
 
-	if (device) {
-		set_device(device);
+			// TODO Perform error handling
+			start_capture([](QString infoMessage) { (void)infoMessage; });
 
-		// TODO Restore channel settings and decoders
+			set_name(QFileInfo(filename).fileName());
+		}
 	}
 
-	settings.endGroup();
+	if (device) {
+		// Restore channels
+		for (shared_ptr<data::SignalBase> 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) {
+				views::ViewType type = (views::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)
@@ -243,10 +366,10 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	name_changed();
 
 	// Remove all stored data
-	for (std::shared_ptr<pv::view::View> view : views_) {
+	for (std::shared_ptr<views::ViewBase> view : views_) {
 		view->clear_signals();
 #ifdef ENABLE_DECODE
-		view->clear_decode_traces();
+		view->clear_decode_signals();
 #endif
 	}
 	for (const shared_ptr<data::SignalData> d : all_signal_data_)
@@ -270,7 +393,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 		device_->open();
 	} catch (const QString &e) {
 		device_.reset();
-		device_selected();
+		device_changed();
 		throw;
 	}
 
@@ -280,7 +403,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 		});
 
 	update_signals();
-	device_selected();
+	device_changed();
 }
 
 void Session::set_default_device()
@@ -349,18 +472,21 @@ void Session::stop_capture()
 		sampling_thread_.join();
 }
 
-void Session::register_view(std::shared_ptr<pv::view::View> view)
+void Session::register_view(std::shared_ptr<views::ViewBase> view)
 {
 	if (views_.empty()) {
 		main_view_ = view;
 	}
 
-	views_.insert(view);
+	views_.push_back(view);
+
+	update_signals();
 }
 
-void Session::deregister_view(std::shared_ptr<pv::view::View> view)
+void Session::deregister_view(std::shared_ptr<views::ViewBase> view)
 {
-	views_.erase(view);
+	views_.remove_if([&](std::shared_ptr<views::ViewBase> v) {
+		return v == view; });
 
 	if (views_.empty()) {
 		main_view_.reset();
@@ -370,9 +496,13 @@ void Session::deregister_view(std::shared_ptr<pv::view::View> view)
 	}
 }
 
-bool Session::has_view(std::shared_ptr<pv::view::View> view)
+bool Session::has_view(std::shared_ptr<views::ViewBase> view)
 {
-	return views_.find(view) != views_.end();
+	for (std::shared_ptr<views::ViewBase> v : views_)
+		if (v == view)
+			return true;
+
+	return false;
 }
 
 double Session::get_samplerate() const
@@ -437,9 +567,10 @@ bool Session::add_decoder(srd_decoder *const dec)
 			shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
 
 		signalbase->set_decoder_stack(decoder_stack);
+		signalbases_.insert(signalbase);
 
-		for (std::shared_ptr<pv::view::View> view : views_)
-			view->add_decode_trace(signalbase);
+		for (std::shared_ptr<views::ViewBase> view : views_)
+			view->add_decode_signal(signalbase);
 	} catch (std::runtime_error e) {
 		return false;
 	}
@@ -454,8 +585,8 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
 {
-	for (std::shared_ptr<pv::view::View> view : views_)
-		view->remove_decode_trace(signalbase);
+	for (std::shared_ptr<views::ViewBase> view : views_)
+		view->remove_decode_signal(signalbase);
 }
 #endif
 
@@ -478,10 +609,10 @@ void Session::update_signals()
 	if (!device_) {
 		signalbases_.clear();
 		logic_data_.reset();
-		for (std::shared_ptr<pv::view::View> view : views_) {
+		for (std::shared_ptr<views::ViewBase> view : views_) {
 			view->clear_signals();
 #ifdef ENABLE_DECODE
-			view->clear_decode_traces();
+			view->clear_decode_signals();
 #endif
 		}
 		return;
@@ -493,10 +624,10 @@ void Session::update_signals()
 	if (!sr_dev) {
 		signalbases_.clear();
 		logic_data_.reset();
-		for (std::shared_ptr<pv::view::View> view : views_) {
+		for (std::shared_ptr<views::ViewBase> view : views_) {
 			view->clear_signals();
 #ifdef ENABLE_DECODE
-			view->clear_decode_traces();
+			view->clear_decode_signals();
 #endif
 		}
 		return;
@@ -524,69 +655,76 @@ void Session::update_signals()
 	}
 
 	// Make the signals list
-	for (std::shared_ptr<pv::view::View> view : views_) {
-		unordered_set< shared_ptr<view::Signal> > prev_sigs(view->signals());
-		view->clear_signals();
-
-		for (auto channel : sr_dev->channels()) {
-			shared_ptr<data::SignalBase> signalbase;
-			shared_ptr<view::Signal> signal;
-
-			// Find the channel in the old signals
-			const auto iter = std::find_if(
-				prev_sigs.cbegin(), prev_sigs.cend(),
-				[&](const shared_ptr<view::Signal> &s) {
-					return s->base()->channel() == channel;
-				});
-			if (iter != prev_sigs.end()) {
-				// Copy the signal from the old set to the new
-				signal = *iter;
-			} else {
-				// Find the signalbase for this channel if possible
-				signalbase.reset();
-				for (const shared_ptr<data::SignalBase> b : signalbases_)
-					if (b->channel() == channel)
-						signalbase = b;
-
-				switch(channel->type()->id()) {
-				case SR_CHANNEL_LOGIC:
-					if (!signalbase) {
-						signalbase = shared_ptr<data::SignalBase>(
-							new data::SignalBase(channel));
-						signalbases_.insert(signalbase);
-
-						all_signal_data_.insert(logic_data_);
-						signalbase->set_data(logic_data_);
+	for (std::shared_ptr<views::ViewBase> viewbase : views_) {
+		views::TraceView::View *trace_view =
+			qobject_cast<views::TraceView::View*>(viewbase.get());
+
+		if (trace_view) {
+			unordered_set< shared_ptr<views::TraceView::Signal> >
+				prev_sigs(trace_view->signals());
+			trace_view->clear_signals();
+
+			for (auto channel : sr_dev->channels()) {
+				shared_ptr<data::SignalBase> signalbase;
+				shared_ptr<views::TraceView::Signal> signal;
+
+				// Find the channel in the old signals
+				const auto iter = std::find_if(
+					prev_sigs.cbegin(), prev_sigs.cend(),
+					[&](const shared_ptr<views::TraceView::Signal> &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<data::SignalBase> b : signalbases_)
+						if (b->channel() == channel)
+							signalbase = b;
+
+					switch(channel->type()->id()) {
+					case SR_CHANNEL_LOGIC:
+						if (!signalbase) {
+							signalbase = shared_ptr<data::SignalBase>(
+								new data::SignalBase(channel));
+							signalbases_.insert(signalbase);
+
+							all_signal_data_.insert(logic_data_);
+							signalbase->set_data(logic_data_);
+						}
+
+						signal = shared_ptr<views::TraceView::Signal>(
+							new views::TraceView::LogicSignal(*this,
+								device_, signalbase));
+						trace_view->add_signal(signal);
+						break;
+
+					case SR_CHANNEL_ANALOG:
+					{
+						if (!signalbase) {
+							signalbase = shared_ptr<data::SignalBase>(
+								new data::SignalBase(channel));
+							signalbases_.insert(signalbase);
+
+							shared_ptr<data::Analog> data(new data::Analog());
+							all_signal_data_.insert(data);
+							signalbase->set_data(data);
+						}
+
+						signal = shared_ptr<views::TraceView::Signal>(
+							new views::TraceView::AnalogSignal(
+								*this, signalbase));
+						trace_view->add_signal(signal);
+						break;
 					}
 
-					signal = shared_ptr<view::Signal>(
-						new view::LogicSignal(*this,
-							device_, signalbase));
-					view->add_signal(signal);
-					break;
-
-				case SR_CHANNEL_ANALOG:
-				{
-					if (!signalbase) {
-						signalbase = shared_ptr<data::SignalBase>(
-							new data::SignalBase(channel));
-						signalbases_.insert(signalbase);
-
-						shared_ptr<data::Analog> data(new data::Analog());
-						all_signal_data_.insert(data);
-						signalbase->set_data(data);
+					default:
+						assert(0);
+						break;
 					}
-
-					signal = shared_ptr<view::Signal>(
-						new view::AnalogSignal(
-							*this, signalbase));
-					view->add_signal(signal);
-					break;
-				}
-
-				default:
-					assert(0);
-					break;
 				}
 			}
 		}