X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=f2a3335e6990fe4363996606cf87e70846d0cbba;hp=79277b4e17074708b0f1e3718ef6eeb4996d2c93;hb=d01fcb19af6b6c9dd3c6c568e4be71a3cedc8003;hpb=e23567ed84aa55e2a0c48252080058186f6b80e7

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 79277b4e..f2a3335e 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -362,12 +362,6 @@ void View::save_settings(QSettings &settings) const
 	settings.setValue("splitter_state", splitter_->saveState());
 	settings.setValue("segment_display_mode", segment_display_mode_);
 
-	{
-		stringstream ss;
-		boost::archive::text_oarchive oa(ss);
-		oa << boost::serialization::make_nvp("ruler_shift", ruler_shift_);
-		settings.setValue("ruler_shift", QString::fromStdString(ss.str()));
-	}
 	{
 		stringstream ss;
 		boost::archive::text_oarchive oa(ss);
@@ -390,20 +384,6 @@ void View::restore_settings(QSettings &settings)
 	if (settings.contains("scale"))
 		set_scale(settings.value("scale").toDouble());
 
-	if (settings.contains("ruler_shift")) {
-		util::Timestamp shift;
-		stringstream ss;
-		ss << settings.value("ruler_shift").toString().toStdString();
-
-		try {
-			boost::archive::text_iarchive ia(ss);
-			ia >> boost::serialization::make_nvp("ruler_shift", shift);
-			ruler_shift_ = shift;
-		} catch (boost::archive::archive_exception&) {
-			qDebug() << "Could not restore the view ruler shift";
-		}
-	}
-
 	if (settings.contains("offset")) {
 		util::Timestamp offset;
 		stringstream ss;
@@ -480,7 +460,7 @@ void View::set_offset(const pv::util::Timestamp& offset, bool force_update)
 {
 	if ((offset_ != offset) || force_update) {
 		offset_ = offset;
-		ruler_offset_ = offset_ + ruler_shift_;
+		ruler_offset_ = offset_ + zero_offset_;
 		offset_changed();
 	}
 }
@@ -497,10 +477,7 @@ const Timestamp& View::ruler_offset() const
 
 void View::set_zero_position(const pv::util::Timestamp& position)
 {
-	// ruler shift is a negative offset and the new zero position is relative
-	// to the current offset. Hence, we adjust the ruler shift only by the
-	// difference.
-	ruler_shift_ = -(position + (-ruler_shift_));
+	zero_offset_ = -position;
 
 	// Force an immediate update of the offsets
 	set_offset(offset_, true);
@@ -509,13 +486,18 @@ void View::set_zero_position(const pv::util::Timestamp& position)
 
 void View::reset_zero_position()
 {
-	ruler_shift_ = 0;
+	zero_offset_ = 0;
 
 	// Force an immediate update of the offsets
 	set_offset(offset_, true);
 	ruler_->update();
 }
 
+pv::util::Timestamp View::zero_offset() const
+{
+	return zero_offset_;
+}
+
 int View::owner_visual_v_offset() const
 {
 	return -scrollarea_->verticalScrollBar()->sliderPosition();
@@ -528,6 +510,18 @@ void View::set_v_offset(int offset)
 	viewport_->update();
 }
 
+void View::set_h_offset(int offset)
+{
+	scrollarea_->horizontalScrollBar()->setSliderPosition(offset);
+	header_->update();
+	viewport_->update();
+}
+
+int View::get_h_scrollbar_maximum() const
+{
+	return scrollarea_->horizontalScrollBar()->maximum();
+}
+
 unsigned int View::depth() const
 {
 	return 0;
@@ -813,22 +807,36 @@ bool View::cursors_shown() const
 
 void View::show_cursors(bool show)
 {
-	show_cursors_ = show;
-	cursor_state_changed(show);
+	if (show_cursors_ != show) {
+		show_cursors_ = show;
+
+		cursor_state_changed(show);
+		ruler_->update();
+		viewport_->update();
+	}
+}
+
+void View::set_cursors(pv::util::Timestamp& first, pv::util::Timestamp& second)
+{
+	assert(cursors_);
+
+	cursors_->first()->set_time(first);
+	cursors_->second()->set_time(second);
+
 	ruler_->update();
 	viewport_->update();
 }
 
 void View::centre_cursors()
 {
-	if (cursors_) {
-		const double time_width = scale_ * viewport_->width();
-		cursors_->first()->set_time(offset_ + time_width * 0.4);
-		cursors_->second()->set_time(offset_ + time_width * 0.6);
+	assert(cursors_);
 
-		ruler_->update();
-		viewport_->update();
-	}
+	const double time_width = scale_ * viewport_->width();
+	cursors_->first()->set_time(offset_ + time_width * 0.4);
+	cursors_->second()->set_time(offset_ + time_width * 0.6);
+
+	ruler_->update();
+	viewport_->update();
 }
 
 shared_ptr<CursorPair> View::cursors() const
@@ -836,15 +844,17 @@ shared_ptr<CursorPair> View::cursors() const
 	return cursors_;
 }
 
-void View::add_flag(const Timestamp& time)
+shared_ptr<Flag> View::add_flag(const Timestamp& time)
 {
-	flags_.push_back(make_shared<Flag>(*this, time,
-		QString("%1").arg(next_flag_text_)));
+	shared_ptr<Flag> flag =
+		make_shared<Flag>(*this, time, QString("%1").arg(next_flag_text_));
+	flags_.push_back(flag);
 
 	next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
 		(next_flag_text_ + 1);
 
 	time_item_appearance_changed(true, true);
+	return flag;
 }
 
 void View::remove_flag(shared_ptr<Flag> flag)
@@ -1699,6 +1709,7 @@ void View::capture_state_updated(int state)
 		set_time_unit(util::TimeUnit::Samples);
 
 		trigger_markers_.clear();
+		set_zero_position(0);
 
 		scale_at_acq_start_ = scale_;
 		offset_at_acq_start_ = offset_;