projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32: Re-fix the Windows build (namespace pollution via windows.h).
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index bf214554250ac6ddf23185aa61bc448bcbf24e09..c7c2edb0b4eace1e1fcf290770527b35ac6d12fb 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-20,6
+20,14
@@
#include <cassert>
#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 "storesession.hpp"
#include <pv/devicemanager.hpp>
@@
-55,6
+63,7
@@
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
+using sigrok::OutputFlag;
namespace pv {
namespace pv {
@@
-91,12
+100,14
@@
const QString& StoreSession::error() const
bool StoreSession::start()
{
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()) {
// Check we have logic data
if (data_set.empty() || sigs.empty()) {
@@
-114,7
+125,7
@@
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 "
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;
}
return false;
}
@@
-137,8
+148,9
@@
bool StoreSession::start()
map<string, Glib::VariantBase> options = options_;
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(
output_ = output_format_->create_output(file_name_, device, options);
auto meta = context->create_meta_packet(
@@
-198,7
+210,7
@@
void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
start_sample + samples_per_block, sample_count);
segment->get_samples(data, start_sample, end_sample);
start_sample + samples_per_block, sample_count);
segment->get_samples(data, start_sample, end_sample);
- size_t length =
end_sample - start_sampl
e;
+ size_t length =
(end_sample - start_sample) * unit_siz
e;
try {
const auto context = session_.device_manager().context();
try {
const auto context = session_.device_manager().context();