X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=dc16dd97f9b616e4d7f6911e665ddf248a20815d;hb=ac9494eff3ebc74ae7a87746a4d8668c68f32b52;hp=d406b9f21ba040c1fb4707c0f261bb7c75b05b33;hpb=5f9a52096e07e399d76da6724c1cf56bf4511c9f;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index d406b9f2..dc16dd97 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -187,11 +187,50 @@ bool Session::data_saved() const
 	return data_saved_;
 }
 
+void Session::save_setup(QSettings &settings) const
+{
+	int decode_signals = 0, views = 0;
+
+	// Save channels and decoders
+	for (const shared_ptr<data::SignalBase>& base : signalbases_) {
+#ifdef ENABLE_DECODE
+		if (base->is_decode_signal()) {
+			settings.beginGroup("decode_signal" + QString::number(decode_signals++));
+			base->save_settings(settings);
+			settings.endGroup();
+		} else
+#endif
+		{
+			settings.beginGroup(base->internal_name());
+			base->save_settings(settings);
+			settings.endGroup();
+		}
+	}
+
+	settings.setValue("decode_signals", decode_signals);
+
+	// 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 (const shared_ptr<views::ViewBase>& view : views_) {
+		if (view != main_view_) {
+			settings.beginGroup("view" + QString::number(views++));
+			settings.setValue("type", view->get_type());
+			view->save_settings(settings);
+			settings.endGroup();
+		}
+	}
+
+	settings.setValue("views", views);
+}
+
 void Session::save_settings(QSettings &settings) const
 {
 	map<string, string> dev_info;
 	list<string> key_list;
-	int decode_signals = 0, views = 0;
 
 	if (device_) {
 		shared_ptr<devices::HardwareDevice> hw_device =
@@ -241,39 +280,45 @@ void Session::save_settings(QSettings &settings) const
 			settings.endGroup();
 		}
 
-		// Save channels and decoders
-		for (const shared_ptr<data::SignalBase>& base : signalbases_) {
+		save_setup(settings);
+	}
+}
+
+void Session::restore_setup(QSettings &settings)
+{
+	// 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
-			if (base->is_decode_signal()) {
-				settings.beginGroup("decode_signal" + QString::number(decode_signals++));
-				base->save_settings(settings);
-				settings.endGroup();
-			} else
+	int decode_signals = settings.value("decode_signals").toInt();
+
+	for (int i = 0; i < decode_signals; i++) {
+		settings.beginGroup("decode_signal" + QString::number(i));
+		shared_ptr<data::DecodeSignal> signal = add_decode_signal();
+		signal->restore_settings(settings);
+		settings.endGroup();
+	}
 #endif
-			{
-				settings.beginGroup(base->internal_name());
-				base->save_settings(settings);
-				settings.endGroup();
-			}
-		}
 
-		settings.setValue("decode_signals", decode_signals);
+	// Restore views
+	int views = settings.value("views").toInt();
 
-		// 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 (int i = 0; i < views; i++) {
+		settings.beginGroup("view" + QString::number(i));
 
-		for (const shared_ptr<views::ViewBase>& view : views_) {
-			if (view != main_view_) {
-				settings.beginGroup("view" + QString::number(views++));
-				view->save_settings(settings);
-				settings.endGroup();
-			}
-		}
+		if (i > 0) {
+			views::ViewType type = (views::ViewType)settings.value("type").toInt();
+			add_view(type, this);
+			views_.back()->restore_settings(settings);
+		} else
+			main_view_->restore_settings(settings);
 
-		settings.setValue("views", views);
+		settings.endGroup();
 	}
 }
 
@@ -345,42 +390,8 @@ void Session::restore_settings(QSettings &settings)
 		}
 	}
 
-	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 decode_signals = settings.value("decode_signals").toInt();
-
-		for (int i = 0; i < decode_signals; i++) {
-			settings.beginGroup("decode_signal" + QString::number(i));
-			shared_ptr<data::DecodeSignal> signal = add_decode_signal();
-			signal->restore_settings(settings);
-			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();
-		}
-	}
+	if (device)
+		restore_setup(settings);
 }
 
 void Session::select_device(shared_ptr<devices::Device> device)
@@ -515,7 +526,8 @@ Session::input_format_options(vector<string> user_spec,
 	return result;
 }
 
-void Session::load_init_file(const string &file_name, const string &format)
+void Session::load_init_file(const string &file_name,
+	const string &format, const string &setup_file_name)
 {
 	shared_ptr<InputFormat> input_format;
 	map<string, Glib::VariantBase> input_opts;
@@ -539,12 +551,12 @@ void Session::load_init_file(const string &file_name, const string &format)
 			input_format->options());
 	}
 
