X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=d3111dc79cdfbc5929f260d8f0181a2238f592a9;hp=3e180830f897574de522b460cf775f43a264361e;hb=74bf66669012692f7eda790abe724bd5bb4ae8c6;hpb=143d322d0c92ea5c2cc51facc37b68787362c244

diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp
index 3e180830..d3111dc7 100644
--- a/pv/views/viewbase.hpp
+++ b/pv/views/viewbase.hpp
@@ -21,17 +21,25 @@
 #ifndef PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
 #define PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <memory>
-#include <set>
+#include <unordered_set>
 #include <vector>
 
+#include <QMainWindow>
+#include <QTimer>
 #include <QWidget>
 
 #include <pv/data/signalbase.hpp>
 #include <pv/util.hpp>
 
+#ifdef ENABLE_DECODE
+#include <pv/data/decodesignal.hpp>
+#endif
+
+using std::shared_ptr;
+using std::unordered_set;
+
 namespace pv {
 
 class Session;
@@ -43,28 +51,56 @@ 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
 };
 
-class ViewBase : public QWidget {
+extern const char* ViewTypeNames[ViewTypeCount];
+
+class ViewBase : public QWidget
+{
 	Q_OBJECT
 
 public:
-	explicit ViewBase(Session &session, bool is_main_view=false, QWidget *parent = 0);
+	static const int MaxViewAutoUpdateRate;
+
+public:
+	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;
 
 	virtual void clear_signals();
 
+	/**
+	 * Returns the signal bases contained in this view.
+	 */
+	unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+
+	virtual void clear_signalbases();
+
+	virtual void add_signalbase(const shared_ptr<data::SignalBase> signalbase);
+
 #ifdef ENABLE_DECODE
 	virtual void clear_decode_signals();
 
-	virtual void add_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+	virtual void add_decode_signal(shared_ptr<data::DecodeSignal> signal);
 
-	virtual void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+	virtual void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
 	virtual void save_settings(QSettings &settings) const;
@@ -72,10 +108,18 @@ public:
 	virtual void restore_settings(QSettings &settings);
 
 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 data_updated();
+	virtual void on_new_segment(int new_segment_id);
+	virtual void on_segment_completed(int new_segment_id);
+	virtual void perform_delayed_view_update();
+
+private Q_SLOTS:
+	void on_samples_added(uint64_t segment_id, uint64_t start_sample,
+		uint64_t end_sample);
+
+	void on_data_updated();
 
 protected:
 	Session &session_;
@@ -83,6 +127,16 @@ protected:
 	const bool is_main_view_;
 
 	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_;
+
+	QTimer delayed_view_updater_;
 };
 
 } // namespace views