X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=a71ad1c56d2b2001bf0e65cdb2e706613ba09f1a;hp=b3f8ba87de7e31aa57bbc7dba5b4687fd45557f7;hb=73d5a9bbc2f32ed84077ca4e75a125a6b0fc1921;hpb=e887fe9e6ede73b9fe9ace9c6bfd4f6a096eb3b2

diff --git a/pv/session.cpp b/pv/session.cpp
index b3f8ba87..a71ad1c5 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 
 #include <QDebug>
+#include <QDir>
 #include <QFileInfo>
 
 #include "devicemanager.hpp"
@@ -67,8 +68,8 @@ using std::bad_alloc;
 using std::dynamic_pointer_cast;
 using std::find_if;
 using std::function;
-using std::lock_guard;
 using std::list;
+using std::lock_guard;
 using std::make_pair;
 using std::make_shared;
 using std::map;
@@ -84,7 +85,6 @@ using std::string;
 using std::unique_lock;
 #endif
 using std::unique_ptr;
-using std::unordered_set;
 using std::vector;
 
 using sigrok::Analog;
@@ -106,6 +106,7 @@ using Gst::ElementFactory;
 using Gst::Pipeline;
 #endif
 
+using pv::data::SignalGroup;
 using pv::util::Timestamp;
 using pv::views::trace::Signal;
 using pv::views::trace::AnalogSignal;
@@ -116,6 +117,7 @@ namespace pv {
 shared_ptr<sigrok::Context> Session::sr_context;
 
 Session::Session(DeviceManager &device_manager, QString name) :
+	shutting_down_(false),
 	device_manager_(device_manager),
 	default_name_(name),
 	name_(name),
@@ -127,8 +129,15 @@ Session::Session(DeviceManager &device_manager, QString name) :
 
 Session::~Session()
 {
+	shutting_down_ = true;
+
 	// Stop and join to the thread
 	stop_capture();
+
+	for (SignalGroup* group : signal_groups_) {
+		group->clear();
+		delete group;
+	}
 }
 
 DeviceManager& Session::device_manager()
@@ -168,7 +177,17 @@ void Session::set_name(QString name)
 	name_changed();
 }
 
-const list< shared_ptr<views::ViewBase> > Session::views() const
+QString Session::save_path() const
+{
+	return save_path_;
+}
+
+void Session::set_save_path(QString path)
+{
+	save_path_ = path;
+}
+
+const vector< shared_ptr<views::ViewBase> > Session::views() const
 {
 	return views_;
 }
@@ -233,31 +252,40 @@ void Session::save_setup(QSettings &settings) const
 
 	settings.setValue("views", i);
 
+	int view_id = 0;
 	i = 0;
-	shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(main_view_);
-	for (const shared_ptr<views::trace::TimeItem>& time_item : tv->time_items()) {
-
-		const shared_ptr<views::trace::Flag> flag =
-			dynamic_pointer_cast<views::trace::Flag>(time_item);
-		if (flag) {
-			if (!flag->enabled())
-				continue;
+	for (const shared_ptr<views::ViewBase>& vb : views_) {
+		shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(vb);
+		if (tv) {
+			for (const shared_ptr<views::trace::TimeItem>& time_item : tv->time_items()) {
+
+				const shared_ptr<views::trace::Flag> flag =
+					dynamic_pointer_cast<views::trace::Flag>(time_item);
+				if (flag) {
+					if (!flag->enabled())
+						continue;
+
+					settings.beginGroup("meta_obj" + QString::number(i++));
+					settings.setValue("type", "time_marker");
+					settings.setValue("assoc_view", view_id);
+					GlobalSettings::store_timestamp(settings, "time", flag->time());
+					settings.setValue("text", flag->get_text());
+					settings.endGroup();
+				}
+			}
 
-			settings.beginGroup("meta_obj" + QString::number(i++));
-			settings.setValue("type", "time_marker");
-			GlobalSettings::store_timestamp(settings, "time", flag->time());
-			settings.setValue("text", flag->get_text());
-			settings.endGroup();
+			if (tv->cursors_shown()) {
+				settings.beginGroup("meta_obj" + QString::number(i++));
+				settings.setValue("type", "selection");
+				settings.setValue("assoc_view", view_id);
+				const shared_ptr<views::trace::CursorPair> cp = tv->cursors();
+				GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time());
+				GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time());
+				settings.endGroup();
+			}
 		}
-	}
 
-	if (tv->cursors_shown()) {
-		settings.beginGroup("meta_obj" + QString::number(i++));
-		settings.setValue("type", "selection");
-		const shared_ptr<views::trace::CursorPair> cp = tv->cursors();
-		GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time());
-		GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time());
-		settings.endGroup();
+		view_id++;
 	}
 
 	settings.setValue("meta_objs", i);
