X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=9a481dd86696ba60ae5e4b61c03bd9719156b1c8;hp=221804c40baaf07721f7c229704f5cae072f1ca4;hb=c51ae0b4200f11bfcb352677cfd07b62ac12230c;hpb=e0e560a5b61ce41b1907d699911cae86a793d5d7

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 221804c4..9a481dd8 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,22 +20,36 @@
 
 #include <cassert>
 
+#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 "storesession.hpp"
 
-#include <pv/sigsession.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/session.hpp>
+#include <pv/data/analog.hpp>
+#include <pv/data/analogsegment.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 +57,29 @@ 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 shared_ptr<OutputFormat> &output_format,
+	const map<string, VariantBase> &options,
+	const std::pair<uint64_t, uint64_t> sample_range,
 	const Session &session) :
 	file_name_(file_name),
+	output_format_(output_format),
+	options_(options),
+	sample_range_(sample_range),
 	session_(session),
 	interrupt_(false),
 	units_stored_(0),
@@ -80,62 +105,97 @@ 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());
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
+	shared_ptr<data::Segment> any_segment;
+	shared_ptr<data::LogicSegment> lsegment;
+	vector< shared_ptr<sigrok::Channel> > achannel_list;
+	vector< shared_ptr<data::AnalogSegment> > asegment_list;
 
-	// Check we have logic data
-	if (data_set.empty() || sigs.empty()) {
-		error_ = tr("No data to save.");
-		return false;
-	}
+	for (shared_ptr<view::Signal> signal : sigs) {
+		if (!signal->enabled())
+			continue;
 
-	if (data_set.size() > 1) {
-		error_ = tr("PulseView currently only has support for "
-			"storing a single data stream.");
-		return false;
-	}
+		shared_ptr<data::SignalData> data = signal->data();
 
-	// Get the logic data
-	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.");
-		return false;
-	}
+		if (dynamic_pointer_cast<data::Logic>(data)) {
+			// All logic channels share the same data segments
+			shared_ptr<data::Logic> ldata = dynamic_pointer_cast<data::Logic>(data);
 
-	// Get the snapshot
-	const deque< shared_ptr<data::LogicSnapshot> > &snapshots =
-		data->get_snapshots();
+			const deque< shared_ptr<data::LogicSegment> > &lsegments =
+				ldata->logic_segments();
 
-	if (snapshots.empty()) {
-		error_ = tr("No snapshots to save.");
+			if (lsegments.empty()) {
+				error_ = tr("Can't save logic channel without data.");
+				return false;
+			}
+
+			lsegment = lsegments.front();
+			any_segment = lsegment;
+		}
+
+		if (dynamic_pointer_cast<data::Analog>(data)) {
+			// Each analog channel has its own segments
+			shared_ptr<data::Analog> adata =
+				dynamic_pointer_cast<data::Analog>(data);
+
+			const deque< shared_ptr<data::AnalogSegment> > &asegments =
+				adata->analog_segments();
+
+			if (asegments.empty()) {
+				error_ = tr("Can't save analog channel without data.");
+				return false;
+			}
+
+			asegment_list.push_back(asegments.front());
+			any_segment = asegments.front();
+
+			achannel_list.push_back(signal->channel());
+		}
+	}
+
+	if (!any_segment) {
+		error_ = tr("No channels enabled.");
 		return false;
 	}
 
-	const shared_ptr<data::LogicSnapshot> snapshot(snapshots.front());
-	assert(snapshot);
+	// Check whether the user wants to export a certain sample range
+	if (sample_range_.first == sample_range_.second) {
+		start_sample_ = 0;
+		sample_count_ =	any_segment->get_sample_count();
+	} else {
+		if (sample_range_.first > sample_range_.second) {
+			start_sample_ = sample_range_.second;
+			sample_count_ = sample_range_.first - sample_range_.second;
+		} else {
+			start_sample_ = sample_range_.first;
+			sample_count_ = sample_range_.second - sample_range_.first;
+		}
+	}
 
 	// 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(data->samplerate())}});
+			{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
+				any_segment->samplerate())}});
 		output_->receive(meta);
 	} catch (Error error) {
-		error_ = tr("Error while saving.");
+		error_ = tr("Error while saving: ") + error.what();
 		return false;
 	}
 
-	thread_ = std::thread(&StoreSession::store_proc, this, snapshot);
+	thread_ = std::thread(&StoreSession::store_proc, this,
+		achannel_list, asegment_list, lsegment);
 	return true;
 }
 
@@ -150,52 +210,90 @@ void StoreSession::cancel()
 	interrupt_ = true;
 }
 
