Ruler: Fix context menu for items on the ruler

[pulseview.git] / pv / views / trace / ruler.cpp

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index a085de29123cba27181414134c5e0673f2d642f7..acea8a368b457469e44c11e758f95f935a56e68e 100644 (file)
--- 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()),
@@ -114,13 +114,19 @@ QString Ruler::format_time_with_distance(
                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_time_from_x_pos(uint32_t x) const
 {
        return view_.ruler_offset() + ((double)x + 0.5) * view_.scale();
 }
 
 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 +135,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 +149,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());
 }
 
@@ -304,8 +315,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 +330,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_time_from_x_pos(mouse_down_point_.x()));
+}
+
+void Ruler::on_setZeroPosition()
+{
+       view_.set_zero_position(get_time_from_x_pos(mouse_down_point_.x()));
 }
 
 void Ruler::on_toggleHoverMarker()