Added pv::dialogs::InputOutputOptions

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 46dddcd64411fb85ac998c19d6b493977c52df5d..92f64f5ba12a328b56bad5728ec8db14c3000b82 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -24,18 +24,20 @@
 
 #include <pv/session.hpp>
 #include <pv/data/logic.hpp>
-#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/logicsegment.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.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::map;
 using std::min;
 using std::mutex;
 using std::pair;
@@ -45,16 +47,22 @@ using std::string;
 using std::thread;
 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),
@@ -106,36 +114,46 @@ bool StoreSession::start()
                return false;
        }
 
-       // Get the snapshot
-       const deque< shared_ptr<data::LogicSnapshot> > &snapshots =
-               data->logic_snapshots();
+       // Get the segment
+       const deque< shared_ptr<data::LogicSegment> > &segments =
+               data->logic_segments();
 
-       if (snapshots.empty()) {
-               error_ = tr("No snapshots to save.");
+       if (segments.empty()) {
+               error_ = tr("No segments to save.");
                return false;
        }
 
-       const shared_ptr<data::LogicSnapshot> snapshot(snapshots.front());
-       assert(snapshot);
+       const shared_ptr<data::LogicSegment> segment(segments.front());
+       assert(segment);
 
        // 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_)}});
+
+               map<string, Glib::VariantBase> options = options_;
+
+               // If the output has the capability to write files, use it.
+               // Otherwise, open the output stream.
+               const auto opt_list = output_format_->options();
+               if (opt_list.find("filename") != opt_list.end())
+                       options["filename"] =
+                               Glib::Variant<Glib::ustring>::create(file_name_);
+               else
+                       output_stream_.open(file_name_, ios_base::binary |
+                               ios_base::trunc | ios_base::out);
+
+               output_ = output_format_->create_output(device, options);
                auto meta = context->create_meta_packet(
-                       {{ConfigKey::SAMPLERATE,
-                               Glib::Variant<guint64>::create(data->samplerate())}});
+                       {{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
+                               segment->samplerate())}});
                output_->receive(meta);
        } catch (Error error) {
                error_ = tr("Error while saving.");
                return false;
        }
 
-       thread_ = std::thread(&StoreSession::store_proc, this, snapshot);
+       thread_ = std::thread(&StoreSession::store_proc, this, segment);
        return true;
 }
 
@@ -150,9 +168,9 @@ void StoreSession::cancel()
        interrupt_ = true;
 }
 
-void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
+void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 {
-       assert(snapshot);
+       assert(segment);
 
        uint64_t start_sample = 0, sample_count;
        unsigned progress_scale = 0;
@@ -161,10 +179,10 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
        uint8_t *const data = new uint8_t[BlockSize];
        assert(data);
 
-       const int unit_size = snapshot->unit_size();
+       const int unit_size = segment->unit_size();
        assert(unit_size != 0);
 
-       sample_count = snapshot->get_sample_count();
+       sample_count = segment->get_sample_count();
 
        // Qt needs the progress values to fit inside an int.  If they would
        // not, scale the current and max values down until they do.
@@ -181,14 +199,16 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 
                const uint64_t end_sample = min(
                        start_sample + samples_per_block, sample_count);
-               snapshot->get_samples(data, start_sample, end_sample);
+               segment->get_samples(data, start_sample, end_sample);
 
                size_t length = end_sample - start_sample;
 
                try {
                        auto context = session_.session()->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::LogicSnapshot> snapshot)
        progress_updated();
 
        output_.reset();
+       output_stream_.close();
 
        delete[] data;
 }