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

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 5701aeb0..4a9c139b 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -69,19 +69,7 @@ DecodeSignal::DecodeSignal(pv::Session &session) :
 
 DecodeSignal::~DecodeSignal()
 {
-	if (decode_thread_.joinable()) {
-		decode_interrupt_ = true;
-		decode_input_cond_.notify_one();
-		decode_thread_.join();
-	}
-
-	if (logic_mux_thread_.joinable()) {
-		logic_mux_interrupt_ = true;
-		logic_mux_cond_.notify_one();
-		logic_mux_thread_.join();
-	}
-
-	stop_srd_session();
+	reset_decode();
 }
 
 const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
@@ -89,7 +77,7 @@ const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
 	return stack_;
 }
 
-void DecodeSignal::stack_decoder(srd_decoder *decoder)
+void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 {
 	assert(decoder);
 	stack_.push_back(make_shared<decode::Decoder>(decoder));
@@ -144,13 +132,29 @@ bool DecodeSignal::toggle_decoder_visibility(int index)
 
 void DecodeSignal::reset_decode()
 {
+	if (decode_thread_.joinable()) {
+		decode_interrupt_ = true;
+		decode_input_cond_.notify_one();
+		decode_thread_.join();
+	}
+
+	if (logic_mux_thread_.joinable()) {
+		logic_mux_interrupt_ = true;
+		logic_mux_cond_.notify_one();
+		logic_mux_thread_.join();
+	}
+
 	stop_srd_session();
 
 	frame_complete_ = false;
 	samples_decoded_ = 0;
 	error_message_ = QString();
+
 	rows_.clear();
 	class_rows_.clear();
+
+	logic_mux_data_.reset();
+	logic_mux_data_invalid_ = true;
 }
 
 void DecodeSignal::begin_decode()
@@ -181,6 +185,13 @@ void DecodeSignal::begin_decode()
 		return;
 	}
 
+	// Make sure that all assigned channels still provide logic data
+	// (can happen when a converted signal was assigned but the
+	// conversion removed in the meanwhile)
+	for (data::DecodeChannel &ch : channels_)
+		if (ch.assigned_signal && !(ch.assigned_signal->logic_data() != nullptr))
+			ch.assigned_signal = nullptr;
+
 	// Check that all decoders have the required channels
 	for (const shared_ptr<decode::Decoder> &dec : stack_)
 		if (!dec->have_required_channels()) {
@@ -402,14 +413,51 @@ void DecodeSignal::save_settings(QSettings &settings) const
 {
 	SignalBase::save_settings(settings);
 
-	// TODO Save decoder stack, channel mapping and decoder options
+	settings.setValue("decoders", (int)(stack_.size()));
+
+	int decoder_idx = 0;
+	for (shared_ptr<decode::Decoder> decoder : stack_) {
+		settings.beginGroup("decoder" + QString::number(decoder_idx++));
+
+		settings.setValue("id", decoder->decoder()->id);
+
+		settings.endGroup();
+	}
+
+	// TODO Save channel mapping and decoder options
 }
 
 void DecodeSignal::restore_settings(QSettings &settings)
 {
 	SignalBase::restore_settings(settings);
 
-	// TODO Restore decoder stack, channel mapping and decoder options
+	GSList *dec_list = g_slist_copy((GSList*)srd_decoder_list());
+
+	int decoders = settings.value("decoders").toInt();
+
+	for (int decoder_idx = 0; decoder_idx < decoders; decoder_idx++) {
+		settings.beginGroup("decoder" + QString::number(decoder_idx));
+
+		QString id = settings.value("id").toString();
+
+		for (GSList *entry = dec_list; entry; entry = entry->next) {
+			const srd_decoder *dec = (srd_decoder*)entry->data;
+			if (!dec)
+				continue;
+
+			if (QString::fromUtf8(dec->id) == id) {
+				stack_.push_back(make_shared<decode::Decoder>(dec));
+
+				// Include the newly created decode channels in the channel lists
+				update_channel_list();
+				break;
+			}
+		}
+
+		settings.endGroup();
+	}
+
+	// TODO Restore channel mapping and decoder options
 }
 
 void DecodeSignal::update_channel_list()
@@ -667,14 +715,14 @@ void DecodeSignal::decode_data(
 
 		delete[] chunk;
 
-		// Notify the frontend that we processed some data and
-		// possibly have new annotations as well
-		new_annotations();
-
 		{
 			lock_guard<mutex> lock(output_mutex_);
 			samples_decoded_ = chunk_end;
 		}
+
+		// Notify the frontend that we processed some data and
+		// possibly have new annotations as well
+		new_annotations();
 	}
 }
 
@@ -704,9 +752,12 @@ void DecodeSignal::decode_proc()
 				decode_data(abs_start_samplenum, sample_count);
 				abs_start_samplenum += sample_count;
 			}
-		} while (error_message_.isEmpty() && (sample_count > 0));
+		} while (error_message_.isEmpty() && (sample_count > 0) && !decode_interrupt_);
+
+		if (error_message_.isEmpty() && !decode_interrupt_) {
+			if (sample_count == 0)
+				decode_finished();
 
-		if (error_message_.isEmpty()) {
 			// Wait for new input data or an interrupt was requested
 			unique_lock<mutex> input_wait_lock(input_mutex_);
 			decode_input_cond_.wait(input_wait_lock);
@@ -762,6 +813,7 @@ void DecodeSignal::stop_srd_session()
 void DecodeSignal::connect_input_notifiers()
 {
 	// Disconnect the notification slot from the previous set of signals
+	disconnect(this, SLOT(on_data_cleared()));
 	disconnect(this, SLOT(on_data_received()));
 
 	// Connect the currently used signals to our slot
@@ -769,8 +821,10 @@ void DecodeSignal::connect_input_notifiers()
 		if (!ch.assigned_signal)
 			continue;
 
-		shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
-		connect(logic_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		const data::SignalBase *signal = ch.assigned_signal;
+		connect(signal, SIGNAL(samples_cleared()),
+			this, SLOT(on_data_cleared()));
+		connect(signal, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
 			this, SLOT(on_data_received()));
 	}
 }
@@ -823,9 +877,17 @@ void DecodeSignal::on_capture_state_changed(int state)
 		begin_decode();
 }
 
+void DecodeSignal::on_data_cleared()
+{
+	reset_decode();
+}
+
 void DecodeSignal::on_data_received()
 {
-	logic_mux_cond_.notify_one();
+	if (!logic_mux_thread_.joinable())
+		begin_decode();
+	else
+		logic_mux_cond_.notify_one();
 }
 
 } // namespace data