X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=aa2902375e02bd84e479d382b20e1ab32e4e3951;hb=a38268f064687eff3e5395da6bb7f39e55dcd60f;hp=92f64f5ba12a328b56bad5728ec8db14c3000b82;hpb=e93f553816d1938ab1917dff497a36acec4257e3;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 92f64f5..aa29023 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -22,9 +22,11 @@
 
 #include "storesession.hpp"
 
+#include <pv/devicemanager.hpp>
 #include <pv/session.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/view/signal.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -45,6 +47,7 @@ using std::set;
 using std::shared_ptr;
 using std::string;
 using std::thread;
+using std::unordered_set;
 using std::vector;
 
 using Glib::VariantBase;
@@ -88,11 +91,15 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-	set< shared_ptr<data::SignalData> > data_set =
-		session_.get_data();
-
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<view::Signal> > &sigs(session_.signals());
+
+	// Add enabled channels to the data set
+	set< shared_ptr<data::SignalData> > data_set;
+
+	for (shared_ptr<view::Signal> signal : sigs)
+		if (signal->enabled())
+			data_set.insert(signal->data());
 
 	// Check we have logic data
 	if (data_set.empty() || sigs.empty()) {
@@ -110,7 +117,7 @@ bool StoreSession::start()
 	shared_ptr<data::Logic> data;
 	if (!(data = dynamic_pointer_cast<data::Logic>(*data_set.begin()))) {
 		error_ = tr("PulseView currently only has support for "
-			"storing a logic data.");
+			"storing logic data.");
 		return false;
 	}
 
@@ -128,22 +135,15 @@ bool StoreSession::start()
 
 	// Begin storing
 	try {
-		auto context = session_.session()->context();
-		auto device = session_.device();
+		const auto context = session_.device_manager().context();
+		auto device = session_.device()->device();
 
 		map<string, Glib::VariantBase> options = options_;
 
-		// If the output has the capability to write files, use it.
-		// Otherwise, open the output stream.
-		const auto opt_list = output_format_->options();
-		if (opt_list.find("filename") != opt_list.end())
-			options["filename"] =
-				Glib::Variant<Glib::ustring>::create(file_name_);
-		else
-			output_stream_.open(file_name_, ios_base::binary |
-				ios_base::trunc | ios_base::out);
-
-		output_ = output_format_->create_output(device, options);
+		output_stream_.open(file_name_, ios_base::binary |
+			ios_base::trunc | ios_base::out);
+
+		output_ = output_format_->create_output(file_name_, device, options);
 		auto meta = context->create_meta_packet(
 			{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
 				segment->samplerate())}});
@@ -201,10 +201,10 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 			start_sample + samples_per_block, sample_count);
 		segment->get_samples(data, start_sample, end_sample);
 
-		size_t length = end_sample - start_sample;
+		size_t length = (end_sample - start_sample) * unit_size;
 
 		try {
-			auto context = session_.session()->context();
+			const auto context = session_.device_manager().context();
 			auto logic = context->create_logic_packet(data, length, unit_size);
 			const string data = output_->receive(logic);
 			if (output_stream_.is_open())