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

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 3213758e..82fa8770 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"
 
@@ -45,8 +47,15 @@
 
 #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::set;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -83,6 +92,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)
@@ -191,17 +203,25 @@ void SigSession::stop_capture()
 	_sampling_thread.join();
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals() const
+set< shared_ptr<data::SignalData> > SigSession::get_data() const
 {
 	lock_guard<mutex> lock(_signals_mutex);
-	return _signals;
+	set< shared_ptr<data::SignalData> > data;
+	BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+		assert(sig);
+		data.insert(sig->data());
+	}
+
+	return data;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
-	return _logic_data;
+	lock_guard<mutex> lock(_signals_mutex);
+	return _signals;
 }
 
+#ifdef ENABLE_DECODE
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
 	map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
@@ -223,7 +243,8 @@ 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;
 			}
@@ -272,6 +293,7 @@ void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 			return;
 		}
 }
+#endif
 
 void SigSession::set_capture_state(capture_state state)
 {