X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=73d7a179c5a4e78fa446b1ec8a040fed98e6820b;hb=8e168b23846653c087e46b6a63feffac48512ddb;hp=c8f72ab7a3caf9e6005379bd253e779974c5b73a;hpb=8c3397413149b87d2755494fe73186f27edab369;p=pulseview.git

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index c8f72ab7..73d7a179 100644
--- a/pv/views/viewbase.hpp
+++ b/pv/views/viewbase.hpp
@@ -26,6 +26,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include <QMainWindow>
 #include <QTimer>
 #include <QWidget>
 
@@ -37,7 +38,7 @@
 #endif
 
 using std::shared_ptr;
-using std::unordered_set;
+using std::vector;
 
 namespace pv {
 
@@ -50,20 +51,36 @@ class Signal;
 
 namespace views {
 
+// When adding an entry here, don't forget to update ViewTypeNames as well
 enum ViewType {
 	ViewTypeTrace,
-	ViewTypeTabularDecode
+#ifdef ENABLE_DECODE
+	ViewTypeDecoderBinary,
+	ViewTypeTabularDecoder,
+#endif
+	ViewTypeCount  // Indicates how many view types there are, must always be last
 };
 
+extern const char* ViewTypeNames[ViewTypeCount];
+
 class ViewBase : public QWidget
 {
 	Q_OBJECT
 
-private:
+public:
 	static const int MaxViewAutoUpdateRate;
 
 public:
-	explicit ViewBase(Session &session, bool is_main_view = false, QWidget *parent = nullptr);
+	explicit ViewBase(Session &session, bool is_main_view = false, QMainWindow *parent = nullptr);
+
+	virtual ViewType get_type() const = 0;
+	bool is_main_view() const;
+
+	/**
+	 * Resets the view to its default state after construction. It does however
+	 * not reset the signal bases or any other connections with the session.
+	 */
+	virtual void reset_view_state();
 
 	Session& session();
 	const Session& session() const;
@@ -73,7 +90,7 @@ public:
 	/**
 	 * Returns the signal bases contained in this view.
 	 */
-	unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+	vector< shared_ptr<data::SignalBase> > signalbases() const;
 
 	virtual void clear_signalbases();
 
@@ -88,11 +105,12 @@ public:
 #endif
 
 	virtual void save_settings(QSettings &settings) const;
-
 	virtual void restore_settings(QSettings &settings);
 
+	virtual void focus_on_range(uint64_t start_sample, uint64_t end_sample);
+
 public Q_SLOTS:
-	virtual void trigger_event(util::Timestamp location);
+	virtual void trigger_event(int segment_id, util::Timestamp location);
 	virtual void signals_changed();
 	virtual void capture_state_updated(int state);
 	virtual void on_new_segment(int new_segment_id);
@@ -100,7 +118,7 @@ public Q_SLOTS:
 	virtual void perform_delayed_view_update();
 
 private Q_SLOTS:
-	void on_samples_added(QObject* segment, uint64_t start_sample,
+	void on_samples_added(uint64_t segment_id, uint64_t start_sample,
 		uint64_t end_sample);
 
 	void on_data_updated();
@@ -112,7 +130,10 @@ protected:
 
 	util::TimeUnit time_unit_;
 
-	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+	vector< shared_ptr<data::SignalBase> > signalbases_;
+#ifdef ENABLE_DECODE
+	vector< shared_ptr<data::DecodeSignal> > decode_signals_;
+#endif
 
 	/// The ID of the currently displayed segment
 	uint32_t current_segment_;