X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=6ac66a1ab2af6cbd9e25e5e5f1bac00bf98f2389;hp=4a9c139bb039a90627960d35c6a24a4f64ae7b3f;hb=767bf4e705c4b977301a956cb8d0c777f7e8c8d4;hpb=c8e60bdf0f33b3005e695a6b256b559dbc7b8576

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 4a9c139b..6ac66a1a 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -29,6 +29,7 @@
 #include <pv/binding/decoder.hpp>
 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/row.hpp>
+#include <pv/globalsettings.hpp>
 #include <pv/session.hpp>
 
 using std::lock_guard;
@@ -48,8 +49,6 @@ const double DecodeSignal::DecodeMargin = 1.0;
 const double DecodeSignal::DecodeThreshold = 0.2;
 const int64_t DecodeSignal::DecodeChunkLength = 256 * 1024;
 
-mutex DecodeSignal::global_srd_mutex_;
-
 
 DecodeSignal::DecodeSignal(pv::Session &session) :
 	SignalBase(nullptr, SignalBase::DecodeChannel),
@@ -415,22 +414,61 @@ void DecodeSignal::save_settings(QSettings &settings) const
 
 	settings.setValue("decoders", (int)(stack_.size()));
 
+	// Save decoder stack
 	int decoder_idx = 0;
 	for (shared_ptr<decode::Decoder> decoder : stack_) {
 		settings.beginGroup("decoder" + QString::number(decoder_idx++));
 
 		settings.setValue("id", decoder->decoder()->id);
 
+		// Save decoder options
+		const map<string, GVariant*>& options = decoder->options();
+
+		settings.setValue("options", (int)options.size());
+
+		// Note: decode::Decoder::options() returns only the options
+		// that differ from the default. See binding::Decoder::getter()
+		int i = 0;
+		for (auto option : options) {
+			settings.beginGroup("option" + QString::number(i));
+			settings.setValue("name", QString::fromStdString(option.first));
+			GlobalSettings::store_gvariant(settings, option.second);
+			settings.endGroup();
+			i++;
+		}
+
 		settings.endGroup();
 	}
 
-	// TODO Save channel mapping and decoder options
+	// Save channel mapping
+	settings.setValue("channels", (int)channels_.size());
+
+	for (unsigned int channel_id = 0; channel_id < channels_.size(); channel_id++) {
+		auto channel = find_if(channels_.begin(), channels_.end(),
+			[&](data::DecodeChannel ch) { return ch.id == channel_id; });
+
+		if (channel == channels_.end()) {
+			qDebug() << "ERROR: Gap in channel index:" << channel_id;
+			continue;
+		}
+
+		settings.beginGroup("channel" + QString::number(channel_id));
+
+		settings.setValue("name", channel->name);  // Useful for debugging
+		settings.setValue("initial_pin_state", channel->initial_pin_state);
+
+		if (channel->assigned_signal)
+			settings.setValue("assigned_signal_name", channel->assigned_signal->name());
+
+		settings.endGroup();
+	}
 }
 
 void DecodeSignal::restore_settings(QSettings &settings)
 {
 	SignalBase::restore_settings(settings);
 
+	// Restore decoder stack
 	GSList *dec_list = g_slist_copy((GSList*)srd_decoder_list());
 
 	int decoders = settings.value("decoders").toInt();
@@ -446,7 +484,21 @@ void DecodeSignal::restore_settings(QSettings &settings)
 				continue;
 
 			if (QString::fromUtf8(dec->id) == id) {
-				stack_.push_back(make_shared<decode::Decoder>(dec));
+				shared_ptr<decode::Decoder> decoder =
+					make_shared<decode::Decoder>(dec);
+
+				stack_.push_back(decoder);
+
+				// Restore decoder options that differ from their default
+				int options = settings.value("options").toInt();
+
+				for (int i = 0; i < options; i++) {
+					settings.beginGroup("option" + QString::number(i));
+					QString name = settings.value("name").toString();
+					GVariant *value = GlobalSettings::restore_gvariant(settings);
+					decoder->set_option(name.toUtf8(), value);
+					settings.endGroup();
+				}
 
 				// Include the newly created decode channels in the channel lists
 				update_channel_list();
@@ -457,7 +509,35 @@ void DecodeSignal::restore_settings(QSettings &settings)
 		settings.endGroup();
 	}
 
-	// TODO Restore channel mapping and decoder options
+	// Restore channel mapping
+	unsigned int channels = settings.value("channels").toInt();
+
+	const unordered_set< shared_ptr<data::SignalBase> > signalbases =
+		session_.signalbases();
+
+	for (unsigned int channel_id = 0; channel_id < channels; channel_id++) {
+		auto channel = find_if(channels_.begin(), channels_.end(),
+			[&](data::DecodeChannel ch) { return ch.id == channel_id; });
+
+		if (channel == channels_.end()) {
+			qDebug() << "ERROR: Non-existant channel index:" << channel_id;
+			continue;
+		}
+
+		settings.beginGroup("channel" + QString::number(channel_id));
+
+		QString assigned_signal_name = settings.value("assigned_signal_name").toString();
+
+		for (shared_ptr<data::SignalBase> signal : signalbases)
+			if (signal->name() == assigned_signal_name)
+				channel->assigned_signal = signal.get();
+
+		channel->initial_pin_state = settings.value("initial_pin_state").toInt();
+
+		settings.endGroup();
+	}
+
+	begin_decode();
 }
 
 void DecodeSignal::update_channel_list()
@@ -740,13 +820,8 @@ void DecodeSignal::decode_proc()
 	do {
 		// Keep processing new samples until we exhaust the input data
 		do {
-			// Prevent any other decode threads from accessing libsigrokdecode
-			lock_guard<mutex> srd_lock(global_srd_mutex_);
-
-			{
-				lock_guard<mutex> input_lock(input_mutex_);
-				sample_count = segment_->get_sample_count() - abs_start_samplenum;
-			}
+			lock_guard<mutex> input_lock(input_mutex_);
+			sample_count = segment_->get_sample_count() - abs_start_samplenum;
 
 			if (sample_count > 0) {
 				decode_data(abs_start_samplenum, sample_count);