X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=c18f809446a037475f4106e10576f3a89d5c1688;hp=e1a1f010cf065dcad630f391161f819b5f494f0e;hb=dc4ada2bfd5d9f4386661ffbf7ff3ad000b6bfb5;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da

diff --git a/pv/session.cpp b/pv/session.cpp
index e1a1f010..c18f8094 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -14,90 +14,89 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
+#include <QFileInfo>
 
-#ifdef ENABLE_DECODE
-#include <libsigrokdecode/libsigrokdecode.h>
-#endif
+#include <cassert>
+#include <memory>
+#include <mutex>
+#include <stdexcept>
 
-#include "session.hpp"
+#include <sys/stat.h>
 
 #include "devicemanager.hpp"
+#include "session.hpp"
 
 #include "data/analog.hpp"
 #include "data/analogsegment.hpp"
+#include "data/decode/decoder.hpp"
 #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"
+#include "devices/inputfile.hpp"
 #include "devices/sessionfile.hpp"
 
+#include "toolbars/mainbar.hpp"
+
 #include "view/analogsignal.hpp"
 #include "view/decodetrace.hpp"
 #include "view/logicsignal.hpp"
-
-#include <cassert>
-#include <mutex>
-#include <stdexcept>
-
-#include <sys/stat.h>
-
-#include <QDebug>
+#include "view/signal.hpp"
+#include "view/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-using boost::shared_lock;
-using boost::shared_mutex;
-using boost::unique_lock;
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
+using std::bad_alloc;
 using std::dynamic_pointer_cast;
+using std::find_if;
 using std::function;
 using std::lock_guard;
 using std::list;
+using std::make_pair;
+using std::make_shared;
 using std::map;
+using std::max;
+using std::move;
 using std::mutex;
+using std::pair;
 using std::recursive_mutex;
-using std::set;
+using std::runtime_error;
 using std::shared_ptr;
 using std::string;
+using std::unique_ptr;
 using std::unordered_set;
 using std::vector;
 
 using sigrok::Analog;
 using sigrok::Channel;
-using sigrok::ChannelType;
 using sigrok::ConfigKey;
 using sigrok::DatafeedCallbackFunction;
 using sigrok::Error;
-using sigrok::Header;
+using sigrok::InputFormat;
 using sigrok::Logic;
 using sigrok::Meta;
 using sigrok::Packet;
-using sigrok::PacketPayload;
 using sigrok::Session;
-using sigrok::SessionDevice;
 
 using Glib::VariantBase;
-using Glib::Variant;
 
 namespace pv {
-Session::Session(DeviceManager &device_manager) :
+Session::Session(DeviceManager &device_manager, QString name) :
 	device_manager_(device_manager),
+	default_name_(name),
+	name_(name),
 	capture_state_(Stopped),
-	cur_samplerate_(0)
+	cur_samplerate_(0),
+	data_saved_(true)
 {
 }
 
@@ -129,6 +128,239 @@ shared_ptr<devices::Device> Session::device() const
 	return device_;
 }
 