@@ -295,25 +323,36 @@ void Session::save_settings(QSettings &settings) const
 			settings.endGroup();
 		}
 
-		shared_ptr<devices::SessionFile> sessionfile_device =
-			dynamic_pointer_cast<devices::SessionFile>(device_);
-
-		if (sessionfile_device) {
+		// Having saved the data to srzip overrides the current device. This is
+		// a crappy hack around the fact that saving e.g. an imported file to
+		// srzip would require changing the underlying libsigrok device
+		if (!save_path_.isEmpty()) {
+			QFileInfo fi = QFileInfo(QDir(save_path_), name_);
 			settings.setValue("device_type", "sessionfile");
 			settings.beginGroup("device");
-			settings.setValue("filename", QString::fromStdString(
-				sessionfile_device->full_name()));
+			settings.setValue("filename", fi.absoluteFilePath());
 			settings.endGroup();
-		}
+		} else {
+			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();
+			}
 
-		shared_ptr<devices::InputFile> inputfile_device =
-			dynamic_pointer_cast<devices::InputFile>(device_);
+			shared_ptr<devices::InputFile> inputfile_device =
+				dynamic_pointer_cast<devices::InputFile>(device_);
 
-		if (inputfile_device) {
-			settings.setValue("device_type", "inputfile");
-			settings.beginGroup("device");
-			inputfile_device->save_meta_to_settings(settings);
-			settings.endGroup();
+			if (inputfile_device) {
+				settings.setValue("device_type", "inputfile");
+				settings.beginGroup("device");
+				inputfile_device->save_meta_to_settings(settings);
+				settings.endGroup();
+			}
 		}
 
 		save_setup(settings);
@@ -360,18 +399,26 @@ void Session::restore_setup(QSettings &settings)
 	// Restore meta objects like markers and cursors
 	int meta_objs = settings.value("meta_objs").toInt();
 