-void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
+void StoreSession::store_proc(vector< shared_ptr<sigrok::Channel> > achannel_list,
+	vector< shared_ptr<data::AnalogSegment> > asegment_list,
+	shared_ptr<data::LogicSegment> lsegment)
 {
-	assert(snapshot);
-
-	uint64_t start_sample = 0, sample_count;
 	unsigned progress_scale = 0;
 
 	/// TODO: Wrap this in a std::unique_ptr when we transition to C++11
-	uint8_t *const data = new uint8_t[BlockSize];
-	assert(data);
-
-	const int unit_size = snapshot->unit_size();
-	assert(unit_size != 0);
-
-	sample_count = snapshot->get_sample_count();
+	uint8_t *const ldata = new uint8_t[BlockSize];
+	assert(ldata);
+
+	int aunit_size = 0;
+	int lunit_size = 0;
+	unsigned int lsamples_per_block = INT_MAX;
+	unsigned int asamples_per_block = INT_MAX;
+
+	if (!asegment_list.empty()) {
+		// We assume all analog channels use the sample unit size
+		aunit_size = asegment_list.front()->unit_size();
+		asamples_per_block = BlockSize / aunit_size;
+	}
+	if (lsegment) {
+		lunit_size = lsegment->unit_size();
+		lsamples_per_block = BlockSize / lunit_size;
+	}
 
-	// Qt needs the progress values to fit inside an int.  If they would
+	// Qt needs the progress values to fit inside an int. If they would
 	// not, scale the current and max values down until they do.
-	while ((sample_count >> progress_scale) > INT_MAX)
+	while ((sample_count_ >> progress_scale) > INT_MAX)
 		progress_scale ++;
 
-	unit_count_ = sample_count >> progress_scale;
+	unit_count_ = sample_count_ >> progress_scale;
 
-	const unsigned int samples_per_block = BlockSize / unit_size;
+	const unsigned int samples_per_block =
+		std::min(asamples_per_block, lsamples_per_block);
 
-	while (!interrupt_ && start_sample < sample_count)
-	{
+	while (!interrupt_ && sample_count_) {
 		progress_updated();
 
-		const uint64_t end_sample = min(
-			start_sample + samples_per_block, sample_count);
-		snapshot->get_samples(data, start_sample, end_sample);
-
-		size_t length = end_sample - start_sample;
+		const uint64_t packet_len =
+			std::min((uint64_t)samples_per_block, sample_count_);
 
 		try {
-			auto context = session_.session()->context();
-			auto logic = context->create_logic_packet(data, length, unit_size);
-			output_->receive(logic);
+			const auto context = session_.device_manager().context();
+
+			for (unsigned int i = 0; i < achannel_list.size(); i++) {
+				shared_ptr<sigrok::Channel> achannel = achannel_list.at(i);
+				shared_ptr<data::AnalogSegment> asegment = asegment_list.at(i);
+
+				const float *adata =
+					asegment->get_samples(start_sample_, start_sample_ + packet_len);
+
+				// The srzip format currently only supports packets with one
+				// analog channel. See zip_append_analog() in srzip.c
+				auto analog = context->create_analog_packet(
+					vector<shared_ptr<sigrok::Channel> >{achannel},
+					(float *)adata, packet_len,
+					sigrok::Quantity::VOLTAGE, sigrok::Unit::VOLT,
+					vector<const sigrok::QuantityFlag *>());
+				const string adata_str = output_->receive(analog);
+
+				if (output_stream_.is_open())
+					output_stream_ << adata_str;
+
+				delete[] adata;
+			}
+
+			if (lsegment) {
+				lsegment->get_samples(ldata, start_sample_, start_sample_ + packet_len);
+
+				const size_t length = packet_len * lunit_size;
+				auto logic = context->create_logic_packet(ldata, length, lunit_size);
+				const string ldata_str = output_->receive(logic);
+
+				if (output_stream_.is_open())
+					output_stream_ << ldata_str;
+			}
 		} catch (Error error) {
-			error_ = tr("Error while saving.");
+			error_ = tr("Error while saving: ") + error.what();
 			break;
 		}
 
-		start_sample = end_sample;
-		units_stored_ = start_sample >> progress_scale;
+		sample_count_ -= packet_len;
+		start_sample_ += packet_len;
+		units_stored_ = unit_count_ - (sample_count_ >> progress_scale);
 	}
 
 	// Zeroing the progress variables indicates completion
@@ -204,8 +302,9 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 	progress_updated();
 
 	output_.reset();
+	output_stream_.close();
 
-	delete[] data;
+	delete[] ldata;
 }
 
 } // pv