X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=e3a3c6a404925ee6d03f4a10fba7d89b89fb71b0;hb=88a2597864920ecdbe66cf0cd4b8172bdabb2263;hp=b524c1797d0d1478ba4bd1eac36ee538a400d69a;hpb=5a20644617a727e5893cd1df3f105135c1ebdedd;p=pulseview.git

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index b524c179..e3a3c6a4 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,30 @@ 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
@@ -79,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();
 
@@ -116,10 +127,12 @@ protected:
 
 	const bool is_main_view_;
 
-	util::Timestamp ruler_shift_;
 	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_;