X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=cfc69d4aa94e4fbdda0fb4d8806058a0ecaa491c;hp=7d9375a7451f414b14975557f6c49a3705361171;hb=554af71bf515d2763ca13c3829dbeb2064cc4c83;hpb=611c86259f66dd1766b10b1e1b671b0fadd51fe2

diff --git a/pv/session.hpp b/pv/session.hpp
index 7d9375a7..cfc69d4a 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -25,6 +25,7 @@
 #include <condition_variable>
 #endif
 
+#include <deque>
 #include <functional>
 #include <map>
 #include <memory>
@@ -32,25 +33,24 @@
 #include <set>
 #include <string>
 #include <thread>
-#include <unordered_set>
 #include <vector>
 
 #include <QObject>
 #include <QSettings>
 #include <QString>
-#include <QTime>
+#include <QElapsedTimer>
 
 #ifdef ENABLE_FLOW
 #include <gstreamermm.h>
 #include <libsigrokflow/libsigrokflow.hpp>
 #endif
 
+#include "metadata_obj.hpp"
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
-
+using std::deque;
 using std::function;
-using std::list;
 using std::map;
 using std::mutex;
 using std::recursive_mutex;
@@ -95,6 +95,7 @@ class Logic;
 class LogicSegment;
 class SignalBase;
 class SignalData;
+class SignalGroup;
 }
 
 namespace devices {
@@ -109,6 +110,8 @@ namespace views {
 class ViewBase;
 }
 
+using pv::views::ViewType;
+
 class Session : public QObject
 {
 	Q_OBJECT
@@ -136,15 +139,12 @@ public:
 	shared_ptr<devices::Device> device() const;
 
 	QString name() const;
-
 	void set_name(QString name);
 
-	const list< shared_ptr<views::ViewBase> > views() const;
+	const vector< shared_ptr<views::ViewBase> > views() const;
 
 	shared_ptr<views::ViewBase> main_view() const;
-
 	shared_ptr<pv::toolbars::MainBar> main_bar() const;
-
 	void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
 
 	/**
@@ -153,11 +153,8 @@ 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);
 
 	/**
@@ -169,23 +166,19 @@ public:
 	 * Sets device instance that will be used in the next capture session.
 	 */
 	void set_device(shared_ptr<devices::Device> device);
-
 	void set_default_device();
+	bool using_file_device() const;
 
-	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,
+	void load_file(QString file_name, QString setup_file_name = QString(),
 		shared_ptr<sigrok::InputFormat> format = nullptr,
 		const map<string, Glib::VariantBase> &options =
 			map<string, Glib::VariantBase>());
 
 	capture_state get_capture_state() const;
-
 	void start_capture(function<void (const QString)> error_handler);
-
 	void stop_capture();
 
 	double get_samplerate() const;
@@ -195,14 +188,12 @@ public:
 	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);
-
 	bool has_view(shared_ptr<views::ViewBase> view);
 
-	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
-
-	bool all_segments_complete(uint32_t segment_id) const;
+	const vector< shared_ptr<data::SignalBase> > signalbases() const;
+	void add_generated_signal(shared_ptr<data::SignalBase> signal);
+	void remove_generated_signal(shared_ptr<data::SignalBase> signal);
 
 #ifdef ENABLE_DECODE
 	shared_ptr<data::DecodeSignal> add_decode_signal();
@@ -210,6 +201,10 @@ public:
 	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+	bool all_segments_complete(uint32_t segment_id) const;
+
+	MetadataObjManager* metadata_obj_manager();
+
 private:
 	void set_capture_state(capture_state state);
 
@@ -236,16 +231,11 @@ private:
 #endif
 
 	void feed_in_header();
-
 	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
-
 	void feed_in_trigger();
-
 	void feed_in_frame_begin();
 	void feed_in_frame_end();
-
 	void feed_in_logic(shared_ptr<sigrok::Logic> logic);
-
 	void feed_in_analog(shared_ptr<sigrok::Analog> analog);
 
 	void data_feed_in(shared_ptr<sigrok::Device> device,
@@ -266,8 +256,7 @@ Q_SIGNALS:
 
 	void data_received();
 
-	void add_view(const QString &title, views::ViewType type,
-		Session *session);
+	void add_view(ViewType type, Session *session);
 
 public Q_SLOTS:
 	void on_data_saved();
@@ -277,22 +266,25 @@ public Q_SLOTS:
 #endif
 
 private:
+	bool shutting_down_;
+
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
 	QString default_name_, name_;
 
-	list< shared_ptr<views::ViewBase> > views_;
+	vector< shared_ptr<views::ViewBase> > views_;
 	shared_ptr<pv::views::ViewBase> main_view_;
 
 	shared_ptr<pv::toolbars::MainBar> main_bar_;
 
-	mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
+	mutable mutex sampling_mutex_; //!< Protects access to capture_state_
 	capture_state capture_state_;
 
-	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+	vector< shared_ptr<data::SignalBase> > signalbases_;
 	unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+	deque<data::SignalGroup*> signal_groups_;
 
-	/// trigger_list_ contains pairs of <segment_id, timestamp> values.
+	/// trigger_list_ contains pairs of <segment_id, timestamp> values
 	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
 
 	mutable recursive_mutex data_mutex_;
@@ -309,7 +301,9 @@ private:
 	bool data_saved_;
 	bool frame_began_;
 
-	QTime acq_time_;
+	QElapsedTimer acq_time_;
+
+	MetadataObjManager metadata_obj_manager_;
 
 #ifdef ENABLE_FLOW
 	RefPtr<Pipeline> pipeline_;