Fix #404 by only saving enabled signals

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 2168cdc78b4d4f56c5f5a6e28cb8e3344a4b5e1c..a3d745b387834e4f76a2516164ca0aa48540125e 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -22,9 +22,11 @@
 
 #include "storesession.hpp"
 
+#include <pv/devicemanager.hpp>
 #include <pv/session.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/view/signal.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -34,8 +36,10 @@ 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 +47,25 @@ 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;
 
 namespace pv {
 
 const size_t StoreSession::BlockSize = 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
-       const Session &session) :
+       const shared_ptr<OutputFormat> &output_format,
+       const map<string, VariantBase> &options, const Session &session) :
        file_name_(file_name),
+       output_format_(output_format),
+       options_(options),
        session_(session),
        interrupt_(false),
        units_stored_(0),
@@ -80,11 +91,15 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-       set< shared_ptr<data::SignalData> > data_set =
-               session_.get_data();
-
        shared_lock<shared_mutex> lock(session_.signals_mutex());
-       const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
+       unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+
+       // Add enabled channels to the data set
+       set< shared_ptr<data::SignalData> > data_set;
+
+       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()) {
@@ -102,7 +117,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 "
-                       "storing a logic data.");
+                       "storing logic data.");
                return false;
        }
 
@@ -120,12 +135,15 @@ bool StoreSession::start()
 
        // 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_;
+
+               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(
                                segment->samplerate())}});
@@ -183,12 +201,14 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
                        start_sample + samples_per_block, sample_count);
                segment->get_samples(data, start_sample, end_sample);
 
-               size_t length = end_sample - start_sample;
+               size_t length = (end_sample - start_sample) * unit_size;
 
                try {
-                       auto context = session_.session()->context();
+                       const auto context = session_.device_manager().context();
                        auto logic = context->create_logic_packet(data, length, unit_size);
-                       output_->receive(logic);
+                       const string data = output_->receive(logic);
+                       if (output_stream_.is_open())
+                               output_stream_ << data;
                } catch (Error error) {
                        error_ = tr("Error while saving.");
                        break;
@@ -204,6 +224,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
        progress_updated();
 
        output_.reset();
+       output_stream_.close();
 
        delete[] data;
 }