X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=a69f068e804f3d249ec831f59395e5dcec31904e;hp=41e31a2802a0af68c2d0505e2f3e3384ca96a010;hb=b213ef0991a13af0c74ffe5c54382c5c455c5496;hpb=e8c9f8a5a3186f9c3e4f23ba4e35de7c59410bd3

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 41e31a28..a69f068e 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -21,11 +21,15 @@
 #include "sigsession.h"
 
 #include "devicemanager.h"
+
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
+#include "data/decoder.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+
 #include "view/analogsignal.h"
+#include "view/decodesignal.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
@@ -55,9 +59,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);
@@ -106,12 +108,15 @@ void SigSession::load_file(const string &name,
 			return;
 		}
 
-		update_signals((sr_dev_inst*)devlist->data);
+		sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
 		g_slist_free(devlist);
 
-		_sampling_thread.reset(new boost::thread(
+		update_signals(sdi);
+		read_sample_rate(sdi);
+
+		_sampling_thread = boost::thread(
 			&SigSession::load_session_thread_proc, this,
-			error_handler));
+			error_handler);
 
 	} else {
 		sr_input *in = NULL;
@@ -121,12 +126,12 @@ void SigSession::load_file(const string &name,
 			return;
 
 		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
@@ -161,9 +166,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()
@@ -174,12 +179,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;
@@ -190,6 +193,44 @@ 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,
+	GHashTable *options)
+{
+	{
+		lock_guard<mutex> lock(_signals_mutex);
+
+		shared_ptr<data::Decoder> decoder(
+			new data::Decoder(dec, probes, options));
+		shared_ptr<view::DecodeSignal> d(
+			new view::DecodeSignal(*this, decoder,
+				_decode_traces.size()));
+		_decode_traces.push_back(d);
+	}
+	signals_changed();
+}
+
+vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+{
+	lock_guard<mutex> lock(_signals_mutex);
+	return _decode_traces;
+}
+
+void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+{
+	for (vector< shared_ptr<view::DecodeSignal> >::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);
@@ -283,6 +324,9 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 	unsigned int logic_probe_count = 0;
 	unsigned int analog_probe_count = 0;
 
+	// Clear the decode traces
+	_decode_traces.clear();
+
 	// Detect what data types we will receive
 	if(sdi) {
 		for (const GSList *l = sdi->probes; l; l = l->next) {
@@ -328,8 +372,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) {
@@ -367,6 +410,31 @@ bool SigSession::is_trigger_enabled() const
 	return false;
 }
 
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
+{
+	GVariant *gvar;
+	uint64_t sample_rate = 0;
+
+	// Read out the sample rate
+	if(sdi->driver)
+	{
+		const int ret = sr_config_get(sdi->driver,
+			SR_CONF_SAMPLERATE, &gvar, sdi);
+		if (ret != SR_OK) {
+			qDebug("Failed to get samplerate\n");
+			return;
+		}
+
+		sample_rate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
+	}
+
+	if(_analog_data)
+		_analog_data->set_samplerate(sample_rate);
+	if(_logic_data)
+		_logic_data->set_samplerate(sample_rate);
+}
+
 void SigSession::load_session_thread_proc(
 	function<void (const QString)> error_handler)
 {
@@ -454,27 +522,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
-	GVariant *gvar;
-	uint64_t sample_rate = 0;
-
-	// Read out the sample rate
-	if(sdi->driver)
-	{
-		const int ret = sr_config_get(sdi->driver,
-			SR_CONF_SAMPLERATE, &gvar, sdi);
-		if (ret != SR_OK) {
-			qDebug("Failed to get samplerate\n");
-			return;
-		}
-
-		sample_rate = g_variant_get_uint64(gvar);
-		g_variant_unref(gvar);
-	}
-
-	if(_analog_data)
-		_analog_data->set_samplerate(sample_rate);
-	if(_logic_data)
-		_logic_data->set_samplerate(sample_rate);
+	read_sample_rate(sdi);
 }
 
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
@@ -494,6 +542,8 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
 			break;
 		}
 	}
+
+	signals_changed();
 }
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)