X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=a4aaf6aabbcc8c94bf32e446375e8b9218a36b26;hp=3bb10e25731f5168a826c06497c0af84842d146e;hb=HEAD;hpb=4b5537c576c37884c2a0254985893e20ea5338e6

diff --git a/pv/session.hpp b/pv/session.hpp
index 3bb10e2..a4aaf6a 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -14,38 +14,74 @@
  * 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_H
-#define PULSEVIEW_PV_SIGSESSION_H
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP
 
+#ifdef ENABLE_FLOW
+#include <atomic>
+#include <condition_variable>
+#endif
+
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <set>
 #include <string>
 #include <thread>
+#include <unordered_set>
 #include <vector>
 
-#include <boost/thread.hpp>
-
 #include <QObject>
+#include <QSettings>
 #include <QString>
+#include <QElapsedTimer>
+
+#ifdef ENABLE_FLOW
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
+
+#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;
+
+#ifdef ENABLE_FLOW
+using Glib::RefPtr;
+using Gst::AppSink;
+using Gst::Element;
+using Gst::Pipeline;
+#endif
 
 struct srd_decoder;
 struct srd_channel;
 
 namespace sigrok {
-	class Analog;
-	class Channel;
-	class Device;
-	class Logic;
-	class Meta;
-	class Packet;
-	class Session;
-}
+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 {
 
@@ -54,15 +90,23 @@ class DeviceManager;
 namespace data {
 class Analog;
 class AnalogSegment;
+class DecodeSignal;
 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
@@ -76,8 +120,10 @@ public:
 		Running
 	};
 
+	static shared_ptr<sigrok::Context> sr_context;
+
 public:
-	Session(DeviceManager &device_manager);
+	Session(DeviceManager &device_manager, QString name);
 
 	~Session();
 
@@ -85,111 +131,195 @@ public:
 
 	const DeviceManager& device_manager() const;
 
-	const std::shared_ptr<sigrok::Session>& session() const;
+	shared_ptr<sigrok::Session> session() const;
 
-	std::shared_ptr<sigrok::Device> device() 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);
 
 	/**
-	 * Sets device instance that will be used in the next capture session.
+	 * Indicates whether the captured data was saved to disk already or not
+	 */
+	bool data_saved() const;
+
+	void save_setup(QSettings &settings) const;
+
+	void save_settings(QSettings &settings) const;
+
+	void restore_setup(QSettings &settings);
+
+	void restore_settings(QSettings &settings);
+
+	/**
+	 * Attempts to set device instance, may fall back to demo if needed
 	 */
-	void set_device(std::shared_ptr<sigrok::Device> device);
+	void select_device(shared_ptr<devices::Device> device);
 
 	/**
-	 * Sets a sigrok session file as the capture device.
-	 * @param name the path to the file.
+	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_session_file(const std::string &name);
+	void set_device(shared_ptr<devices::Device> device);
 
 	void set_default_device();
 
+	void load_init_file(const string &file_name, const string &format,
+		const string &setup_file_name);
+
+	void load_file(QString file_name, QString setup_file_name = QString(),
+		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;
 
-	boost::shared_mutex& signals_mutex() const;
+	uint32_t get_segment_count() const;
 
-	const std::vector< std::shared_ptr<view::Signal> >& signals() const;
+	vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
 
-#ifdef ENABLE_DECODE
-	bool add_decoder(srd_decoder *const dec);
+	void register_view(shared_ptr<views::ViewBase> view);
 
-	std::vector< std::shared_ptr<view::DecodeTrace> >
-		get_decode_signals() const;
+	void deregister_view(shared_ptr<views::ViewBase> view);
 
-	void remove_decode_signal(view::DecodeTrace *signal);
+	bool has_view(shared_ptr<views::ViewBase> view);
+
+	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+
+	bool all_segments_complete(uint32_t segment_id) const;
+
+#ifdef ENABLE_DECODE
+	shared_ptr<data::DecodeSignal> add_decode_signal();
+
+	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #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<sigrok::Channel> channel) const;
+	shared_ptr<data::SignalBase> signalbase_from_channel(
+		shared_ptr<sigrok::Channel> channel) const;
 
-	void read_sample_rate(std::shared_ptr<sigrok::Device>);
+	static map<string, Glib::VariantBase> input_format_options(
+		vector<string> user_spec,
+		map<string, shared_ptr<Option>> fmt_opts);
 
-private:
-	void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
-		std::function<void (const QString)> error_handler);
+	void sample_thread_proc(function<void (const QString)> error_handler);
+
+	void free_unused_memory();
+
+	void signal_new_segment();
+	void signal_segment_completed();
+
+#ifdef ENABLE_FLOW
+	bool on_gst_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message);
 
-	void feed_in_header(std::shared_ptr<sigrok::Device> device);
+	Gst::FlowReturn on_gst_new_sample();
+#endif
+
+	void feed_in_header();
+
+	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
 
-	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
-		std::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 feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
+	void signals_changed();
+
+	void name_changed();
+
+	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_received();
 
-	void data_feed_in(std::shared_ptr<sigrok::Device> device,
-		std::shared_ptr<sigrok::Packet> packet);
+	void add_view(const QString &title, views::ViewType type,
+		Session *session);
+
+public Q_SLOTS:
+	void on_data_saved();
+
+#ifdef ENABLE_DECODE
+	void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
 
 private:
 	DeviceManager &device_manager_;
-	std::shared_ptr<sigrok::Session> session_;
+	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_;
+	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_;
+	mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
 	capture_state capture_state_;
 
-	mutable boost::shared_mutex signals_mutex_;
-	std::vector< std::shared_ptr<view::Signal> > signals_;
+	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+	unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+
+	/// trigger_list_ contains pairs of <segment_id, timestamp> values.
+	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
 
-	mutable std::mutex data_mutex_;
-	std::shared_ptr<data::Logic> logic_data_;
+	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_;
 
-Q_SIGNALS:
-	void capture_state_changed(int state);
-	void device_selected();
+	bool out_of_memory_;
+	bool data_saved_;
+	bool frame_began_;
 
-	void signals_changed();
-
-	void frame_began();
+	QElapsedTimer acq_time_;
 
-	void data_received();
+#ifdef ENABLE_FLOW
+	RefPtr<Pipeline> pipeline_;
+	RefPtr<Element> source_;
+	RefPtr<AppSink> sink_;
 
-	void frame_ended();
+	mutable mutex pipeline_done_mutex_;
+	mutable condition_variable pipeline_done_cond_;
+	atomic<bool> pipeline_done_interrupt_;
+#endif
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_H
+#endif // PULSEVIEW_PV_SESSION_HPP