X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=3213758ef263894c215cc83055849593700aa099;hp=1ee5e0033939a1918102f9edd71e84c4e48b03bc;hb=7d0c935c488742ca45bdcd73bf8573e0e6f67aab;hpb=06bb4e6a55f5f6983d94fef2b25afc0a70f7b8d9

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 1ee5e003..3213758e 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -18,22 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrokdecode/libsigrokdecode.h>
+
 #include "sigsession.h"
 
 #include "devicemanager.h"
 
 #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>
 
+#include <stdexcept>
+
+#include <boost/foreach.hpp>
+
 #include <sys/stat.h>
 
 #include <QDebug>
@@ -111,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);
 
@@ -125,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);
 
@@ -193,35 +202,77 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 	return _logic_data;
 }
 
-void SigSession::add_decoder(srd_decoder *const dec,
-	std::map<const srd_probe*,
-		boost::shared_ptr<view::Signal> > probes)
+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);
 
-		if (!_decode_traces.empty()) {
-			qDebug("Currently only one decode trace can be added "
-				"at once");
-			_decode_traces.clear();
+		// Create the decoder
+		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)
+		{
+			const srd_probe *const probe = (const srd_probe*)i->data;
+			BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
+			{
+				shared_ptr<view::LogicSignal> l =
+					dynamic_pointer_cast<view::LogicSignal>(s);
+				if (l && QString(probe->name).toLower().contains(
+					l->get_name().toLower()))
+					probes[probe] = l;
+			}
 		}
 
-		shared_ptr<data::Decoder> decoder(
-			new data::Decoder(dec, probes));
-		shared_ptr<view::DecodeSignal> d(
-			new view::DecodeSignal(*this, decoder,
+		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_stack,
 				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
+	catch(std::runtime_error e)
+	{
+		return false;
+	}
+
 	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::DecodeTrace *signal)
+{
+	for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
+		_decode_traces.begin();
+		i != _decode_traces.end();
+		i++)
+		if ((*i).get() == signal)
+		{
+			_decode_traces.erase(i);
+			signals_changed();
+			return;
+		}
+}
+
 void SigSession::set_capture_state(capture_state state)
 {
 	lock_guard<mutex> lock(_sampling_mutex);
@@ -363,8 +414,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
 		if(sdi) {
 			for (const GSList *l = sdi->probes; l; l = l->next) {
-				const sr_probe *const probe =
-					(const sr_probe *)l->data;
+				sr_probe *const probe =	(sr_probe *)l->data;
 				assert(probe);
 
 				switch(probe->type) {
@@ -410,8 +460,8 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
 	// Read out the sample rate
 	if(sdi->driver)
 	{
-		const int ret = sr_config_get(sdi->driver,
-			SR_CONF_SAMPLERATE, &gvar, sdi);
+		const int ret = sr_config_get(sdi->driver, sdi, NULL,
+			SR_CONF_SAMPLERATE, &gvar);
 		if (ret != SR_OK) {
 			qDebug("Failed to get samplerate\n");
 			return;
@@ -487,7 +537,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 	}
 
 	// Set the sample limit
-	if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+	if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES,
 		g_variant_new_uint64(record_length)) != SR_OK) {
 		error_handler(tr("Failed to configure "
 			"time-based sample limit."));