Add -s / --settings parameter to load a session setup file

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 9d42a4d98b657896a5e61e18667758052c601e8f..7d9375a7451f414b14975557f6c49a3705361171 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -20,6 +20,12 @@
 #ifndef PULSEVIEW_PV_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#ifdef ENABLE_FLOW
+#include <atomic>
+#include <condition_variable>
+#endif
+
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -32,10 +38,17 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QTime>
+
+#ifdef ENABLE_FLOW
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
 
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+
 using std::function;
 using std::list;
 using std::map;
@@ -45,6 +58,13 @@ using std::shared_ptr;
 using std::string;
 using std::unordered_set;
 
+#ifdef ENABLE_FLOW
+using Glib::RefPtr;
+using Gst::AppSink;
+using Gst::Element;
+using Gst::Pipeline;
+#endif
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -132,8 +152,12 @@ public:
         */
        bool data_saved() const;
 
+       void save_setup(QSettings &settings) const;
+
        void save_settings(QSettings &settings) const;
 
+       void restore_setup(QSettings &settings);
+
        void restore_settings(QSettings &settings);
 
        /**
@@ -148,9 +172,12 @@ public:
 
        void set_default_device();
 
-       void load_init_file(const string &file_name, const string &format);
+       void load_init_file(const string &file_name,
+               const string &format,
+               const string &setup_file_name);
 
        void load_file(QString file_name,
+               QString setup_file_name = nullptr,
                shared_ptr<sigrok::InputFormat> format = nullptr,
                const map<string, Glib::VariantBase> &options =
                        map<string, Glib::VariantBase>());
@@ -163,6 +190,10 @@ public:
 
        double get_samplerate() const;
 
+       uint32_t get_segment_count() const;
+
+       vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
+
        void register_view(shared_ptr<views::ViewBase> view);
 
        void deregister_view(shared_ptr<views::ViewBase> view);
@@ -171,6 +202,8 @@ public:
 
        const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
 
+       bool all_segments_complete(uint32_t segment_id) const;
+
 #ifdef ENABLE_DECODE
        shared_ptr<data::DecodeSignal> add_decode_signal();
 
@@ -189,11 +222,19 @@ private:
                vector<string> user_spec,
                map<string, shared_ptr<Option>> fmt_opts);
 
-private:
        void sample_thread_proc(function<void (const QString)> error_handler);
 
        void free_unused_memory();
 
+       void signal_new_segment();
+       void signal_segment_completed();
+
+#ifdef ENABLE_FLOW
+       bool on_gst_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message);
+
+       Gst::FlowReturn on_gst_new_sample();
+#endif
+
        void feed_in_header();
 
        void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -210,6 +251,31 @@ private:
        void data_feed_in(shared_ptr<sigrok::Device> device,
                shared_ptr<sigrok::Packet> packet);
 
+Q_SIGNALS:
+       void capture_state_changed(int state);
+       void device_changed();
+
+       void signals_changed();
+
+       void name_changed();
+
+       void trigger_event(int segment_id, util::Timestamp location);
+
+       void new_segment(int new_segment_id);
+       void segment_completed(int segment_id);
+
+       void data_received();
+
+       void add_view(const QString &title, views::ViewType type,
+               Session *session);
+
+public Q_SLOTS:
+       void on_data_saved();
+
+#ifdef ENABLE_DECODE
+       void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
        DeviceManager &device_manager_;
        shared_ptr<devices::Device> device_;
@@ -226,12 +292,16 @@ private:
        unordered_set< shared_ptr<data::SignalBase> > signalbases_;
        unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
 
+       /// trigger_list_ contains pairs of <segment_id, timestamp> values.
+       vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
+
        mutable recursive_mutex data_mutex_;
        shared_ptr<data::Logic> logic_data_;
        uint64_t cur_samplerate_;
        shared_ptr<data::LogicSegment> cur_logic_segment_;
        map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
                cur_analog_segments_;
+       int32_t highest_segment_id_;
 
        std::thread sampling_thread_;
 
@@ -239,27 +309,17 @@ private:
        bool data_saved_;
        bool frame_began_;
 
-Q_SIGNALS:
-       void capture_state_changed(int state);
-       void device_changed();
-
-       void signals_changed();
-
-       void name_changed();
-
-       void trigger_event(util::Timestamp location);
-
-       void frame_began();
-
-       void data_received();
-
-       void frame_ended();
+       QTime acq_time_;
 
-       void add_view(const QString &title, views::ViewType type,
-               Session *session);
+#ifdef ENABLE_FLOW
+       RefPtr<Pipeline> pipeline_;
+       RefPtr<Element> source_;
+       RefPtr<AppSink> sink_;
 
-public Q_SLOTS:
-       void on_data_saved();
+       mutable mutex pipeline_done_mutex_;
+       mutable condition_variable pipeline_done_cond_;
+       atomic<bool> pipeline_done_interrupt_;
+#endif
 };
 
 } // namespace pv