X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=2ee31cfee5afb8ef6de44171322d1d20086e755a;hp=ac3d654c63f06a4d70cd82db368bf16383c41453;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=8f6b98ff56c68f59c177f4dd662160bc48e1693f

diff --git a/pv/session.hpp b/pv/session.hpp
index ac3d654c..2ee31cfe 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -14,13 +14,13 @@
  * 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_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -30,17 +30,21 @@
 #include <unordered_set>
 #include <vector>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/shared_mutex.hpp>
-
 #include <QObject>
+#include <QSettings>
 #include <QString>
 
 #include "util.hpp"
+#include "views/viewbase.hpp"
+
+using std::function;
+using std::list;
+using std::map;
+using std::mutex;
+using std::recursive_mutex;
+using std::shared_ptr;
+using std::string;
+using std::unordered_set;
 
 struct srd_decoder;
 struct srd_channel;
@@ -49,11 +53,16 @@ namespace sigrok {
 class Analog;
 class Channel;
 class Device;
+class InputFormat;
 class Logic;
 class Meta;
+class Option;
+class OutputFormat;
 class Packet;
 class Session;
-}
+}  // namespace sigrok
+
+using sigrok::Option;
 
 namespace pv {
 
@@ -62,8 +71,10 @@ class DeviceManager;
 namespace data {
 class Analog;
 class AnalogSegment;
+class DecodeSignal;
 class Logic;
 class LogicSegment;
+class SignalBase;
 class SignalData;
 }
 
@@ -71,10 +82,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
@@ -88,8 +101,10 @@ public:
 		Running
 	};
 
+	static shared_ptr<sigrok::Context> sr_context;
+
 public:
-	Session(DeviceManager &device_manager);
+	Session(DeviceManager &device_manager, QString name);
 
 	~Session();
 
@@ -97,37 +112,76 @@ public:
 
 	const DeviceManager& device_manager() const;
 
-	std::shared_ptr<sigrok::Session> session() const;
+	shared_ptr<sigrok::Session> session() const;
+
+	shared_ptr<devices::Device> device() const;
+
+	QString name() const;
+
+	void set_name(QString name);
+
+	const list< shared_ptr<views::ViewBase> > views() const;
+
+	shared_ptr<views::ViewBase> main_view() const;
+
+	shared_ptr<pv::toolbars::MainBar> main_bar() const;
+
+	void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
 
-	std::shared_ptr<devices::Device> device() const;
+	/**
+	 * Indicates whether the captured data was saved to disk already or not
+	 */
+	bool data_saved() const;
+
+	void save_settings(QSettings &settings) const;
+
+	void restore_settings(QSettings &settings);
+
+	/**
+	 * Attempts to set device instance, may fall back to demo if needed
+	 */
+	void select_device(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_device(shared_ptr<devices::Device> device);
 
 	void set_default_device();
 
+	void load_init_file(const string &file_name, const string &format);
+
+	void load_file(QString file_name,
+		shared_ptr<sigrok::InputFormat> format = nullptr,
+		const map<string, Glib::VariantBase> &options =
+			map<string, Glib::VariantBase>());
+
 	capture_state get_capture_state() const;
 
-	void start_capture(std::function<void (const QString)> error_handler);
+	void start_capture(function<void (const QString)> error_handler);
 
 	void stop_capture();
 
-	std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
 	double get_samplerate() const;
 
-	const std::unordered_set< std::shared_ptr<view::Signal> >
-		signals() const;
+	uint32_t get_segment_count() const;
 
-#ifdef ENABLE_DECODE
-	bool add_decoder(srd_decoder *const dec);
+	vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
+
+	void register_view(shared_ptr<views::ViewBase> view);
+
+	void deregister_view(shared_ptr<views::ViewBase> view);
+
+	bool has_view(shared_ptr<views::ViewBase> view);
+
+	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> >
-		get_decode_signals() const;
+	bool all_segments_complete(uint32_t segment_id) const;
 
-	void remove_decode_signal(view::DecodeTrace *signal);
+#ifdef ENABLE_DECODE
+	shared_ptr<data::DecodeSignal> add_decode_signal();
+
+	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
 private:
@@ -135,64 +189,89 @@ private:
 
 	void update_signals();
 
-	std::shared_ptr<view::Signal> signal_from_channel(
-		std::shared_ptr<sigrok::Channel> channel) const;
+	shared_ptr<data::SignalBase> signalbase_from_channel(
+		shared_ptr<sigrok::Channel> channel) const;
 
-private:
-	void sample_thread_proc(std::shared_ptr<devices::Device> device,
-		std::function<void (const QString)> error_handler);
+	static map<string, Glib::VariantBase> input_format_options(
+		vector<string> user_spec,
+		map<string, shared_ptr<Option>> fmt_opts);
+
+	void sample_thread_proc(function<void (const QString)> error_handler);
+
+	void free_unused_memory();
+
+	void signal_new_segment();
+	void signal_segment_completed();
 
 	void feed_in_header();
 
-	void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
+	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
 
 	void feed_in_trigger();
 
 	void feed_in_frame_begin();
+	void feed_in_frame_end();
+
+	void feed_in_logic(shared_ptr<sigrok::Logic> logic);
+
+	void feed_in_analog(shared_ptr<sigrok::Analog> analog);
+
+	void data_feed_in(shared_ptr<sigrok::Device> device,
+		shared_ptr<sigrok::Packet> packet);
+
+Q_SIGNALS:
+	void capture_state_changed(int state);
+	void device_changed();
+
+	void signals_changed();
+
+	void name_changed();
 
-	void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
+	void trigger_event(int segment_id, util::Timestamp location);
 
-	void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
+	void new_segment(int new_segment_id);
+	void segment_completed(int segment_id);
 
-	void data_feed_in(std::shared_ptr<sigrok::Device> device,
-		std::shared_ptr<sigrok::Packet> packet);
+	void data_received();
+
+	void add_view(const QString &title, views::ViewType type,
+		Session *session);
+
+public Q_SLOTS:
+	void on_data_saved();
 
 private:
 	DeviceManager &device_manager_;
-	std::shared_ptr<devices::Device> device_;
+	shared_ptr<devices::Device> device_;
+	QString default_name_, name_;
+
+	list< shared_ptr<views::ViewBase> > views_;
+	shared_ptr<pv::views::ViewBase> main_view_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
+	shared_ptr<pv::toolbars::MainBar> main_bar_;
 
-	mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
+	mutable 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_;
+	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+	unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
 
-	mutable std::recursive_mutex data_mutex_;
-	std::shared_ptr<data::Logic> logic_data_;
+	/// trigger_list_ contains pairs of <segment_id, timestamp> values.
+	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
+
+	mutable recursive_mutex data_mutex_;
+	shared_ptr<data::Logic> logic_data_;
 	uint64_t cur_samplerate_;
-	std::shared_ptr<data::LogicSegment> cur_logic_segment_;
-	std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSegment> >
+	shared_ptr<data::LogicSegment> cur_logic_segment_;
+	map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
 		cur_analog_segments_;
+	int32_t highest_segment_id_;
 
 	std::thread sampling_thread_;
 
 	bool out_of_memory_;
-
-Q_SIGNALS:
-	void capture_state_changed(int state);
-	void device_selected();
-
-	void signals_changed();
-
-	void trigger_event(util::Timestamp location);
-
-	void frame_began();
-
-	void data_received();
-
-	void frame_ended();
+	bool data_saved_;
+	bool frame_began_;
 };
 
 } // namespace pv