+QString Session::name() const
+{
+	return name_;
+}
+
+void Session::set_name(QString name)
+{
+	if (default_name_.isEmpty())
+		default_name_ = name;
+
+	name_ = name;
+
+	name_changed();
+}
+
+const list< shared_ptr<views::ViewBase> > Session::views() const
+{
+	return views_;
+}
+
+shared_ptr<views::ViewBase> Session::main_view() const
+{
+	return main_view_;
+}
+
+void Session::set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar)
+{
+	main_bar_ = main_bar;
+}
+
+shared_ptr<pv::toolbars::MainBar> Session::main_bar() const
+{
+	return main_bar_;
+}
+
+bool Session::data_saved() const
+{
+	return data_saved_;
+}
+
+void Session::save_settings(QSettings &settings) const
+{
+	map<string, string> dev_info;
+	list<string> key_list;
+	int stacks = 0, views = 0;
+
+	if (device_) {
+		shared_ptr<devices::HardwareDevice> hw_device =
+			dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+		if (hw_device) {
+			settings.setValue("device_type", "hardware");
+			settings.beginGroup("device");
+
+			key_list.emplace_back("vendor");
+			key_list.emplace_back("model");
+			key_list.emplace_back("version");
+			key_list.emplace_back("serial_num");
+			key_list.emplace_back("connection_id");
+
+			dev_info = device_manager_.get_device_info(device_);
+
+			for (string key : key_list) {
+				if (dev_info.count(key))
+					settings.setValue(QString::fromUtf8(key.c_str()),
+							QString::fromUtf8(dev_info.at(key).c_str()));
+				else
+					settings.remove(QString::fromUtf8(key.c_str()));
+			}
+
+			settings.endGroup();
+		}
+
+		shared_ptr<devices::SessionFile> sessionfile_device =
+			dynamic_pointer_cast< devices::SessionFile >(device_);
+
+		if (sessionfile_device) {
+			settings.setValue("device_type", "sessionfile");
+			settings.beginGroup("device");
+			settings.setValue("filename", QString::fromStdString(
+				sessionfile_device->full_name()));
+			settings.endGroup();
+		}
+
+		// Save channels and decoders
+		for (shared_ptr<data::SignalBase> base : signalbases_) {
+#ifdef ENABLE_DECODE
+			if (base->is_decode_signal()) {
+				shared_ptr<pv::data::DecoderStack> decoder_stack =
+						base->decoder_stack();
+				shared_ptr<data::decode::Decoder> top_decoder =
+						decoder_stack->stack().front();
+
+				settings.beginGroup("decoder_stack" + QString::number(stacks++));
+				settings.setValue("id", top_decoder->decoder()->id);
+				settings.setValue("name", top_decoder->decoder()->name);
+				settings.endGroup();
+			} else
+#endif
+			{
+				settings.beginGroup(base->internal_name());
+				base->save_settings(settings);
+				settings.endGroup();
+			}
+		}
+
+		settings.setValue("decoder_stacks", stacks);
+
+		// Save view states and their signal settings
+		// Note: main_view must be saved as view0
+		settings.beginGroup("view" + QString::number(views++));
+		main_view_->save_settings(settings);
+		settings.endGroup();
+
+		for (shared_ptr<views::ViewBase> view : views_) {
+			if (view != main_view_) {
+				settings.beginGroup("view" + QString::number(views++));
+				view->save_settings(settings);
+				settings.endGroup();
+			}
+		}
+
+		settings.setValue("views", views);
+	}
+}
+
+void Session::restore_settings(QSettings &settings)
+{
+	shared_ptr<devices::Device> device;
+
+	QString device_type = settings.value("device_type").toString();
+
+	if (device_type == "hardware") {
+		map<string, string> dev_info;
+		list<string> key_list;
+
+		// Re-select last used device if possible but only if it's not demo
+		settings.beginGroup("device");
+		key_list.emplace_back("vendor");
+		key_list.emplace_back("model");
+		key_list.emplace_back("version");
+		key_list.emplace_back("serial_num");
+		key_list.emplace_back("connection_id");
+
+		for (string key : key_list) {
+			const QString k = QString::fromStdString(key);
+			if (!settings.contains(k))
+				continue;
+
+			const string value = settings.value(k).toString().toStdString();
+			if (!value.empty())
+				dev_info.insert(make_pair(key, value));
+		}
+
+		if (dev_info.count("model") > 0)
+			device = device_manager_.find_device_from_info(dev_info);
+
+		if (device)
+			set_device(device);
+
+		settings.endGroup();
+	}
+
+	if (device_type == "sessionfile") {
+		settings.beginGroup("device");
+		QString filename = settings.value("filename").toString();
+		settings.endGroup();
+
+		if (QFileInfo(filename).isReadable()) {
+			device = make_shared<devices::SessionFile>(device_manager_.context(),
+				filename.toStdString());
+			set_device(device);
+
+			// TODO Perform error handling
+			start_capture([](QString infoMessage) { (void)infoMessage; });
+
+			set_name(QFileInfo(filename).fileName());
+		}
+	}
+
+	if (device) {
+		// Restore channels
+		for (shared_ptr<data::SignalBase> base : signalbases_) {
+			settings.beginGroup(base->internal_name());
+			base->restore_settings(settings);
+			settings.endGroup();
+		}
+
+		// Restore decoders
+#ifdef ENABLE_DECODE
+		int stacks = settings.value("decoder_stacks").toInt();
+
+		for (int i = 0; i < stacks; i++) {
+			settings.beginGroup("decoder_stack" + QString::number(i++));
+
+			QString id = settings.value("id").toString();
+			add_decoder(srd_decoder_get_by_id(id.toStdString().c_str()));
+
+			settings.endGroup();
+		}
+#endif
+
+		// Restore views
+		int views = settings.value("views").toInt();
+
+		for (int i = 0; i < views; i++) {
+			settings.beginGroup("view" + QString::number(i));
+
+			if (i > 0) {
+				views::ViewType type = (views::ViewType)settings.value("type").toInt();
+				add_view(name_, type, this);
+				views_.back()->restore_settings(settings);
+			} else
+				main_view_->restore_settings(settings);
+
+			settings.endGroup();
+		}
+	}
+}
+
+void Session::select_device(shared_ptr<devices::Device> device)
+{
+	try {
+		if (device)
+			set_device(device);
+		else
+			set_default_device();
+	} catch (const QString &e) {
+		main_bar_->session_error(tr("Failed to Select Device"),
+			tr("Failed to Select Device"));
+	}
+}
+
 void Session::set_device(shared_ptr<devices::Device> device)
 {
 	assert(device);
@@ -141,14 +373,21 @@ void Session::set_device(shared_ptr<devices::Device> device)
 
 	device_.reset();
 
+	// Revert name back to default name (e.g. "Session 1") as the data is gone
+	name_ = default_name_;
+	name_changed();
+
 	// 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();
+	for (shared_ptr<views::ViewBase> view : views_) {
+		view->clear_signals();
+#ifdef ENABLE_DECODE
+		view->clear_decode_signals();
+#endif
 	}
+	for (const shared_ptr<data::SignalData> d : all_signal_data_)
+		d->clear();
 	all_signal_data_.clear();
+	signalbases_.clear();
 	cur_logic_segment_.reset();
 
 	for (auto entry : cur_analog_segments_) {
@@ -157,27 +396,27 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	}
 
 	logic_data_.reset();
-	decode_traces_.clear();
 
 	signals_changed();
 
-	device_ = std::move(device);
+	device_ = move(device);
 
 	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);
