X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=eff962311cc549434e51dc48db45f6bda704c5bc;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hp=0c7b0463661d3019943859883bff3b14987962e4;hpb=baf867eddd4efbc465f5a3490b1ea21dfe7ba597;p=pulseview.git

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index 0c7b0463..eff96231 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 {
 
@@ -54,7 +55,8 @@ namespace views {
 enum ViewType {
 	ViewTypeTrace,
 #ifdef ENABLE_DECODE
-	ViewTypeDecoderOutput,
+	ViewTypeDecoderBinary,
+	ViewTypeTabularDecoder,
 #endif
 	ViewTypeCount  // Indicates how many view types there are, must always be last
 };
@@ -65,11 +67,14 @@ 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
@@ -80,16 +85,15 @@ public:
 	Session& session();
 	const Session& session() const;
 
-	virtual void clear_signals();
-
 	/**
 	 * 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();
 
 	virtual void add_signalbase(const shared_ptr<data::SignalBase> signalbase);
+	virtual void remove_signalbase(const shared_ptr<data::SignalBase> signalbase);
 
 #ifdef ENABLE_DECODE
 	virtual void clear_decode_signals();
@@ -100,9 +104,10 @@ 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(int segment_id, util::Timestamp location);
 	virtual void signals_changed();
@@ -124,7 +129,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_;