X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=91f98b581b8c0ed2a342321caf075cedff279b2d;hb=refs%2Fheads%2Fmaster;hp=56fbc3a4ee38427af414a3efe5afad3fc324e0d2;hpb=f9a0fd83226d97af7458d8c9dac0b88c83a54d29;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 56fbc3a4..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>
@@ -34,6 +35,8 @@
 #include <thread>
 #include <vector>
 
+#include <glibmm/datetime.h>
+
 #include <QObject>
 #include <QSettings>
 #include <QString>
@@ -48,6 +51,7 @@
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+using std::deque;
 using std::function;
 using std::map;
 using std::mutex;
@@ -93,6 +97,7 @@ class Logic;
 class LogicSegment;
 class SignalBase;
 class SignalData;
+class SignalGroup;
 }
 
 namespace devices {
@@ -107,6 +112,7 @@ namespace views {
 class ViewBase;
 }
 
+using pv::views::ViewType;
 
 class Session : public QObject
 {
@@ -137,6 +143,9 @@ public:
 	QString name() const;
 	void set_name(QString name);
 
+	QString save_path() const;
+	void set_save_path(QString path);
+
 	const vector< shared_ptr<views::ViewBase> > views() const;
 
 	shared_ptr<views::ViewBase> main_view() const;
@@ -178,8 +187,10 @@ public:
 	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;
 
@@ -188,17 +199,20 @@ public:
 	bool has_view(shared_ptr<views::ViewBase> view);
 
 	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);
+
 	void add_generated_signal(shared_ptr<data::SignalBase> signal);
 	void remove_generated_signal(shared_ptr<data::SignalBase> signal);
 
-	bool all_segments_complete(uint32_t segment_id) const;
-
 #ifdef ENABLE_DECODE
 	shared_ptr<data::DecodeSignal> add_decode_signal();
 
 	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+	bool all_segments_complete(uint32_t segment_id) const;
+
 	MetadataObjManager* metadata_obj_manager();
 
 private:
@@ -252,7 +266,8 @@ Q_SIGNALS:
 
 	void data_received();
 
-	void add_view(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();
@@ -266,7 +281,7 @@ private:
 
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
-	QString default_name_, name_;
+	QString default_name_, name_, save_path_;
 
 	vector< shared_ptr<views::ViewBase> > views_;
 	shared_ptr<pv::views::ViewBase> main_view_;
@@ -278,6 +293,8 @@ private:
 
 	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
 	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
@@ -289,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 +315,7 @@ private:
 	bool frame_began_;
 
 	QElapsedTimer acq_time_;
+	Glib::DateTime acq_start_time_;
 
 	MetadataObjManager metadata_obj_manager_;