X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=cfc69d4aa94e4fbdda0fb4d8806058a0ecaa491c;hb=e23d7aa0d9980c3c269cbddb4cfbb32350d7425c;hp=56fbc3a4ee38427af414a3efe5afad3fc324e0d2;hpb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 56fbc3a4..cfc69d4a 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -25,6 +25,7 @@ #include #endif +#include #include #include #include @@ -48,6 +49,7 @@ #include "util.hpp" #include "views/viewbase.hpp" +using std::deque; using std::function; using std::map; using std::mutex; @@ -93,6 +95,7 @@ class Logic; class LogicSegment; class SignalBase; class SignalData; +class SignalGroup; } namespace devices { @@ -107,6 +110,7 @@ namespace views { class ViewBase; } +using pv::views::ViewType; class Session : public QObject { @@ -191,14 +195,14 @@ public: void add_generated_signal(shared_ptr signal); void remove_generated_signal(shared_ptr signal); - bool all_segments_complete(uint32_t segment_id) const; - #ifdef ENABLE_DECODE shared_ptr add_decode_signal(); void remove_decode_signal(shared_ptr signal); #endif + bool all_segments_complete(uint32_t segment_id) const; + MetadataObjManager* metadata_obj_manager(); private: @@ -252,7 +256,7 @@ Q_SIGNALS: void data_received(); - void add_view(views::ViewType type, Session *session); + void add_view(ViewType type, Session *session); public Q_SLOTS: void on_data_saved(); @@ -278,6 +282,7 @@ private: vector< shared_ptr > signalbases_; unordered_set< shared_ptr > all_signal_data_; + deque signal_groups_; /// trigger_list_ contains pairs of values vector< std::pair > trigger_list_;