X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=f4d150dbe0031133afbd2497db3c4947a047c01b;hp=9566b4a06a739efd2d198fb42f4ae6cfddcf71fb;hb=HEAD;hpb=5f9a52096e07e399d76da6724c1cf56bf4511c9f

diff --git a/pv/session.hpp b/pv/session.hpp
index 9566b4a0..94338c20 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,24 +33,26 @@
 #include <set>
 #include <string>
 #include <thread>
-#include <unordered_set>
 #include <vector>
 
+#include <glibmm/datetime.h>
+
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#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;
@@ -94,6 +97,7 @@ class Logic;
 class LogicSegment;
 class SignalBase;
 class SignalData;
+class SignalGroup;
 }
 
 namespace devices {
@@ -108,6 +112,8 @@ namespace views {
 class ViewBase;
 }
 
+using pv::views::ViewType;
+
 class Session : public QObject
 {
 	Q_OBJECT
@@ -135,15 +141,15 @@ public:
 	shared_ptr<devices::Device> device() const;
 
 	QString name() const;
-
 	void set_name(QString name);
 
-	const list< shared_ptr<views::ViewBase> > views() const;
+	QString save_path() const;
+	void set_save_path(QString path);
 
-	shared_ptr<views::ViewBase> main_view() 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);
 
 	/**
@@ -151,8 +157,9 @@ 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);
 
 	/**
@@ -164,37 +171,39 @@ 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,
+	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;
+	Glib::DateTime get_acquisition_start_time() const;
 
-	uint32_t get_segment_count() const;
+	uint32_t get_highest_segment_id() const;
+	uint64_t get_segment_sample_count(uint32_t segment_id) 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);
-
 	bool has_view(shared_ptr<views::ViewBase> view);
 
-	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+	const vector< shared_ptr<data::SignalBase> > signalbases() const;
+	uint32_t get_signal_count(data::SignalBase::ChannelType type) const;
+	uint32_t get_next_signal_index(data::SignalBase::ChannelType type);
 
-	bool all_segments_complete(uint32_t segment_id) 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();
@@ -202,6 +211,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);
 
@@ -228,16 +241,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,
@@ -258,29 +266,37 @@ Q_SIGNALS:
 
 	void data_received();
 
-	void add_view(const QString &title, views::ViewType type,
-		Session *session);
+	void add_view(ViewType type, Session *session);
+	void session_error_raised(const QString text, const QString info_text);
 
 public Q_SLOTS:
 	void on_data_saved();
 
+#ifdef ENABLE_DECODE
+	void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
+	bool shutting_down_;
+
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
-	QString default_name_, name_;
+	QString default_name_, name_, save_path_;
 
-	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_;
+	map<uint8_t, uint32_t> next_index_list_; // signal type -> index counter
 
-	/// 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_;
@@ -290,6 +306,7 @@ private:
 	map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
 		cur_analog_segments_;
 	int32_t highest_segment_id_;
+	vector<uint64_t> segment_sample_count_;
 
 	std::thread sampling_thread_;
 
@@ -297,6 +314,11 @@ private:
 	bool data_saved_;
 	bool frame_began_;
 
+	QElapsedTimer acq_time_;
+	Glib::DateTime acq_start_time_;
+
+	MetadataObjManager metadata_obj_manager_;
+
 #ifdef ENABLE_FLOW
 	RefPtr<Pipeline> pipeline_;
 	RefPtr<Element> source_;