X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=d3111dc79cdfbc5929f260d8f0181a2238f592a9;hb=38b77a3ba1738aebf516491cc95e25219938a877;hp=5d7d2adbb181a7cdaca7913404ea3ab3f07fa75e;hpb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;p=pulseview.git

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index 5d7d2adb..d3111dc7 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>
 
@@ -50,20 +51,35 @@ class Signal;
 
 namespace views {
 
+// When adding an entry here, don't forget to update ViewTypeNames as well
 enum ViewType {
 	ViewTypeTrace,
-	ViewTypeTabularDecode
+#ifdef ENABLE_DECODE
+	ViewTypeDecoderOutput,
+#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;
@@ -100,7 +116,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();
@@ -110,10 +126,12 @@ protected:
 
 	const bool is_main_view_;
 
-	util::Timestamp ruler_shift_;
 	util::TimeUnit time_unit_;
 
 	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+#ifdef ENABLE_DECODE
+	unordered_set< shared_ptr<data::DecodeSignal> > decode_signals_;
+#endif
 
 	/// The ID of the currently displayed segment
 	uint32_t current_segment_;