Session/View: Save triggers in a list and use it

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index ead2f82df47955773e53a562f91c18a3e75f94d6..9148ba9bdcaafd8985f5b1f7c833f87d3b1e81f0 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -165,6 +165,8 @@ public:
 
        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);
@@ -193,7 +195,6 @@ 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();
@@ -217,6 +218,27 @@ 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();
+
 private:
        DeviceManager &device_manager_;
        shared_ptr<devices::Device> device_;
@@ -233,6 +255,9 @@ 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_;
@@ -246,27 +271,6 @@ private:
        bool out_of_memory_;
        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 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();
 };
 
 } // namespace pv