projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add generic "Create marker here" context menu entry
[pulseview.git]
/
pv
/
views
/
trace
/
view.cpp
diff --git
a/pv/views/trace/view.cpp
b/pv/views/trace/view.cpp
index 625722d4308f9e3128c4f6dd42d2d49e6e8a52b9..aee84a20be5c1e0fb1aea36c85eb1d5a2af02c18 100644
(file)
--- a/
pv/views/trace/view.cpp
+++ b/
pv/views/trace/view.cpp
@@
-347,6
+347,11
@@
const Viewport* View::viewport() const
return viewport_;
}
return viewport_;
}
+const Ruler* View::ruler() const
+{
+ return ruler_;
+}
+
void View::save_settings(QSettings &settings) const
{
settings.setValue("scale", scale_);
void View::save_settings(QSettings &settings) const
{
settings.setValue("scale", scale_);
@@
-1382,7
+1387,7
@@
void View::contextMenuEvent(QContextMenuEvent *event)
QMenu *menu = r->create_view_context_menu(this, pos);
if (menu)
QMenu *menu = r->create_view_context_menu(this, pos);
if (menu)
- menu->
exec
(event->globalPos());
+ menu->
popup
(event->globalPos());
}
void View::resizeEvent(QResizeEvent* event)
}
void View::resizeEvent(QResizeEvent* event)