X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=5fa1be2fc4326e2eb5728c6a27035023315ace54;hp=a085de29123cba27181414134c5e0673f2d642f7;hb=4468ee4246cd5e47845494e8b3b22a17d434ed5b;hpb=4bc9230c442427a27a3934ce5ff6ff4fdd4e0855

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index a085de29..5fa1be2f 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -50,8 +50,8 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&view_, SIGNAL(hover_point_changed(QPoint)),
-		this, SLOT(hover_point_changed(QPoint)));
+	connect(&view_, SIGNAL(hover_point_changed(const QWidget*, QPoint)),
+		this, SLOT(on_hover_point_changed(const QWidget*, QPoint)));
 	connect(&view_, SIGNAL(offset_changed()),
 		this, SLOT(invalidate_tick_position_cache()));
 	connect(&view_, SIGNAL(scale_changed()),
@@ -99,6 +99,11 @@ QString Ruler::format_time_with_distance(
 	if (unit == pv::util::TimeUnit::Samples)
 		return pv::util::format_time_si_adjusted(t, prefix, precision, "sa", sign);
 
+	QString unit_string;
+	if (unit == pv::util::TimeUnit::Time)
+		unit_string = "s";
+	// Note: In case of pv::util::TimeUnit::None, unit_string remains empty
+
 	// View zoomed way out -> low precision (0), big distance (>=60s)
 	// -> DD:HH:MM
 	if ((precision == 0) && (distance >= limit))
@@ -109,18 +114,39 @@ QString Ruler::format_time_with_distance(
 	// View zoomed way in -> high precision (>3), low step size (<1s)
 	// -> HH:MM:SS.mmm... or xxxx (si unit) if less than limit seconds
 	if (abs(t) < limit)
-		return pv::util::format_time_si_adjusted(t, prefix, precision, "s", sign);
+		return pv::util::format_time_si_adjusted(t, prefix, precision, unit_string, sign);
 	else
 		return pv::util::format_time_minutes(t, precision, sign);
 }
 
-pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x)
+pv::util::Timestamp Ruler::get_absolute_time_from_x_pos(uint32_t x) const
+{
+	return view_.offset() + ((double)x + 0.5) * view_.scale();
+}
+
+pv::util::Timestamp Ruler::get_ruler_time_from_x_pos(uint32_t x) const
 {
 	return view_.ruler_offset() + ((double)x + 0.5) * view_.scale();
 }
 
+pv::util::Timestamp Ruler::get_ruler_time_from_absolute_time(const pv::util::Timestamp& abs_time) const
+{
+	return abs_time + view_.zero_offset();
+}
+
+pv::util::Timestamp Ruler::get_absolute_time_from_ruler_time(const pv::util::Timestamp& ruler_time) const
+{
+	return ruler_time - view_.zero_offset();
+}
+
 void Ruler::contextMenuEvent(QContextMenuEvent *event)
 {
+	MarginWidget::contextMenuEvent(event);
+
+	// Don't show a context menu if the MarginWidget found a widget that shows one
+	if (event->isAccepted())
+		return;
+
 	context_menu_x_pos_ = event->pos().x();
 
 	QMenu *const menu = new QMenu(this);
@@ -129,6 +155,10 @@ void Ruler::contextMenuEvent(QContextMenuEvent *event)
 	connect(create_marker, SIGNAL(triggered()), this, SLOT(on_createMarker()));
 	menu->addAction(create_marker);
 
+	QAction *const set_zero_position = new QAction(tr("Set as zero point"), this);
+	connect(set_zero_position, SIGNAL(triggered()), this, SLOT(on_setZeroPosition()));
+	menu->addAction(set_zero_position);
+
 	QAction *const toggle_hover_marker = new QAction(this);
 	connect(toggle_hover_marker, SIGNAL(triggered()), this, SLOT(on_toggleHoverMarker()));
 	menu->addAction(toggle_hover_marker);
@@ -139,6 +169,7 @@ void Ruler::contextMenuEvent(QContextMenuEvent *event)
 	toggle_hover_marker->setText(hover_marker_shown ?
 		tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
 
+	event->setAccepted(true);
 	menu->popup(event->globalPos());
 }
 
@@ -166,7 +197,7 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 
 void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
 {
-	view_.add_flag(get_time_from_x_pos(event->x()));
+	view_.add_flag(get_ruler_time_from_x_pos(event->x()));
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -304,8 +335,9 @@ TickPositions Ruler::calculate_tick_positions(
 	return tp;
 }
 
-void Ruler::hover_point_changed(const QPoint &hp)
+void Ruler::on_hover_point_changed(const QWidget* widget, const QPoint &hp)
 {
+	(void)widget;
 	(void)hp;
 
 	update();
@@ -318,7 +350,12 @@ void Ruler::invalidate_tick_position_cache()
 
 void Ruler::on_createMarker()
 {
-	view_.add_flag(get_time_from_x_pos(context_menu_x_pos_));
+	view_.add_flag(get_absolute_time_from_x_pos(mouse_down_point_.x()));
+}
+
+void Ruler::on_setZeroPosition()
+{
+	view_.set_zero_position(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
 void Ruler::on_toggleHoverMarker()