X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=a582122c15d3cdb353551c209c2c388835d397de;hp=aeb6d22072f55f6bc49c04dd389295fd852b5c6a;hb=1bc6525bd6274b7f06f5fa8355b539dd9307f599;hpb=4e5a4405482a296ebb6014e627298ad156c78d55

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index aeb6d220..a582122c 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
 #include "sigsession.h"
 
@@ -26,12 +28,13 @@
 
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
-#include "data/decoder.h"
+#include "data/decoderstack.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+#include "data/decode/decoder.h"
 
 #include "view/analogsignal.h"
-#include "view/decodesignal.h"
+#include "view/decodetrace.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
@@ -44,8 +47,14 @@
 
 #include <QDebug>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -82,6 +91,9 @@ struct sr_dev_inst* SigSession::get_device() const
 
 void SigSession::set_device(struct sr_dev_inst *sdi)
 {
+	// Ensure we are not capturing before setting the device
+	stop_capture();
+
 	if (_sdi)
 		_device_manager.release_device(_sdi);
 	if (sdi)
@@ -117,6 +129,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 +144,7 @@ void SigSession::load_file(const string &name,
 			error_handler)))
 			return;
 
+		_decode_traces.clear();
 		update_signals(in->sdi);
 		read_sample_rate(in->sdi);
 
@@ -194,21 +208,19 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 	return _signals;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
-{
-	return _logic_data;
-}
-
+#ifdef ENABLE_DECODE
 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::Decoder> decoder(new data::Decoder(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 +230,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::DecodeSignal> d(
-			new view::DecodeSignal(*this, decoder,
+		shared_ptr<view::DecodeTrace> d(
+			new view::DecodeTrace(*this, decoder_stack,
 				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
@@ -239,18 +255,21 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 
 	signals_changed();
 
+	// Do an initial decode
+	decoder_stack->begin_decode();
+
 	return true;
 }
 
-vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
 {
 	lock_guard<mutex> lock(_signals_mutex);
 	return _decode_traces;
 }
 
-void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 {
-	for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+	for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
 		_decode_traces.begin();
 		i != _decode_traces.end();
 		i++)
@@ -261,6 +280,7 @@ void SigSession::remove_decode_signal(view::DecodeSignal *signal)
 			return;
 		}
 }
+#endif
 
 void SigSession::set_capture_state(capture_state state)
 {