X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=a3d745b387834e4f76a2516164ca0aa48540125e;hp=46dddcd64411fb85ac998c19d6b493977c52df5d;hb=de6e819c8a6b3f61e69bbb53b5c853ee6686641e;hpb=1df18f6b6d20abd3f1ede94325b6781bf5038ea9

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 46dddcd6..a3d745b3 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -22,20 +22,24 @@
 
 #include "storesession.hpp"
 
+#include <pv/devicemanager.hpp>
 #include <pv/session.hpp>
 #include <pv/data/logic.hpp>
-#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/logicsegment.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::shared_lock;
 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 +47,25 @@ 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;
 
 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 +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());
+	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()) {
@@ -102,40 +117,43 @@ 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;
 	}
 
-	// Get the snapshot
-	const deque< shared_ptr<data::LogicSnapshot> > &snapshots =
-		data->logic_snapshots();
+	// Get the segment
+	const deque< shared_ptr<data::LogicSegment> > &segments =
+		data->logic_segments();
 
-	if (snapshots.empty()) {
-		error_ = tr("No snapshots to save.");
+	if (segments.empty()) {
+		error_ = tr("No segments to save.");
 		return false;
 	}
 
-	const shared_ptr<data::LogicSnapshot> snapshot(snapshots.front());
-	assert(snapshot);
+	const shared_ptr<data::LogicSegment> segment(segments.front());
+	assert(segment);
 
 	// 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_;
+
+		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(data->samplerate())}});
+			{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
+				segment->samplerate())}});
 		output_->receive(meta);
 	} catch (Error error) {
 		error_ = tr("Error while saving.");
 		return false;
 	}
 
-	thread_ = std::thread(&StoreSession::store_proc, this, snapshot);
+	thread_ = std::thread(&StoreSession::store_proc, this, segment);
 	return true;
 }
 
@@ -150,9 +168,9 @@ void StoreSession::cancel()
 	interrupt_ = true;
 }
 
-void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
+void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 {
-	assert(snapshot);
+	assert(segment);
 
 	uint64_t start_sample = 0, sample_count;
 	unsigned progress_scale = 0;
@@ -161,10 +179,10 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 	uint8_t *const data = new uint8_t[BlockSize];
 	assert(data);
 
-	const int unit_size = snapshot->unit_size();
+	const int unit_size = segment->unit_size();
 	assert(unit_size != 0);
 
-	sample_count = snapshot->get_sample_count();
+	sample_count = segment->get_sample_count();
 
 	// Qt needs the progress values to fit inside an int.  If they would
 	// not, scale the current and max values down until they do.
@@ -181,14 +199,16 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 
 		const uint64_t end_sample = min(
 			start_sample + samples_per_block, sample_count);
-		snapshot->get_samples(data, start_sample, end_sample);
+		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 +224,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 	progress_updated();
 
 	output_.reset();
+	output_stream_.close();
 
 	delete[] data;
 }