-		});
+	if (device_) {
+		device_->session()->add_datafeed_callback([=]
+			(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
+				data_feed_in(device, packet);
+			});
 
-	update_signals();
-	device_selected();
+		update_signals();
+	}
+
+	device_changed();
 }
 
 void Session::set_default_device()
@@ -189,13 +428,68 @@ void Session::set_default_device()
 		return;
 
 	// Try and find the demo device and select that by default
-	const auto iter = std::find_if(devices.begin(), devices.end(),
+	const auto iter = find_if(devices.begin(), devices.end(),
 		[] (const shared_ptr<devices::HardwareDevice> &d) {
-			return d->hardware_device()->driver()->name() ==
-			"demo";	});
+			return d->hardware_device()->driver()->name() == "demo";	});
 	set_device((iter == devices.end()) ? devices.front() : *iter);
 }
 
+void Session::load_init_file(const string &file_name, const string &format)
+{
+	shared_ptr<InputFormat> input_format;
+
+	if (!format.empty()) {
+		const map<string, shared_ptr<InputFormat> > formats =
+			device_manager_.context()->input_formats();
+		const auto iter = find_if(formats.begin(), formats.end(),
+			[&](const pair<string, shared_ptr<InputFormat> > f) {
+				return f.first == format; });
+		if (iter == formats.end()) {
+			main_bar_->session_error(tr("Error"),
+				tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
+			return;
+		}
+
+		input_format = (*iter).second;
+	}
+
+	load_file(QString::fromStdString(file_name), input_format);
+}
+
+void Session::load_file(QString file_name,
+	shared_ptr<sigrok::InputFormat> format,
+	const map<string, Glib::VariantBase> &options)
+{
+	const QString errorMessage(
+		QString("Failed to load file %1").arg(file_name));
+
+	try {
+		if (format)
+			set_device(shared_ptr<devices::Device>(
+				new devices::InputFile(
+					device_manager_.context(),
+					file_name.toStdString(),
+					format, options)));
+		else
+			set_device(shared_ptr<devices::Device>(
+				new devices::SessionFile(
+					device_manager_.context(),
+					file_name.toStdString())));
+	} catch (Error e) {
+		main_bar_->session_error(tr("Failed to load ") + file_name, e.what());
+		set_default_device();
+		main_bar_->update_device_list();
+		return;
+	}
+
+	main_bar_->update_device_list();
+
+	start_capture([&, errorMessage](QString infoMessage) {
+		main_bar_->session_error(errorMessage, infoMessage); });
+
+	set_name(QFileInfo(file_name).fileName());
+}
+
 Session::capture_state Session::get_capture_state() const
 {
 	lock_guard<mutex> lock(sampling_mutex_);
@@ -215,7 +509,7 @@ void Session::start_capture(function<void (const QString)> error_handler)
 	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (sr_dev) {
 		const auto channels = sr_dev->channels();
-		if (!std::any_of(channels.begin(), channels.end(),
+		if (!any_of(channels.begin(), channels.end(),
 			[](shared_ptr<Channel> channel) {
 				return channel->enabled(); })) {
 			error_handler(tr("No channels enabled."));
@@ -224,10 +518,17 @@ void Session::start_capture(function<void (const QString)> error_handler)
 	}
 
 	// Clear signal data
-	{
-		shared_lock<shared_mutex> lock(signals_mutex_);
-		for (const shared_ptr<data::SignalData> d : all_signal_data_)
-			d->clear();
+	for (const shared_ptr<data::SignalData> d : all_signal_data_)
+		d->clear();
+
+	// Revert name back to default name (e.g. "Session 1") for real devices
+	// as the (possibly saved) data is gone. File devices keep their name.
+	shared_ptr<devices::HardwareDevice> hw_device =
+		dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+	if (hw_device) {
+		name_ = default_name_;
+		name_changed();
 	}
 
 	// Begin the session
@@ -245,19 +546,48 @@ void Session::stop_capture()
 		sampling_thread_.join();
 }
 
+void Session::register_view(shared_ptr<views::ViewBase> view)
+{
+	if (views_.empty()) {
+		main_view_ = view;
+	}
+
+	views_.push_back(view);
+
+	update_signals();
+}
+
+void Session::deregister_view(shared_ptr<views::ViewBase> view)
+{
+	views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
+
+	if (views_.empty()) {
+		main_view_.reset();
+
+		// Without a view there can be no main bar
+		main_bar_.reset();
+	}
+}
+
+bool Session::has_view(shared_ptr<views::ViewBase> view)
+{
+	for (shared_ptr<views::ViewBase> v : views_)
+		if (v == view)
+			return true;
+
+	return false;
+}
+
 double Session::get_samplerate() const
 {
 	double samplerate = 0.0;
 
-	{
-		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());
-		}
+	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 = max(samplerate, s->samplerate());
 	}
 	// If there is no sample rate given we use samples as unit
 	if (samplerate == 0.0)
@@ -266,27 +596,26 @@ double Session::get_samplerate() const
 	return samplerate;
 }
 
-const unordered_set< shared_ptr<view::Signal> > Session::signals() const
+const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
 {
-	shared_lock<shared_mutex> lock(signals_mutex_);
-	return signals_;
+	return signalbases_;
 }
 
 #ifdef ENABLE_DECODE
 bool Session::add_decoder(srd_decoder *const dec)
 {
-	map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
+	if (!dec)
+		return false;
+
+	map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
 	shared_ptr<data::DecoderStack> decoder_stack;
 
 	try {
-		lock_guard<boost::shared_mutex> lock(signals_mutex_);
-
 		// Create the decoder
-		decoder_stack = shared_ptr<data::DecoderStack>(
-			new data::DecoderStack(*this, dec));
+		decoder_stack = make_shared<data::DecoderStack>(*this, dec);
 
 		// Make a list of all the channels
-		std::vector<const srd_channel*> all_channels;
+		vector<const srd_channel*> all_channels;
 		for (const GSList *i = dec->channels; i; i = i->next)
 			all_channels.push_back((const srd_channel*)i->data);
 		for (const GSList *i = dec->opt_channels; i; i = i->next)
@@ -294,13 +623,12 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Auto select the initial channels
 		for (const srd_channel *pdch : all_channels)
-			for (shared_ptr<view::Signal> s : signals_) {
-				shared_ptr<view::LogicSignal> l =
-					dynamic_pointer_cast<view::LogicSignal>(s);
-				if (l && QString::fromUtf8(pdch->name).
-					toLower().contains(
-					s->base()->name().toLower()))
-					channels[pdch] = l;
+			for (shared_ptr<data::SignalBase> b : signalbases_) {
+				if (b->logic_data()) {
+					if (QString::fromUtf8(pdch->name).toLower().
+						contains(b->name().toLower()))
+						channels[pdch] = b;
+				}
 			}
 
 		assert(decoder_stack);
@@ -310,13 +638,14 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Create the decode signal
 		shared_ptr<data::SignalBase> signalbase =
-			shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
+			make_shared<data::SignalBase>(nullptr, data::SignalBase::DecodeChannel);
+
+		signalbase->set_decoder_stack(decoder_stack);
+		signalbases_.insert(signalbase);
 
-		shared_ptr<view::DecodeTrace> d(
-			new view::DecodeTrace(*this, signalbase, decoder_stack,
-				decode_traces_.size()));
-		decode_traces_.push_back(d);
-	} catch (std::runtime_error e) {
+		for (shared_ptr<views::ViewBase> view : views_)
+			view->add_decode_signal(signalbase);
+	} catch (runtime_error e) {
 		return false;
 	}
 
@@ -328,20 +657,14 @@ bool Session::add_decoder(srd_decoder *const dec)
 	return true;
 }
 
-vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
+void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
 {
-	shared_lock<shared_mutex> lock(signals_mutex_);
-	return decode_traces_;
-}
+	signalbases_.erase(signalbase);
 
-void Session::remove_decode_signal(view::DecodeTrace *signal)
-{
-	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
-		if ((*i).get() == signal) {
-			decode_traces_.erase(i);
-			signals_changed();
-			return;
-		}
+	for (shared_ptr<views::ViewBase> view : views_)
+		view->remove_decode_signal(signalbase);
+
+	signals_changed();
 }
 #endif
 
@@ -362,8 +685,14 @@ void Session::set_capture_state(capture_state state)
 void Session::update_signals()
 {
 	if (!device_) {
-		signals_.clear();
+		signalbases_.clear();
 		logic_data_.reset();
+		for (shared_ptr<views::ViewBase> view : views_) {
+			view->clear_signals();
+#ifdef ENABLE_DECODE
+			view->clear_decode_signals();
+#endif
+		}
 		return;
 	}
 
@@ -371,17 +700,23 @@ void Session::update_signals()
 
 	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (!sr_dev) {
-		signals_.clear();
+		signalbases_.clear();
 		logic_data_.reset();
+		for (shared_ptr<views::ViewBase> view : views_) {
+			view->clear_signals();
+#ifdef ENABLE_DECODE
+			view->clear_decode_signals();
+#endif
+		}
 		return;
 	}
 
 	// Detect what data types we will receive
 	auto channels = sr_dev->channels();
-	unsigned int logic_channel_count = std::count_if(
+	unsigned int logic_channel_count = count_if(
 		channels.begin(), channels.end(),
 		[] (shared_ptr<Channel> channel) {
-			return channel->type() == ChannelType::LOGIC; });
+			return channel->type() == sigrok::ChannelType::LOGIC; });
 
 	// Create data containers for the logic data segments
 	{
@@ -397,72 +732,92 @@ void Session::update_signals()
 		}
 	}
 
-	// Make the Signals list
-	{
-		unique_lock<shared_mutex> lock(signals_mutex_);
-
-		unordered_set< shared_ptr<view::Signal> > prev_sigs(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->base()->channel() == channel;
-				});
-			if (iter != prev_sigs.end()) {
-				// Copy the signal from the old set to the new
-				signal = *iter;
-				auto logic_signal = dynamic_pointer_cast<
-					view::LogicSignal>(signal);
-				if (logic_signal)
-					logic_signal->set_logic_data(
-						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_, signalbase, logic_data_));
-					all_signal_data_.insert(logic_data_);
-					signalbases_.insert(signalbase);
-					break;
-
-				case SR_CHANNEL_ANALOG:
-				{
-					shared_ptr<data::Analog> data(
-						new data::Analog());
-					signal = shared_ptr<view::Signal>(
-						new view::AnalogSignal(
-							*this, signalbase, data));
-					all_signal_data_.insert(data);
-					signalbases_.insert(signalbase);
-					break;
-				}
-
-				default:
-					assert(0);
-					break;
+	// Make the signals list
+	for (shared_ptr<views::ViewBase> viewbase : views_) {
+		views::TraceView::View *trace_view =
+			qobject_cast<views::TraceView::View*>(viewbase.get());
+
+		if (trace_view) {
+			unordered_set< shared_ptr<views::TraceView::Signal> >
+				prev_sigs(trace_view->signals());
+			trace_view->clear_signals();
+
+			for (auto channel : sr_dev->channels()) {
+				shared_ptr<data::SignalBase> signalbase;
+				shared_ptr<views::TraceView::Signal> signal;
+
+				// Find the channel in the old signals
+				const auto iter = find_if(
+					prev_sigs.cbegin(), prev_sigs.cend(),
+					[&](const shared_ptr<views::TraceView::Signal> &s) {
+						return s->base()->channel() == channel;
+					});
+				if (iter != prev_sigs.end()) {
+					// Copy the signal from the old set to the new
+					signal = *iter;
+					trace_view->add_signal(signal);
+				} else {
+					// Find the signalbase for this channel if possible
+					signalbase.reset();
+					for (const shared_ptr<data::SignalBase> b : signalbases_)
+						if (b->channel() == channel)
+							signalbase = b;
+
+					switch(channel->type()->id()) {
+					case SR_CHANNEL_LOGIC:
+						if (!signalbase) {
+							signalbase = make_shared<data::SignalBase>(channel,
+								data::SignalBase::LogicChannel);
+							signalbases_.insert(signalbase);
+
+							all_signal_data_.insert(logic_data_);
+							signalbase->set_data(logic_data_);
+
+							connect(this, SIGNAL(capture_state_changed(int)),
+								signalbase.get(), SLOT(on_capture_state_changed(int)));
+						}
+
+						signal = shared_ptr<views::TraceView::Signal>(
+							new views::TraceView::LogicSignal(*this,
+								device_, signalbase));
+						trace_view->add_signal(signal);
+						break;
+
+					case SR_CHANNEL_ANALOG:
+					{
+						if (!signalbase) {
+							signalbase = make_shared<data::SignalBase>(channel,
+								data::SignalBase::AnalogChannel);
+							signalbases_.insert(signalbase);
+
+							shared_ptr<data::Analog> data(new data::Analog());
+							all_signal_data_.insert(data);
+							signalbase->set_data(data);
+
+							connect(this, SIGNAL(capture_state_changed(int)),
+								signalbase.get(), SLOT(on_capture_state_changed(int)));
+						}
+
+						signal = shared_ptr<views::TraceView::Signal>(
+							new views::TraceView::AnalogSignal(
+								*this, signalbase));
+						trace_view->add_signal(signal);
+						break;
+					}
+
+					default:
+						assert(false);
+						break;
+					}
 				}
 			}
-
-			assert(signal);
-			signals_.insert(signal);
 		}
 	}
 
 	signals_changed();
 }
 
-shared_ptr<data::SignalBase> Session::signal_from_channel(
+shared_ptr<data::SignalBase> Session::signalbase_from_channel(
 	shared_ptr<sigrok::Channel> channel) const
 {
 	for (shared_ptr<data::SignalBase> sig : signalbases_) {
@@ -494,19 +849,47 @@ void Session::sample_thread_proc(function<void (const QString)> error_handler)
 	set_capture_state(device_->session()->trigger() ?
 		AwaitingTrigger : Running);
 
-	device_->run();
+	try {
+		device_->run();
+	} catch (Error e) {
+		error_handler(e.what());
+		set_capture_state(Stopped);
+		return;
+	}
+
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received
 	if (cur_logic_segment_) {
 		qDebug("SR_DF_END was not received.");
-		assert(0);
+		assert(false);
 	}
 
+	// Optimize memory usage
+	free_unused_memory();
+
+	// We now have unsaved data unless we just "captured" from a file
+	shared_ptr<devices::File> file_device =
+		dynamic_pointer_cast<devices::File>(device_);
+
+	if (!file_device)
+		data_saved_ = false;
+
 	if (out_of_memory_)
 		error_handler(tr("Out of memory, acquisition stopped."));
 }
 
+void Session::free_unused_memory()
+{
+	for (shared_ptr<data::SignalData> data : all_signal_data_) {
+		const vector< shared_ptr<data::Segment> > segments = data->segments();
+
+		for (shared_ptr<data::Segment> segment : segments) {
+			segment->free_unused_memory();
+		}
+	}
+}
+
 void Session::feed_in_header()
 {
 	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
@@ -539,7 +922,6 @@ void Session::feed_in_trigger()
 	uint64_t sample_count = 0;
 
 	{
-		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;
@@ -567,8 +949,6 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 {
 	lock_guard<recursive_mutex> lock(data_mutex_);
 
-	const size_t sample_count = logic->data_length() / logic->unit_size();
-
 	if (!logic_data_) {
 		// The only reason logic_data_ would not have been created is
 		// if it was not possible to determine the signals when the
@@ -581,9 +961,8 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		set_capture_state(Running);
 
 		// Create a new data segment
-		cur_logic_segment_ = shared_ptr<data::LogicSegment>(
-			new data::LogicSegment(
-				logic, cur_samplerate_, sample_count));
+		cur_logic_segment_ = make_shared<data::LogicSegment>(
+			*logic_data_, logic->unit_size(), cur_samplerate_);
 		logic_data_->push_segment(cur_logic_segment_);
 
 		// @todo Putting this here means that only listeners querying
@@ -591,11 +970,10 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		// frame_began is DecoderStack, but in future we need to signal
 		// this after both analog and logic sweeps have begun.
 		frame_began();
-	} else {
-		// Append to the existing data segment
-		cur_logic_segment_->append_payload(logic);
 	}
 
+	cur_logic_segment_->append_payload(logic);
+
 	data_received();
 }
 
@@ -606,12 +984,15 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const vector<shared_ptr<Channel>> channels = analog->channels();
 	const unsigned int channel_count = channels.size();
 	const size_t sample_count = analog->num_samples() / channel_count;
-	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
-	if (signals_.empty())
+	unique_ptr<float> data(new float[analog->num_samples()]);
+	analog->get_data_as_float(data.get());
+
+	if (signalbases_.empty())
 		update_signals();
 
+	float *channel_data = data.get();
 	for (auto channel : channels) {
 		shared_ptr<data::AnalogSegment> segment;
 
@@ -626,21 +1007,18 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 			// in the sweep containing this segment.
 			sweep_beginning = true;
 
-			// Create a segment, keep it in the maps of channels
-			segment = shared_ptr<data::AnalogSegment>(
-				new data::AnalogSegment(
-					cur_samplerate_, sample_count));
-			cur_analog_segments_[channel] = segment;
-
 			// Find the analog data associated with the channel
-			shared_ptr<view::AnalogSignal> sig =
-				dynamic_pointer_cast<view::AnalogSignal>(
-					signal_from_channel(channel));
-			assert(sig);
+			shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
+			assert(base);
 
-			shared_ptr<data::Analog> data(sig->analog_data());
+			shared_ptr<data::Analog> data(base->analog_data());
 			assert(data);
 
+			// Create a segment, keep it in the maps of channels
+			segment = make_shared<data::AnalogSegment>(
+				*data, cur_samplerate_);
+			cur_analog_segments_[channel] = segment;
+
 			// Push the segment into the analog data.
 			data->push_segment(segment);
 		}
@@ -648,7 +1026,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 		assert(segment);
 
 		// Append the samples in the segment
-		segment->append_interleaved_samples(data++, sample_count,
+		segment->append_interleaved_samples(channel_data++, sample_count,
 			channel_count);
 	}
 
@@ -663,6 +1041,8 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	shared_ptr<Packet> packet)
 {
+	static bool frame_began = false;
+
 	(void)device;
 
 	assert(device);
@@ -684,12 +1064,13 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 
 	case SR_DF_FRAME_BEGIN:
 		feed_in_frame_begin();
+		frame_began = true;
 		break;
 
 	case SR_DF_LOGIC:
 		try {
 			feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
-		} catch (std::bad_alloc) {
+		} catch (bad_alloc) {
 			out_of_memory_ = true;
 			device_->stop();
 		}
@@ -698,12 +1079,13 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	case SR_DF_ANALOG:
 		try {
 			feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
-		} catch (std::bad_alloc) {
+		} catch (bad_alloc) {
 			out_of_memory_ = true;
 			device_->stop();
 		}
 		break;
 
+	case SR_DF_FRAME_END:
 	case SR_DF_END:
 	{
 		{
@@ -711,7 +1093,10 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 			cur_logic_segment_.reset();
 			cur_analog_segments_.clear();
 		}
-		frame_ended();
+		if (frame_began) {
+			frame_began = false;
+			frame_ended();
+		}
 		break;
 	}
 	default:
@@ -719,4 +1104,9 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	}
 }
 
+void Session::on_data_saved()
+{
+	data_saved_ = true;
+}
+
 } // namespace pv