X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=258addb9a72de29108c63a94f9afd3dec3deaaa5;hb=101e7a9b40cc97fcd94aca7a1bed086b1f56f269;hp=4c6c73e37483e60f3b72ace3fd68b6a26befd8e0;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 4c6c73e..258addb 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -38,6 +38,7 @@
 #include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
+#include <QSettings>
 #include <QString>
 
 #include "util.hpp"
@@ -72,10 +73,12 @@ namespace devices {
 class Device;
 }
 
+namespace toolbars {
+class MainBar;
+}
+
 namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
 }
 
 class Session : public QObject
@@ -90,7 +93,7 @@ public:
 	};
 
 public:
-	Session(DeviceManager &device_manager);
+	Session(DeviceManager &device_manager, QString name);
 
 	~Session();
 
@@ -102,6 +105,20 @@ public:
 
 	std::shared_ptr<devices::Device> device() const;
 
+	QString name() const;
+
+	void set_name(QString name);
+
+	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.
 	 */
@@ -117,16 +134,19 @@ public:
 
 	double get_samplerate() const;
 
-	const std::unordered_set< std::shared_ptr<view::Signal> >
-		signals() const;
+	void register_view(std::shared_ptr<pv::view::View> view);
+
+	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;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
 
-	std::vector< std::shared_ptr<view::DecodeTrace> >
-		get_decode_signals() const;
-
-	void remove_decode_signal(view::DecodeTrace *signal);
+	void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
 #endif
 
 private:
@@ -134,7 +154,7 @@ private:
 
 	void update_signals();
 
-	std::shared_ptr<data::SignalBase> signal_from_channel(
+	std::shared_ptr<data::SignalBase> signalbase_from_channel(
 		std::shared_ptr<sigrok::Channel> channel) const;
 
 private:
@@ -158,17 +178,18 @@ private:
 private:
 	DeviceManager &device_manager_;
 	std::shared_ptr<devices::Device> device_;
+	QString default_name_, name_;
+
+	std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+	std::shared_ptr<pv::view::View> main_view_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
+	std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
 	mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
 	capture_state capture_state_;
 
-	mutable boost::shared_mutex signals_mutex_;
-	std::unordered_set< std::shared_ptr<view::Signal> > signals_;
-
-	std::set< std::shared_ptr<data::SignalBase> > signalbases_;
-	std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
+	std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+	std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
 
 	mutable std::recursive_mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;
@@ -187,6 +208,8 @@ Q_SIGNALS:
 
 	void signals_changed();
 
+	void name_changed();
+
 	void trigger_event(util::Timestamp location);
 
 	void frame_began();