-	shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(main_view_);
 	for (int i = 0; i < meta_objs; i++) {
 		settings.beginGroup("meta_obj" + QString::number(i));
+
+		shared_ptr<views::ViewBase> vb;
+		shared_ptr<views::trace::View> tv;
+		if (settings.contains("assoc_view"))
+			vb = views_.at(settings.value("assoc_view").toInt());
+
+		if (vb)
+			tv = dynamic_pointer_cast<views::trace::View>(vb);
+
 		const QString type = settings.value("type").toString();
 
-		if (type == "time_marker") {
+		if ((type == "time_marker") && tv) {
 			Timestamp ts = GlobalSettings::restore_timestamp(settings, "time");
 			shared_ptr<views::trace::Flag> flag = tv->add_flag(ts);
 			flag->set_text(settings.value("text").toString());
 		}
 
-		if (type == "selection") {
+		if ((type == "selection") && tv) {
 			Timestamp start = GlobalSettings::restore_timestamp(settings, "start_time");
 			Timestamp end = GlobalSettings::restore_timestamp(settings, "end_time");
 			tv->set_cursors(start, end);
@@ -419,16 +466,17 @@ void Session::restore_settings(QSettings &settings)
 		settings.endGroup();
 	}
 
+
+	QString filename;
 	if ((device_type == "sessionfile") || (device_type == "inputfile")) {
 		if (device_type == "sessionfile") {
 			settings.beginGroup("device");
-			const QString filename = settings.value("filename").toString();
+			filename = settings.value("filename").toString();
 			settings.endGroup();
 
-			if (QFileInfo(filename).isReadable()) {
+			if (QFileInfo(filename).isReadable())
 				device = make_shared<devices::SessionFile>(device_manager_.context(),
 					filename.toStdString());
-			}
 		}
 
 		if (device_type == "inputfile") {
@@ -447,6 +495,14 @@ void Session::restore_settings(QSettings &settings)
 
 			set_name(QString::fromStdString(
 				dynamic_pointer_cast<devices::File>(device)->display_name(device_manager_)));
+
+			if (!filename.isEmpty()) {
+				// Only set the save path if we load an srzip file
+				if (device_type == "sessionfile")
+					set_save_path(QFileInfo(filename).absolutePath());
+
+				set_name(QFileInfo(filename).fileName());
+			}
 		}
 	}
 
@@ -484,14 +540,22 @@ void Session::set_device(shared_ptr<devices::Device> device)
 
 	// Remove all stored data and reset all views
 	for (shared_ptr<views::ViewBase> view : views_) {
-		view->clear_signals();
+		view->clear_signalbases();
 #ifdef ENABLE_DECODE
 		view->clear_decode_signals();
 #endif
 		view->reset_view_state();
 	}
+
+	for (SignalGroup* group : signal_groups_) {
+		group->clear();
+		delete group;
+	}
+	signal_groups_.clear();
+
 	for (const shared_ptr<data::SignalData>& d : all_signal_data_)
 		d->clear();
+
 	all_signal_data_.clear();
 	signalbases_.clear();
 	cur_logic_segment_.reset();
@@ -588,8 +652,12 @@ Session::input_format_options(vector<string> user_spec,
 		 * data type.
 		 */
 		auto found = fmt_opts.find(key);
-		if (found == fmt_opts.end())
+		if (found == fmt_opts.end()) {
+			qCritical() << "Supplied input option" << QString::fromStdString(key) <<
+				"is not a valid option for this input module, it will be ignored!";
 			continue;
+		}
+
 		shared_ptr<Option> opt = found->second;
 		result[key] = opt->parse_string(val);
 	}
@@ -614,7 +682,7 @@ void Session::load_init_file(const string &file_name,
 				return f.first == user_name; });
 		if (iter == formats.end()) {
 			MainWindow::show_session_error(tr("Error"),
-				tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
+				tr("Unexpected input format: %1").arg(QString::fromStdString(format)));
 			return;
 		}
 		input_format = (*iter).second;
@@ -672,6 +740,10 @@ void Session::load_file(QString file_name, QString setup_file_name,
 	start_capture([&, errorMessage](QString infoMessage) {
 		MainWindow::show_session_error(errorMessage, infoMessage); });
 
+	// Only set save path if we loaded an srzip file
+	if (dynamic_pointer_cast<devices::SessionFile>(device_))
+		set_save_path(QFileInfo(file_name).absolutePath());
+
 	set_name(QFileInfo(file_name).fileName());
 }
 
@@ -744,7 +816,7 @@ void Session::register_view(shared_ptr<views::ViewBase> view)
 	update_signals();
 
 	// Add all other signals
-	unordered_set< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
+	vector< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
 
 	for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
 		const int sb_exists = count_if(
@@ -774,7 +846,9 @@ void Session::register_view(shared_ptr<views::ViewBase> view)
 
 void Session::deregister_view(shared_ptr<views::ViewBase> view)
 {
-	views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
+	views_.erase(std::remove_if(views_.begin(), views_.end(),
+		[&](shared_ptr<views::ViewBase> v) { return v == view; }),
+		views_.end());
 
 	if (views_.empty()) {
 		main_view_.reset();
@@ -834,20 +908,34 @@ vector<util::Timestamp> Session::get_triggers(uint32_t segment_id) const
 	return result;
 }
 
-const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
+const vector< shared_ptr<data::SignalBase> > Session::signalbases() const
 {
 	return signalbases_;
 }
 
-bool Session::all_segments_complete(uint32_t segment_id) const
+void Session::add_generated_signal(shared_ptr<data::SignalBase> signal)
 {
-	bool all_complete = true;
+	signalbases_.push_back(signal);
 
-	for (const shared_ptr<data::SignalBase>& base : signalbases_)
-		if (!base->segment_is_complete(segment_id))
-			all_complete = false;
+	for (shared_ptr<views::ViewBase>& view : views_)
+		view->add_signalbase(signal);
 
-	return all_complete;
+	update_signals();
+}
+
+void Session::remove_generated_signal(shared_ptr<data::SignalBase> signal)
+{
+	if (shutting_down_)
+		return;
+
+	signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+		[&](shared_ptr<data::SignalBase> s) { return s == signal; }),
+		signalbases_.end());
+
+	for (shared_ptr<views::ViewBase>& view : views_)
+		view->remove_signalbase(signal);
+
+	update_signals();
 }
 
 #ifdef ENABLE_DECODE
@@ -859,7 +947,7 @@ shared_ptr<data::DecodeSignal> Session::add_decode_signal()
 		// Create the decode signal
 		signal = make_shared<data::DecodeSignal>(*this);
 
-		signalbases_.insert(signal);
+		signalbases_.push_back(signal);
 
 		// Add the decode signal to all views
 		for (shared_ptr<views::ViewBase>& view : views_)
@@ -876,7 +964,12 @@ shared_ptr<data::DecodeSignal> Session::add_decode_signal()
 
 void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-	signalbases_.erase(signal);
+	if (shutting_down_)
+		return;
+
+	signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+		[&](shared_ptr<data::SignalBase> s) { return s == signal; }),
+		signalbases_.end());
 
 	for (shared_ptr<views::ViewBase>& view : views_)
 		view->remove_decode_signal(signal);
