X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=c463ecc2d1a8dc16792a2c25a58f45836b8caaf7;hp=30fd7cec7a59fddcf80ae729614cbe4f67161a9d;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=4e86ec7042631d4b54876cba89c01a73abaf7213

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index 30fd7cec..c463ecc2 100644
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -26,6 +26,7 @@
 
 #include "pv/session.hpp"
 #include "pv/util.hpp"
+#include "pv/data/segment.hpp"
 
 using std::shared_ptr;
 
@@ -35,6 +36,7 @@ namespace views {
 const int ViewBase::MaxViewAutoUpdateRate = 25; // No more than 25 Hz
 
 ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
+	// Note: Place defaults in ViewBase::reset_view_state(), not here
 	session_(session),
 	is_main_view_(is_main_view)
 {
@@ -53,6 +55,12 @@ ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
 	delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
 }
 
+void ViewBase::reset_view_state()
+{
+	ruler_shift_ = 0;
+	current_segment_ = 0;
+}
+
 Session& ViewBase::session()
 {
 	return session_;
@@ -77,8 +85,8 @@ void ViewBase::clear_signalbases()
 	for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
 		disconnect(signalbase.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_data_updated()));
-		disconnect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-			this, SLOT(on_data_updated()));
+		disconnect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+			this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t)));
 	}
 
 	signalbases_.clear();
@@ -90,8 +98,8 @@ void ViewBase::add_signalbase(const shared_ptr<data::SignalBase> signalbase)
 
 	connect(signalbase.get(), SIGNAL(samples_cleared()),
 		this, SLOT(on_data_updated()));
-	connect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-		this, SLOT(on_data_updated()));
+	connect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+		this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t)));
 }
 
 #ifdef ENABLE_DECODE
@@ -120,8 +128,9 @@ void ViewBase::restore_settings(QSettings &settings)
 	(void)settings;
 }
 
-void ViewBase::trigger_event(util::Timestamp location)
+void ViewBase::trigger_event(int segment_id, util::Timestamp location)
 {
+	(void)segment_id;
 	(void)location;
 }
 
@@ -134,6 +143,11 @@ void ViewBase::on_new_segment(int new_segment_id)
 	(void)new_segment_id;
 }
 
+void ViewBase::on_segment_completed(int new_segment_id)
+{
+	(void)new_segment_id;
+}
+
 void ViewBase::capture_state_updated(int state)
 {
 	(void)state;
@@ -143,6 +157,19 @@ void ViewBase::perform_delayed_view_update()
 {
 }
 
+void ViewBase::on_samples_added(uint64_t segment_id, uint64_t start_sample,
+	uint64_t end_sample)
+{
+	(void)start_sample;
+	(void)end_sample;
+
+	if (segment_id != current_segment_)
+		return;
+
+	if (!delayed_view_updater_.isActive())
+		delayed_view_updater_.start();
+}
+
 void ViewBase::on_data_updated()
 {
 	if (!delayed_view_updater_.isActive())