X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=19860b6b5ad3c26ce04a2a2a52935d3aed535f65;hp=a4fc352d1969fd527951820bbf75e37f8b2b991c;hb=33e1afbe17cfa91c24adb775aba923f07fbeed01;hpb=bb7dd726eb7159ddd80d94ede791f2e2a9eaef0f

diff --git a/pv/session.hpp b/pv/session.hpp
index a4fc352d..19860b6b 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -38,9 +38,11 @@
 #include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
+#include <QSettings>
 #include <QString>
 
 #include "util.hpp"
+#include "view/viewwidget.hpp"
 
 struct srd_decoder;
 struct srd_channel;
@@ -72,6 +74,10 @@ namespace devices {
 class Device;
 }
 
+namespace toolbars {
+class MainBar;
+}
+
 namespace view {
 class View;
 }
@@ -88,7 +94,7 @@ public:
 	};
 
 public:
-	Session(DeviceManager &device_manager);
+	Session(DeviceManager &device_manager, QString name);
 
 	~Session();
 
@@ -100,6 +106,22 @@ public:
 
 	std::shared_ptr<devices::Device> device() const;
 
+	QString name() const;
+
+	void set_name(QString name);
+
+	const std::list< std::shared_ptr<pv::view::View> > views() const;
+
+	std::shared_ptr<pv::view::View> main_view() const;
+
+	void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+
+	std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
+
+	void save_settings(QSettings &settings) const;
+
+	void restore_settings(QSettings &settings);
+
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
@@ -119,6 +141,8 @@ public:
 
 	void deregister_view(std::shared_ptr<pv::view::View> view);
 
+	bool has_view(std::shared_ptr<pv::view::View> view);
+
 	const std::unordered_set< std::shared_ptr<data::SignalBase> >
 		signalbases() const;
 
@@ -157,13 +181,16 @@ private:
 private:
 	DeviceManager &device_manager_;
 	std::shared_ptr<devices::Device> device_;
+	QString default_name_, name_;
+
+	std::list< std::shared_ptr<pv::view::View> > views_;
+	std::shared_ptr<pv::view::View> main_view_;
 
-	std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+	std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
 	mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
 	capture_state capture_state_;
 
-
 	std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
 	std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
 
@@ -180,10 +207,12 @@ private:
 
 Q_SIGNALS:
 	void capture_state_changed(int state);
-	void device_selected();
+	void device_changed();
 
 	void signals_changed();
 
+	void name_changed();
+
 	void trigger_event(util::Timestamp location);
 
 	void frame_began();
@@ -191,6 +220,9 @@ Q_SIGNALS:
 	void data_received();
 
 	void frame_ended();
+
+	void add_view(const QString &title, view::ViewType type,
+		Session *session);
 };
 
 } // namespace pv