X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=95a50c21c73a098e4ab89f1e3060843d90d1e071;hp=f0b4c1624b88d29a249c011e38e8f063651f2744;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=ffe001198ecb5ea2e44c2947868c258afe948f20

diff --git a/pv/session.hpp b/pv/session.hpp
index f0b4c162..95a50c21 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,15 +31,19 @@
 #include <vector>
 
 #ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
+#include <QSettings>
 #include <QString>
 
+#include "util.hpp"
+#include "views/viewbase.hpp"
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -62,6 +66,7 @@ class Analog;
 class AnalogSegment;
 class Logic;
 class LogicSegment;
+class SignalBase;
 class SignalData;
 }
 
@@ -69,10 +74,12 @@ namespace devices {
 class Device;
 }
 
-namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+namespace toolbars {
+class MainBar;
+}
+
+namespace views {
+class ViewBase;
 }
 
 class Session : public QObject
@@ -87,7 +94,7 @@ public:
 	};
 
 public:
-	Session(DeviceManager &device_manager);
+	Session(DeviceManager &device_manager, QString name);
 
 	~Session();
 
@@ -99,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<views::ViewBase> > views() const;
+
+	std::shared_ptr<views::ViewBase> 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.
 	 */
@@ -112,20 +135,21 @@ public:
 
 	void stop_capture();
 
-	std::set< std::shared_ptr<data::SignalData> > get_data() const;
+	double get_samplerate() const;
 
-	boost::shared_mutex& signals_mutex() const;
+	void register_view(std::shared_ptr<views::ViewBase> view);
 
-	const std::unordered_set< std::shared_ptr<view::Signal> >&
-		signals() const;
+	void deregister_view(std::shared_ptr<views::ViewBase> view);
+
+	bool has_view(std::shared_ptr<views::ViewBase> 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:
@@ -133,19 +157,18 @@ private:
 
 	void update_signals();
 
-	std::shared_ptr<view::Signal> signal_from_channel(
+	std::shared_ptr<data::SignalBase> signalbase_from_channel(
 		std::shared_ptr<sigrok::Channel> channel) const;
 
-	void read_sample_rate(std::shared_ptr<sigrok::Device> device);
-
 private:
-	void sample_thread_proc(std::shared_ptr<devices::Device> device,
-		std::function<void (const QString)> error_handler);
+	void sample_thread_proc(std::function<void (const QString)> error_handler);
 
 	void feed_in_header();
 
 	void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
 
+	void feed_in_trigger();
+
 	void feed_in_frame_begin();
 
 	void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
@@ -158,16 +181,20 @@ private:
 private:
 	DeviceManager &device_manager_;
 	std::shared_ptr<devices::Device> device_;
+	QString default_name_, name_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
+	std::list< std::shared_ptr<views::ViewBase> > views_;
+	std::shared_ptr<pv::views::ViewBase> main_view_;
 
-	mutable std::mutex sampling_mutex_;
+	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::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+	std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
 
-	mutable std::mutex data_mutex_;
+	mutable std::recursive_mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;
 	uint64_t cur_samplerate_;
 	std::shared_ptr<data::LogicSegment> cur_logic_segment_;
@@ -176,17 +203,26 @@ private:
 
 	std::thread sampling_thread_;
 
+	bool out_of_memory_;
+
 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();
 
 	void data_received();
 
 	void frame_ended();
+
+	void add_view(const QString &title, views::ViewType type,
+		Session *session);
 };
 
 } // namespace pv