X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.cpp;h=ec8082eb7cf0158ec0c85954a1bcc99e12227b86;hb=e6d85b8936b5b7aee80b03834f095fd5b52fe6f4;hp=85b6c0b4968795666cb422e2919afb892eb58fe8;hpb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 85b6c0b4..ec8082eb 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -105,6 +105,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;
@@ -131,6 +132,11 @@ Session::~Session()
 
 	// Stop and join to the thread
 	stop_capture();
+
+	for (SignalGroup* group : signal_groups_) {
+		group->clear();
+		delete group;
+	}
 }
 
 DeviceManager& Session::device_manager()
@@ -170,6 +176,16 @@ void Session::set_name(QString name)
 	name_changed();
 }
 
+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_;
@@ -438,16 +454,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") {
@@ -466,6 +483,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());
+			}
 		}
 	}
 
@@ -509,8 +534,16 @@ void Session::set_device(shared_ptr<devices::Device> device)
 #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();
@@ -607,8 +640,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);
 	}
@@ -633,7 +670,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;
@@ -691,6 +728,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());
 }
 
@@ -885,17 +926,6 @@ void Session::remove_generated_signal(shared_ptr<data::SignalBase> signal)
 	update_signals();
 }
 
-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;
-}
-
 #ifdef ENABLE_DECODE
 shared_ptr<data::DecodeSignal> Session::add_decode_signal()
 {
@@ -936,6 +966,17 @@ 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_;
@@ -1028,7 +1069,7 @@ void Session::update_signals()
 				signalbase->set_data(logic_data_);
 
 				connect(this, SIGNAL(capture_state_changed(int)),
-						signalbase.get(), SLOT(on_capture_state_changed(int)));
+					signalbase.get(), SLOT(on_capture_state_changed(int)));
 				break;
 
 			case SR_CHANNEL_ANALOG:
@@ -1040,12 +1081,34 @@ void Session::update_signals()
 				signalbase->set_data(data);
 
 				connect(this, SIGNAL(capture_state_changed(int)),
-						signalbase.get(), SLOT(on_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();