X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=9c3a2c259e2a635f2eed79f5a8a607a9c33d490c;hp=ebef90cbb6590fb9961fad97f73047e56e8acc79;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hpb=076eefa4ac3ae038bbeb7b9ac3175d2159bec2d1

diff --git a/pv/session.cpp b/pv/session.cpp
index ebef90c..9c3a2c2 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -39,6 +39,7 @@
 #include "data/decoderstack.hpp"
 #include "data/logic.hpp"
 #include "data/logicsegment.hpp"
+#include "data/signalbase.hpp"
 #include "data/decode/decoder.hpp"
 
 #include "devices/hardwaredevice.hpp"
@@ -140,13 +141,36 @@ void Session::set_device(shared_ptr<devices::Device> device)
 
 	device_.reset();
 
-	// Remove all traces
+	// Remove all stored data
 	signals_.clear();
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<data::SignalData> d : all_signal_data_)
+			d->clear();
+	}
+	all_signal_data_.clear();
+	cur_logic_segment_.reset();
+
+	for (auto entry : cur_analog_segments_) {
+		shared_ptr<sigrok::Channel>(entry.first).reset();
+		shared_ptr<data::AnalogSegment>(entry.second).reset();
+	}
+
+	logic_data_.reset();
 	decode_traces_.clear();
+
 	signals_changed();
 
 	device_ = std::move(device);
-	device_->open();
+
+	try {
+		device_->open();
+	} catch (const QString &e) {
+		device_.reset();
+		device_selected();
+		throw;
+	}
+
 	device_->session()->add_datafeed_callback([=]
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
@@ -180,10 +204,14 @@ Session::capture_state Session::get_capture_state() const
 
 void Session::start_capture(function<void (const QString)> error_handler)
 {
+	if (!device_) {
+		error_handler(tr("No active device set, can't start acquisition."));
+		return;
+	}
+
 	stop_capture();
 
 	// Check that at least one channel is enabled
-	assert(device_);
 	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (sr_dev) {
 		const auto channels = sr_dev->channels();
@@ -196,13 +224,15 @@ void Session::start_capture(function<void (const QString)> error_handler)
 	}
 
 	// Clear signal data
-	for (const shared_ptr<data::SignalData> d : get_data())
-		d->clear();
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<data::SignalData> d : all_signal_data_)
+			d->clear();
+	}
 
 	// Begin the session
 	sampling_thread_ = std::thread(
-		&Session::sample_thread_proc, this, device_,
-			error_handler);
+		&Session::sample_thread_proc, this, error_handler);
 }
 
 void Session::stop_capture()
@@ -215,30 +245,20 @@ void Session::stop_capture()
 		sampling_thread_.join();
 }
 
-set< shared_ptr<data::SignalData> > Session::get_data() const
-{
-	shared_lock<shared_mutex> lock(signals_mutex_);
-	set< shared_ptr<data::SignalData> > data;
-	for (const shared_ptr<view::Signal> sig : signals_) {
-		assert(sig);
-		data.insert(sig->data());
-	}
-
-	return data;
-}
-
 double Session::get_samplerate() const
 {
 	double samplerate = 0.0;
 
-	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
-		assert(d);
-		const vector< shared_ptr<pv::data::Segment> > segments =
-			d->segments();
-		for (const shared_ptr<pv::data::Segment> &s : segments)
-			samplerate = std::max(samplerate, s->samplerate());
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+			assert(d);
+			const vector< shared_ptr<pv::data::Segment> > segments =
+				d->segments();
+			for (const shared_ptr<pv::data::Segment> &s : segments)
+				samplerate = std::max(samplerate, s->samplerate());
+		}
 	}
-
 	// If there is no sample rate given we use samples as unit
 	if (samplerate == 0.0)
 		samplerate = 1.0;
@@ -279,7 +299,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 					dynamic_pointer_cast<view::LogicSignal>(s);
 				if (l && QString::fromUtf8(pdch->name).
 					toLower().contains(
-					l->name().toLower()))
+					s->channel()->name().toLower()))
 					channels[pdch] = l;
 			}
 
