X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=0f067a47be1f8e2875467c976cd4424e616c046b;hp=d17c9dc364205344d157e7c271601cb5c6e9c5a7;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hpb=78b0af3ebcbeab50e1c1634af729c0a7f97fb435

diff --git a/pv/session.hpp b/pv/session.hpp
index d17c9dc3..0f067a47 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SIGSESSION_HPP
-#define PULSEVIEW_PV_SIGSESSION_HPP
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP
 
 #include <map>
 #include <memory>
@@ -31,15 +30,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;
 
@@ -47,8 +50,10 @@ namespace sigrok {
 class Analog;
 class Channel;
 class Device;
+class InputFormat;
 class Logic;
 class Meta;
+class OutputFormat;
 class Packet;
 class Session;
 }
@@ -62,13 +67,20 @@ class Analog;
 class AnalogSegment;
 class Logic;
 class LogicSegment;
+class SignalBase;
 class SignalData;
 }
 
-namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+namespace devices {
+class Device;
+}
+
+namespace toolbars {
+class MainBar;
+}
+
+namespace views {
+class ViewBase;
 }
 
 class Session : public QObject
@@ -83,7 +95,7 @@ public:
 	};
 
 public:
-	Session(DeviceManager &device_manager);
+	Session(DeviceManager &device_manager, QString name);
 
 	~Session();
 
@@ -91,63 +103,90 @@ public:
 
 	const DeviceManager& device_manager() const;
 
-	const std::shared_ptr<sigrok::Session>& session() const;
+	std::shared_ptr<sigrok::Session> session() const;
+
+	std::shared_ptr<devices::Device> device() const;
+
+	QString name() const;
+
+	void set_name(QString name);
 
-	std::shared_ptr<sigrok::Device> device() const;
+	const std::list< std::shared_ptr<views::ViewBase> > views() const;
+
+	std::shared_ptr<views::ViewBase> main_view() const;
+
+	std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
+
+	void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
 
 	/**
-	 * Sets device instance that will be used in the next capture session.
+	 * Indicates whether the captured data was saved to disk already or not
 	 */
-	void set_device(std::shared_ptr<sigrok::Device> device);
+	bool data_saved() const;
+
+	void save_settings(QSettings &settings) const;
+
+	void restore_settings(QSettings &settings);
 
 	/**
-	 * Sets a sigrok session file as the capture device.
-	 * @param name the path to the file.
+	 * Attempts to set device instance, may fall back to demo if needed
 	 */
-	void set_session_file(const std::string &name);
+	void select_device(std::shared_ptr<devices::Device> device);
+
+	/**
+	 * Sets device instance that will be used in the next capture session.
+	 */
+	void set_device(std::shared_ptr<devices::Device> device);
 
 	void set_default_device();
 
+	void load_init_file(const std::string &file_name,
+		const std::string &format);
+
+	void load_file(QString file_name,
+		std::shared_ptr<sigrok::InputFormat> format = nullptr,
+		const std::map<std::string, Glib::VariantBase> &options =
+			std::map<std::string, Glib::VariantBase>());
+
 	capture_state get_capture_state() const;
 
 	void start_capture(std::function<void (const QString)> error_handler);
 
 	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:
 	void set_capture_state(capture_state state);
 
-	void update_signals(std::shared_ptr<sigrok::Device> device);
+	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>);
-
 private:
-	void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
-		std::function<void (const QString)> error_handler);
+	void sample_thread_proc(std::function<void (const QString)> error_handler);
 
-	void feed_in_header(std::shared_ptr<sigrok::Device> device);
+	void feed_in_header();
 
-	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
-		std::shared_ptr<sigrok::Meta> meta);
+	void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
+
+	void feed_in_trigger();
 
 	void feed_in_frame_begin();
 
@@ -160,22 +199,21 @@ private:
 
 private:
 	DeviceManager &device_manager_;
-	std::shared_ptr<sigrok::Session> session_;
+	std::shared_ptr<devices::Device> device_;
+	QString default_name_, name_;
 
-	/**
-	 * The device instance that will be used in the next capture session.
-	 */
-	std::shared_ptr<sigrok::Device> device_;
+	std::list< std::shared_ptr<views::ViewBase> > views_;
+	std::shared_ptr<pv::views::ViewBase> main_view_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
+	std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
-	mutable std::mutex sampling_mutex_;
+	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_;
@@ -184,19 +222,32 @@ private:
 
 	std::thread sampling_thread_;
 
+	bool out_of_memory_;
+	bool data_saved_;
+
 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);
+
+public Q_SLOTS:
+	void on_data_saved();
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_HPP
+#endif // PULSEVIEW_PV_SESSION_HPP