X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=809dba3e6694e37da736e6799e2deaa946e69d18;hp=cb643682d57023462e38cc8dbd228bcd2182a353;hb=HEAD;hpb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index cb643682..5eb6a8ad 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -21,6 +21,8 @@
 
 #include "storesession.hpp"
 
+#include <QSettings>
+
 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
@@ -28,6 +30,7 @@
 #include <pv/data/signalbase.hpp>
 #include <pv/devicemanager.hpp>
 #include <pv/devices/device.hpp>
+#include <pv/globalsettings.hpp>
 #include <pv/session.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -42,7 +45,6 @@ using std::mutex;
 using std::pair;
 using std::shared_ptr;
 using std::string;
-using std::unordered_set;
 using std::vector;
 
 using Glib::VariantBase;
@@ -90,14 +92,14 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-	const unordered_set< shared_ptr<data::SignalBase> > sigs(session_.signalbases());
+	const vector< shared_ptr<data::SignalBase> > sigs(session_.signalbases());
 
 	shared_ptr<data::Segment> any_segment;
 	shared_ptr<data::LogicSegment> lsegment;
 	vector< shared_ptr<data::SignalBase> > achannel_list;
 	vector< shared_ptr<data::AnalogSegment> > asegment_list;
 
-	for (shared_ptr<data::SignalBase> signal : sigs) {
+	for (const shared_ptr<data::SignalBase>& signal : sigs) {
 		if (!signal->enabled())
 			continue;
 
@@ -145,6 +147,7 @@ bool StoreSession::start()
 	uint64_t end_sample;
 
 	if (sample_range_.first == sample_range_.second) {
+		// No sample range specified, save everything we have
 		start_sample_ = 0;
 		sample_count_ =	any_segment->get_sample_count();
 	} else {
@@ -159,6 +162,12 @@ bool StoreSession::start()
 		}
 	}
 
+	// Make sure the sample range is valid
+	if (start_sample_ > any_segment->get_sample_count()) {
+		error_ = tr("Can't save range without sample data.");
+		return false;
+	}
+
 	// Begin storing
 	try {
 		const auto context = session_.device_manager().context();
@@ -175,13 +184,30 @@ bool StoreSession::start()
 			{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
 				any_segment->samplerate())}});
 		output_->receive(meta);
-	} catch (Error error) {
+
+		auto header = context->create_header_packet(session_.get_acquisition_start_time());
+		output_->receive(header);
+	} catch (Error& error) {
 		error_ = tr("Error while saving: ") + error.what();
 		return false;
 	}
 
 	thread_ = std::thread(&StoreSession::store_proc, this,
 		achannel_list, asegment_list, lsegment);
+
+	// Save session setup if we're saving to srzip and the user wants it
+	GlobalSettings settings;
+	bool save_with_setup = settings.value(GlobalSettings::Key_General_SaveWithSetup).toBool();
+
+	if ((output_format_->name() == "srzip") && (save_with_setup)) {
+		QString setup_file_name = QString::fromStdString(file_name_);
+		setup_file_name.truncate(setup_file_name.lastIndexOf('.'));
+		setup_file_name.append(".pvs");
+
+		QSettings settings_storage(setup_file_name, QSettings::IniFormat);
+		session_.save_setup(settings_storage);
+	}
+
 	return true;
 }
 
@@ -227,6 +253,7 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 	const unsigned int samples_per_block =
 		min(asamples_per_block, lsamples_per_block);
 
+	const auto context = session_.device_manager().context();
 	while (!interrupt_ && sample_count_) {
 		progress_updated();
 
@@ -234,14 +261,12 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 			min((uint64_t)samples_per_block, sample_count_);
 
 		try {
-			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))->channel();
 				shared_ptr<data::AnalogSegment> asegment = asegment_list.at(i);
 
-				const float *adata =
-					asegment->get_samples(start_sample_, start_sample_ + packet_len);
+				float *adata = new float[packet_len];
+				asegment->get_samples(start_sample_, start_sample_ + packet_len, adata);
 
 				auto analog = context->create_analog_packet(
 					vector<shared_ptr<sigrok::Channel> >{achannel},
@@ -257,11 +282,11 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 			}
 
 			if (lsegment) {
-				const uint8_t* ldata =
-					lsegment->get_samples(start_sample_, start_sample_ + packet_len);
+				const size_t data_size = packet_len * lunit_size;
+				uint8_t* ldata = new uint8_t[data_size];
+				lsegment->get_samples(start_sample_, start_sample_ + packet_len, ldata);
 
-				const size_t length = packet_len * lunit_size;
-				auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
+				auto logic = context->create_logic_packet((void*)ldata, data_size, lunit_size);
 				const string ldata_str = output_->receive(logic);
 
 				if (output_stream_.is_open())
@@ -269,7 +294,7 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 
 				delete[] ldata;
 			}
-		} catch (Error error) {
+		} catch (Error& error) {
 			error_ = tr("Error while saving: ") + error.what();
 			break;
 		}
@@ -279,6 +304,15 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 		units_stored_ = unit_count_ - (sample_count_ >> progress_scale);
 	}
 
+	try {
+		auto dfend = context->create_end_packet();
+		const string ldata_str = output_->receive(dfend);
+		if (output_stream_.is_open())
+			output_stream_ << ldata_str;
+	} catch (Error& error) {
+		error_ = tr("Error while saving: ") + error.what();
+	}
+
 	// Zeroing the progress variables indicates completion
 	units_stored_ = unit_count_ = 0;