projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1204559c5c943d5838a968a1bd0d636c5617dfc1..acea8a368b457469e44c11e758f95f935a56e68e 100644
(file)
--- a/
pv/views/trace/ruler.cpp
+++ b/
pv/views/trace/ruler.cpp
@@
-121,6
+121,12
@@
pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const
void Ruler::contextMenuEvent(QContextMenuEvent *event)
{
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);
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);
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);
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"));
toggle_hover_marker->setText(hover_marker_shown ?
tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
+ event->setAccepted(true);
menu->popup(event->globalPos());
}
menu->popup(event->globalPos());
}
@@
-322,6
+333,11
@@
void Ruler::on_createMarker()
view_.add_flag(get_time_from_x_pos(mouse_down_point_.x()));
}
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()
{
GlobalSettings settings;
void Ruler::on_toggleHoverMarker()
{
GlobalSettings settings;