@@ -289,8 +309,11 @@ bool Session::add_decoder(srd_decoder *const dec)
 		decoder_stack->stack().front()->set_channels(channels);
 
 		// Create the decode signal
+		shared_ptr<data::SignalBase> signalbase =
+			shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
+
 		shared_ptr<view::DecodeTrace> d(
-			new view::DecodeTrace(*this, decoder_stack,
+			new view::DecodeTrace(*this, signalbase, decoder_stack,
 				decode_traces_.size()));
 		decode_traces_.push_back(d);
 	} catch (std::runtime_error e) {
@@ -382,13 +405,14 @@ void Session::update_signals()
 		signals_.clear();
 
 		for (auto channel : sr_dev->channels()) {
+			shared_ptr<data::SignalBase> signalbase;
 			shared_ptr<view::Signal> signal;
 
 			// Find the channel in the old signals
 			const auto iter = std::find_if(
 				prev_sigs.cbegin(), prev_sigs.cend(),
 				[&](const shared_ptr<view::Signal> &s) {
-					return s->channel() == channel;
+					return s->channel()->channel() == channel;
 				});
 			if (iter != prev_sigs.end()) {
 				// Copy the signal from the old set to the new
@@ -400,12 +424,16 @@ void Session::update_signals()
 						logic_data_);
 			} else {
 				// Create a new signal
+				signalbase = shared_ptr<data::SignalBase>(
+					new data::SignalBase(channel));
+
 				switch(channel->type()->id()) {
 				case SR_CHANNEL_LOGIC:
 					signal = shared_ptr<view::Signal>(
 						new view::LogicSignal(*this,
-							device_, channel,
-							logic_data_));
+							device_, signalbase, logic_data_));
+					all_signal_data_.insert(logic_data_);
+					signalbases_.insert(signalbase);
 					break;
 
 				case SR_CHANNEL_ANALOG:
@@ -414,7 +442,9 @@ void Session::update_signals()
 						new data::Analog());
 					signal = shared_ptr<view::Signal>(
 						new view::AnalogSignal(
-							*this, channel, data));
+							*this, signalbase, data));
+					all_signal_data_.insert(data);
+					signalbases_.insert(signalbase);
 					break;
 				}
 
@@ -432,25 +462,23 @@ void Session::update_signals()
 	signals_changed();
 }
 
-shared_ptr<view::Signal> Session::signal_from_channel(
-	shared_ptr<Channel> channel) const
+shared_ptr<data::SignalBase> Session::signal_from_channel(
+	shared_ptr<sigrok::Channel> channel) const
 {
-	lock_guard<boost::shared_mutex> lock(signals_mutex_);
-	for (shared_ptr<view::Signal> sig : signals_) {
+	for (shared_ptr<data::SignalBase> sig : signalbases_) {
 		assert(sig);
 		if (sig->channel() == channel)
 			return sig;
 	}
-	return shared_ptr<view::Signal>();
+	return shared_ptr<data::SignalBase>();
 }
 
-void Session::sample_thread_proc(shared_ptr<devices::Device> device,
-	function<void (const QString)> error_handler)
+void Session::sample_thread_proc(function<void (const QString)> error_handler)
 {
-	assert(device);
 	assert(error_handler);
 
-	(void)device;
+	if (!device_)
+		return;
 
 	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
@@ -510,17 +538,20 @@ void Session::feed_in_trigger()
 	// The channel containing most samples should be most accurate
 	uint64_t sample_count = 0;
 
-	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
-		assert(d);
-		uint64_t temp_count = 0;
-
-		const vector< shared_ptr<pv::data::Segment> > segments =
-			d->segments();
-		for (const shared_ptr<pv::data::Segment> &s : segments)
-			temp_count += s->get_sample_count();
-
-		if (temp_count > sample_count)
-			sample_count = temp_count;
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+			assert(d);
+			uint64_t temp_count = 0;
+
+			const vector< shared_ptr<pv::data::Segment> > segments =
+				d->segments();
+			for (const shared_ptr<pv::data::Segment> &s : segments)
+				temp_count += s->get_sample_count();
+
+			if (temp_count > sample_count)
+				sample_count = temp_count;
+		}
 	}
 
 	trigger_event(sample_count / get_samplerate());