X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=555794fc42c6e881c5691fc1d64c43a0355e7cd3;hb=20c99cfc69d3c7430817abd9a1f810698deb4a18;hp=49cff2f14ca14633f982f266c10c3dfec29f35af;hpb=710c2a1896fbac968c82f2d1257aaabd10a48cc8;p=pulseview.git

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index 49cff2f1..555794fc 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -19,7 +19,6 @@
 
 #include <extdef.h>
 
-#include <QApplication>
 #include <QFontMetrics>
 #include <QMenu>
 #include <QMouseEvent>
@@ -159,6 +158,12 @@ void Ruler::contextMenuEvent(QContextMenuEvent *event)
 	connect(set_zero_position, SIGNAL(triggered()), this, SLOT(on_setZeroPosition()));
 	menu->addAction(set_zero_position);
 
+	if (view_.zero_offset().convert_to<double>() != 0) {
+		QAction *const reset_zero_position = new QAction(tr("Reset zero point"), this);
+		connect(reset_zero_position, SIGNAL(triggered()), this, SLOT(on_resetZeroPosition()));
+		menu->addAction(reset_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);
@@ -188,38 +193,50 @@ vector< shared_ptr<ViewItem> > Ruler::items()
 
 void Ruler::item_hover(const shared_ptr<ViewItem> &item, QPoint pos)
 {
-	Q_UNUSED(pos);
+	(void)pos;
+
 	hover_item_ = dynamic_pointer_cast<TimeItem>(item);
 }
 
-shared_ptr<TimeItem> Ruler::get_reference_item()
+shared_ptr<TimeItem> Ruler::get_reference_item() const
 {
+	// Note: time() returns 0 if item returns no valid time
+
 	if (mouse_modifiers_ & Qt::ShiftModifier)
 		return nullptr;
 
-	if (hover_item_ != nullptr)
+	if (hover_item_ && (hover_item_->time() != 0))
 		return hover_item_;
 
-	shared_ptr<TimeItem> found(nullptr);
+	shared_ptr<TimeItem> ref_item;
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+
 	for (auto i = items.rbegin(); i != items.rend(); i++) {
 		if ((*i)->enabled() && (*i)->selected()) {
-			if (found == nullptr)
-				found = *i;
-			else
-				return nullptr; // Return null if multiple items are selected
+			if (!ref_item)
+				ref_item = *i;
+			else {
+				// Return nothing if multiple items are selected
+				ref_item.reset();
+				break;
+			}
 		}
 	}
 
-	return found;
+	if (ref_item && (ref_item->time() == 0))
+		ref_item.reset();
+
+	return ref_item;
 }
 
 shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 {
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+
 	for (auto i = items.rbegin(); i != items.rend(); i++)
 		if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt))
 			return *i;
+
 	return nullptr;
 }
 
@@ -386,6 +403,11 @@ void Ruler::on_setZeroPosition()
 	view_.set_zero_position(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
+void Ruler::on_resetZeroPosition()
+{
+	view_.reset_zero_position();
+}
+
 void Ruler::on_toggleHoverMarker()
 {
 	GlobalSettings settings;