X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=da2f963be9eb99609786800e9c45ad3ece294040;hb=453b6d63444bf7fb03242761653fd18e9cde7443;hp=2168cdc78b4d4f56c5f5a6e28cb8e3344a4b5e1c;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 2168cdc7..da2f963b 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,11 +20,16 @@
 
 #include <cassert>
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #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>
@@ -34,8 +39,10 @@ using boost::shared_mutex;
 
 using std::deque;
 using std::dynamic_pointer_cast;
+using std::ios_base;
 using std::lock_guard;
 using std::make_pair;
+using std::map;
 using std::min;
 using std::mutex;
 using std::pair;
@@ -43,18 +50,26 @@ using std::set;
 using std::shared_ptr;
 using std::string;
 using std::thread;
+using std::unordered_set;
 using std::vector;
 
+using Glib::VariantBase;
+
 using sigrok::ConfigKey;
 using sigrok::Error;
+using sigrok::OutputFormat;
+using sigrok::OutputFlag;
 
 namespace pv {
 
 const size_t StoreSession::BlockSize = 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
-	const Session &session) :
+	const shared_ptr<OutputFormat> &output_format,
+	const map<string, VariantBase> &options, const Session &session) :
 	file_name_(file_name),
+	output_format_(output_format),
+	options_(options),
 	session_(session),
 	interrupt_(false),
 	units_stored_(0),
@@ -80,11 +95,14 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-	set< shared_ptr<data::SignalData> > data_set =
-		session_.get_data();
+	const unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+
+	// Add enabled channels to the data set
+	set< shared_ptr<data::SignalData> > data_set;
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
+	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()) {
@@ -102,7 +120,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;
 	}
 
@@ -120,12 +138,16 @@ bool StoreSession::start()
 
 	// Begin storing
 	try {
-		auto context = session_.session()->context();
-		auto output_format = context->output_formats()["srzip"];
-		auto device = session_.device();
-		output_ = output_format->create_output(device,
-			{{"filename",
-				Glib::Variant<Glib::ustring>::create(file_name_)}});
+		const auto context = session_.device_manager().context();
+		auto device = session_.device()->device();
+
+		map<string, Glib::VariantBase> options = options_;
+
+		if (!output_format_->test_flag(OutputFlag::INTERNAL_IO_HANDLING))
+			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())}});
@@ -183,12 +205,14 @@ 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);
-			output_->receive(logic);
+			const string data = output_->receive(logic);
+			if (output_stream_.is_open())
+				output_stream_ << data;
 		} catch (Error error) {
 			error_ = tr("Error while saving.");
 			break;
@@ -204,6 +228,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 	progress_updated();
 
 	output_.reset();
+	output_stream_.close();
 
 	delete[] data;
 }