#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>
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
+using sigrok::OutputFlag;
namespace pv {
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 unordered_set< 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()) {
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;
}
map<string, Glib::VariantBase> options = options_;
- output_stream_.open(file_name_, ios_base::binary |
- ios_base::trunc | ios_base::out);
+ 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(