X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=a6a2875e62657ca7dacc458808f854fc6dfbe88c;hp=da5d3f01fecdfbea8f36d80aa89a2ab028105d80;hb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae;hpb=119aff65d8ad0c4cdaff32d9b68cee00d90a5f35

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index da5d3f01..a6a2875e 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -18,22 +18,28 @@
  * 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 "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>
@@ -59,9 +65,7 @@ SigSession::~SigSession()
 {
 	stop_capture();
 
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	_sampling_thread.join();
 
 	if (_sdi)
 		_device_manager.release_device(_sdi);
@@ -116,9 +120,9 @@ void SigSession::load_file(const string &name,
 		update_signals(sdi);
 		read_sample_rate(sdi);
 
-		_sampling_thread.reset(new boost::thread(
+		_sampling_thread = boost::thread(
 			&SigSession::load_session_thread_proc, this,
-			error_handler));
+			error_handler);
 
 	} else {
 		sr_input *in = NULL;
@@ -130,11 +134,10 @@ void SigSession::load_file(const string &name,
 		update_signals(in->sdi);
 		read_sample_rate(in->sdi);
 
-		_sampling_thread.reset(new boost::thread(
+		_sampling_thread = boost::thread(
 			&SigSession::load_input_thread_proc, this,
-			name, in, error_handler));
+			name, in, error_handler);
 	}
-
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -169,9 +172,9 @@ void SigSession::start_capture(uint64_t record_length,
 	}
 
 	// Begin the session
-	_sampling_thread.reset(new boost::thread(
+	_sampling_thread = boost::thread(
 		&SigSession::sample_thread_proc, this, _sdi,
-		record_length, error_handler));
+		record_length, error_handler);
 }
 
 void SigSession::stop_capture()
@@ -182,12 +185,10 @@ void SigSession::stop_capture()
 	sr_session_stop();
 
 	// Check that sampling stopped
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	_sampling_thread.join();
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
 	lock_guard<mutex> lock(_signals_mutex);
 	return _signals;
@@ -198,17 +199,67 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 	return _logic_data;
 }
 
-void SigSession::add_decoder(srd_decoder *const dec)
+bool SigSession::add_decoder(srd_decoder *const dec)
 {
+	map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+
+	try
 	{
 		lock_guard<mutex> lock(_signals_mutex);
-		shared_ptr<data::Decoder> decoder(
-			new data::Decoder(dec));
-		shared_ptr<view::DecodeSignal> d(
-			new view::DecodeSignal(*this, decoder));
+
+		// Create the decoder
+		shared_ptr<data::DecoderStack> decoder(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;
+			}
+		}
+
+		decoder->set_probes(probes);
+
+		// Create the decode signal
+		shared_ptr<view::DecodeTrace> d(
+			new view::DecodeTrace(*this, decoder,
+				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
+	catch(std::runtime_error e)
+	{
+		return false;
+	}
+
 	signals_changed();
+
+	return true;
+}
+
+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)
@@ -352,8 +403,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) {
@@ -399,8 +449,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;
@@ -476,7 +526,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."));
@@ -523,6 +573,8 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
 			break;
 		}
 	}
+
+	signals_changed();
 }
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)