#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/devicemanager.hpp>
-#include <pv/session.hpp>
+#include <QSettings>
+
#include <pv/data/analog.hpp>
#include <pv/data/analogsegment.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#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>
-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::min;
using std::mutex;
using std::pair;
-using std::set;
using std::shared_ptr;
using std::string;
-using std::unordered_set;
using std::vector;
using Glib::VariantBase;
-using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
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;
- if (signal->type() == ChannelType::LOGIC) {
+ if (signal->type() == data::SignalBase::LogicChannel) {
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
any_segment = lsegment;
}
- if (signal->type() == ChannelType::ANALOG) {
+ if (signal->type() == data::SignalBase::AnalogChannel) {
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();
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 {
}
}
+ // 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();
{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
any_segment->samplerate())}});
output_->receive(meta);
- } catch (Error error) {
+ } 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;
}
// 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)
- progress_scale ++;
+ progress_scale++;
unit_count_ = sample_count_ >> progress_scale;
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();
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},
}
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())
delete[] ldata;
}
- } catch (Error error) {
+ } catch (Error& error) {
error_ = tr("Error while saving: ") + error.what();
break;
}
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;
output_stream_.close();
}
-} // pv
+} // namespace pv
projects / pulseview.git / blobdiff