-	load_file(QString::fromStdString(file_name), input_format, input_opts);
+	load_file(QString::fromStdString(file_name), QString::fromStdString(setup_file_name),
+		input_format, input_opts);
 }
 
-void Session::load_file(QString file_name,
-	shared_ptr<sigrok::InputFormat> format,
-	const map<string, Glib::VariantBase> &options)
+void Session::load_file(QString file_name, QString setup_file_name,
+	shared_ptr<sigrok::InputFormat> format, const map<string, Glib::VariantBase> &options)
 {
 	const QString errorMessage(
 		QString("Failed to load file %1").arg(file_name));
@@ -572,6 +584,18 @@ void Session::load_file(QString file_name,
 		return;
 	}
 
+	// Use the input file with .pvs extension if no setup file was given
+	if (setup_file_name.isEmpty()) {
+		setup_file_name = file_name;
+		setup_file_name.truncate(setup_file_name.lastIndexOf('.'));
+		setup_file_name.append(".pvs");
+	}
+
+	if (QFileInfo::exists(setup_file_name) && QFileInfo(setup_file_name).isReadable()) {
+		QSettings settings_storage(setup_file_name, QSettings::IniFormat);
+		restore_setup(settings_storage);
+	}
+
 	main_bar_->update_device_list();
 
 	start_capture([&, errorMessage](QString infoMessage) {
@@ -640,9 +664,8 @@ void Session::stop_capture()
 
 void Session::register_view(shared_ptr<views::ViewBase> view)
 {
-	if (views_.empty()) {
+	if (views_.empty())
 		main_view_ = view;
-	}
 
 	views_.push_back(view);
 
@@ -650,35 +673,29 @@ 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();
-
-	views::trace::View *trace_view =
-		qobject_cast<views::trace::View*>(view.get());
-
-	if (trace_view) {
-		for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
-			const int sb_exists = count_if(
-				view_signalbases.cbegin(), view_signalbases.cend(),
-				[&](const shared_ptr<data::SignalBase> &sb) {
-					return sb == signalbase;
-				});
-			// Add the signal to the view as it doesn't have it yet
-			if (!sb_exists)
-				switch (signalbase->type()) {
-				case data::SignalBase::AnalogChannel:
-				case data::SignalBase::LogicChannel:
-				case data::SignalBase::DecodeChannel:
+	unordered_set< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
+
+	for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
+		const int sb_exists = count_if(
+			view_signalbases.cbegin(), view_signalbases.cend(),
+			[&](const shared_ptr<data::SignalBase> &sb) {
+				return sb == signalbase;
+			});
+
+		// Add the signal to the view if it doesn't have it yet
+		if (!sb_exists)
+			switch (signalbase->type()) {
+			case data::SignalBase::AnalogChannel:
+			case data::SignalBase::LogicChannel:
+			case data::SignalBase::MathChannel:
+				view->add_signalbase(signalbase);
+				break;
+			case data::SignalBase::DecodeChannel:
 #ifdef ENABLE_DECODE
-					trace_view->add_decode_signal(
-						dynamic_pointer_cast<data::DecodeSignal>(signalbase));
+				view->add_decode_signal(dynamic_pointer_cast<data::DecodeSignal>(signalbase));
 #endif
-					break;
-				case data::SignalBase::MathChannel:
-					// TBD
-					break;
-				}
-		}
+				break;
+			}
 	}
 
 	signals_changed();
@@ -801,6 +818,11 @@ void Session::set_capture_state(capture_state state)
 {
 	bool changed;
 
+	if (state == Running)
+		acq_time_.restart();
+	if (state == Stopped)
+		qDebug("Acquisition took %.2f s", acq_time_.elapsed() / 1000.);
+
 	{
 		lock_guard<mutex> lock(sampling_mutex_);
 		changed = capture_state_ != state;
@@ -1442,4 +1464,17 @@ void Session::on_data_saved()
 	data_saved_ = true;
 }
 
+#ifdef ENABLE_DECODE
+void Session::on_new_decoders_selected(vector<const srd_decoder*> decoders)
+{
+	assert(decoders.size() > 0);
+
+	shared_ptr<data::DecodeSignal> signal = add_decode_signal();
+
+	if (signal)
+		for (const srd_decoder* d : decoders)
+			signal->stack_decoder(d);
+}
+#endif
+
 } // namespace pv