@@ -885,6 +978,22 @@ void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 }
 #endif
 
+bool Session::all_segments_complete(uint32_t segment_id) const
+{
+	bool all_complete = true;
+
+	for (const shared_ptr<data::SignalBase>& base : signalbases_)
+		if (!base->segment_is_complete(segment_id))
+			all_complete = false;
+
+	return all_complete;
+}
+
+MetadataObjManager* Session::metadata_obj_manager()
+{
+	return &metadata_obj_manager_;
+}
+
 void Session::set_capture_state(capture_state state)
 {
 	bool changed;
@@ -910,7 +1019,7 @@ void Session::update_signals()
 		signalbases_.clear();
 		logic_data_.reset();
 		for (shared_ptr<views::ViewBase>& view : views_) {
-			view->clear_signals();
+			view->clear_signalbases();
 #ifdef ENABLE_DECODE
 			view->clear_decode_signals();
 #endif
@@ -925,7 +1034,7 @@ void Session::update_signals()
 		signalbases_.clear();
 		logic_data_.reset();
 		for (shared_ptr<views::ViewBase>& view : views_) {
-			view->clear_signals();
+			view->clear_signalbases();
 #ifdef ENABLE_DECODE
 			view->clear_decode_signals();
 #endif
@@ -940,7 +1049,7 @@ void Session::update_signals()
 		[] (shared_ptr<Channel> channel) {
 			return channel->type() == sigrok::ChannelType::LOGIC; });
 
-	// Create data containers for the logic data segments
+	// Create a common data container for the logic signalbases
 	{
 		lock_guard<recursive_mutex> data_lock(data_mutex_);
 
@@ -948,97 +1057,96 @@ void Session::update_signals()
 			logic_data_.reset();
 		} else if (!logic_data_ ||
 			logic_data_->num_channels() != logic_channel_count) {
-			logic_data_.reset(new data::Logic(
-				logic_channel_count));
+			logic_data_.reset(new data::Logic(logic_channel_count));
 			assert(logic_data_);
 		}
 	}
 
-	// Make the signals list
-	for (shared_ptr<views::ViewBase>& viewbase : views_) {
-		views::trace::View *trace_view =
-			qobject_cast<views::trace::View*>(viewbase.get());
-
-		if (trace_view) {
-			unordered_set< shared_ptr<Signal> > prev_sigs(trace_view->signals());
-			trace_view->clear_signals();
-
-			for (auto channel : sr_dev->channels()) {
-				shared_ptr<data::SignalBase> signalbase;
-				shared_ptr<Signal> signal;
-
-				// Find the channel in the old signals
-				const auto iter = find_if(
-					prev_sigs.cbegin(), prev_sigs.cend(),
-					[&](const shared_ptr<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;
-
-					shared_ptr<Signal> signal;
-
-					switch(channel->type()->id()) {
-					case SR_CHANNEL_LOGIC:
-						if (!signalbase) {
-							signalbase = make_shared<data::SignalBase>(channel,
-								data::SignalBase::LogicChannel);
-							signalbases_.insert(signalbase);
-
-							all_signal_data_.insert(logic_data_);
-							signalbase->set_data(logic_data_);
-
-							connect(this, SIGNAL(capture_state_changed(int)),
-								signalbase.get(), SLOT(on_capture_state_changed(int)));
-						}
-
-						signal = shared_ptr<Signal>(new LogicSignal(*this, device_, signalbase));
-						break;
+	// Create signalbases if necessary
+	for (auto channel : sr_dev->channels()) {
 
-					case SR_CHANNEL_ANALOG:
-					{
-						if (!signalbase) {
-							signalbase = make_shared<data::SignalBase>(channel,
-								data::SignalBase::AnalogChannel);
-							signalbases_.insert(signalbase);
+		// Try to find the channel in the list of existing signalbases
+		const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(),
+			[&](const shared_ptr<SignalBase> &sb) { return sb->channel() == channel; });
 
-							shared_ptr<data::Analog> data(new data::Analog());
-							all_signal_data_.insert(data);
-							signalbase->set_data(data);
+		// Not found, let's make a signalbase for it
+		if (iter == signalbases_.cend()) {
+			shared_ptr<SignalBase> signalbase;
+			switch(channel->type()->id()) {
+			case SR_CHANNEL_LOGIC:
+				signalbase = make_shared<data::SignalBase>(channel, data::SignalBase::LogicChannel);
+				signalbases_.push_back(signalbase);
 
-							connect(this, SIGNAL(capture_state_changed(int)),
-								signalbase.get(), SLOT(on_capture_state_changed(int)));
-						}
+				all_signal_data_.insert(logic_data_);
+				signalbase->set_data(logic_data_);
 
-						signal = shared_ptr<Signal>(new AnalogSignal(*this, signalbase));
-						break;
-					}
+				connect(this, SIGNAL(capture_state_changed(int)),
+					signalbase.get(), SLOT(on_capture_state_changed(int)));
+				break;
 
-					default:
-						assert(false);
-						break;
-					}
+			case SR_CHANNEL_ANALOG:
+				signalbase = make_shared<data::SignalBase>(channel, data::SignalBase::AnalogChannel);
+				signalbases_.push_back(signalbase);
 
-					// New views take their signal settings from the main view
-					if (!viewbase->is_main_view()) {
-						shared_ptr<pv::views::trace::View> main_tv =
-							dynamic_pointer_cast<pv::views::trace::View>(main_view_);
-						shared_ptr<Signal> main_signal =
-							main_tv->get_signal_by_signalbase(signalbase);
-						signal->restore_settings(main_signal->save_settings());
-					}
+				shared_ptr<data::Analog> data(new data::Analog());
+				all_signal_data_.insert(data);
+				signalbase->set_data(data);
 
-					trace_view->add_signal(signal);
+				connect(this, SIGNAL(capture_state_changed(int)),
+					signalbase.get(), SLOT(on_capture_state_changed(int)));
+				break;
+			}
+		}
+	}
+
+	// Create and assign default signal groups if needed
+	if (signal_groups_.empty()) {
+		for (auto& entry : sr_dev->channel_groups()) {
+			const shared_ptr<sigrok::ChannelGroup>& group = entry.second;
+
+			if (group->channels().size() <= 1)
+				continue;
+
+			SignalGroup* sg = new SignalGroup(QString::fromStdString(entry.first));
+			for (const shared_ptr<sigrok::Channel>& channel : group->channels()) {
+				for (shared_ptr<data::SignalBase> s : signalbases_) {
+					if (s->channel() == channel) {
+						sg->append_signal(s);
+						break;
+					}
 				}
 			}
+			signal_groups_.emplace_back(sg);
+		}
+	}
+
+	// Update all views
+	for (shared_ptr<views::ViewBase>& viewbase : views_) {
+		vector< shared_ptr<SignalBase> > view_signalbases =
+				viewbase->signalbases();
+
+		// Add all non-decode signalbases that don't yet exist in the view
+		for (shared_ptr<SignalBase>& session_sb : signalbases_) {
+			if (session_sb->type() == SignalBase::DecodeChannel)
+				continue;
+
+			const auto iter = find_if(view_signalbases.cbegin(), view_signalbases.cend(),
+				[&](const shared_ptr<SignalBase> &sb) { return sb == session_sb; });
+
+			if (iter == view_signalbases.cend())
+				viewbase->add_signalbase(session_sb);
+		}
+
+		// Remove all non-decode signalbases that no longer exist
+		for (shared_ptr<SignalBase>& view_sb : view_signalbases) {
+			if (view_sb->type() == SignalBase::DecodeChannel)
+				continue;
+
+			const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(),
+				[&](const shared_ptr<SignalBase> &sb) {	return sb == view_sb; });
+
+			if (iter == signalbases_.cend())
+				viewbase->remove_signalbase(view_sb);
 		}
 	}
 
@@ -1104,6 +1212,8 @@ void Session::sample_thread_proc(function<void (const QString)> error_handler)
 		lock_guard<recursive_mutex> lock(data_mutex_);
 		cur_logic_segment_.reset();
 		cur_analog_segments_.clear();
+		for (shared_ptr<data::SignalBase> sb : signalbases_)
+			sb->clear_sample_data();
 	}
 	highest_segment_id_ = -1;
 	frame_began_ = false;
@@ -1346,7 +1456,7 @@ void Session::feed_in_frame_end()
 	signal_segment_completed();
 }
 
-void Session::feed_in_logic(shared_ptr<Logic> logic)
+void Session::feed_in_logic(shared_ptr<sigrok::Logic> logic)
 {
 	if (logic->data_length() == 0) {
 		qDebug() << "WARNING: Received logic packet with 0 samples.";
@@ -1390,7 +1500,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 	data_received();
 }
 
-void Session::feed_in_analog(shared_ptr<Analog> analog)
+void Session::feed_in_analog(shared_ptr<sigrok::Analog> analog)
 {
 	if (analog->num_samples() == 0) {
 		qDebug() << "WARNING: Received analog packet with 0 samples.";