X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=2e7be37f9fb499e85156bd8480330d80059e7b89;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hp=a6a2875e62657ca7dacc458808f854fc6dfbe88c;hpb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index a6a2875..2e7be37 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -29,6 +29,7 @@
 #include "data/decoderstack.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+#include "data/decode/decoder.h"
 
 #include "view/analogsignal.h"
 #include "view/decodetrace.h"
@@ -117,6 +118,7 @@ void SigSession::load_file(const string &name,
 		sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
 		g_slist_free(devlist);
 
+		_decode_traces.clear();
 		update_signals(sdi);
 		read_sample_rate(sdi);
 
@@ -131,6 +133,7 @@ void SigSession::load_file(const string &name,
 			error_handler)))
 			return;
 
+		_decode_traces.clear();
 		update_signals(in->sdi);
 		read_sample_rate(in->sdi);
 
@@ -202,13 +205,15 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
 	map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+	shared_ptr<data::DecoderStack> decoder_stack;
 
 	try
 	{
 		lock_guard<mutex> lock(_signals_mutex);
 
 		// Create the decoder
-		shared_ptr<data::DecoderStack> decoder(new data::DecoderStack(dec));
+		decoder_stack = shared_ptr<data::DecoderStack>(
+			new data::DecoderStack(dec));
 
 		// Auto select the initial probes
 		for(const GSList *i = dec->probes; i; i = i->next)
@@ -218,17 +223,21 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 			{
 				shared_ptr<view::LogicSignal> l =
 					dynamic_pointer_cast<view::LogicSignal>(s);
-				if (l && QString(probe->name).toLower().contains(
+				if (l && QString::fromUtf8(probe->name).
+					toLower().contains(
 					l->get_name().toLower()))
 					probes[probe] = l;
 			}
 		}
 
-		decoder->set_probes(probes);
+		assert(decoder_stack);
+		assert(!decoder_stack->stack().empty());
+		assert(decoder_stack->stack().front());
+		decoder_stack->stack().front()->set_probes(probes);
 
 		// Create the decode signal
 		shared_ptr<view::DecodeTrace> d(
-			new view::DecodeTrace(*this, decoder,
+			new view::DecodeTrace(*this, decoder_stack,
 				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
@@ -239,6 +248,9 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 
 	signals_changed();
 
+	// Do an initial decode
+	decoder_stack->begin_decode();
+
 	return true;
 }