X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=21dd16ff398cb4b03178c12353de0ee04a9207f4;hp=7fa9987504ca5ef370b7a8bb5bafcc6758dc5eb5;hb=2155b66bed9f0802caec0b1e86f7f03d317a3e83;hpb=786b76785856c6cf8f5916c0b8d76a61695762f9 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 7fa99875..21dd16ff 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include "ruler.hpp" @@ -76,7 +75,14 @@ QSize Ruler::extended_size_hint() const ViewItem::HighlightRadius); } -shared_ptr Ruler::get_mouse_over_item(const QPoint &pt) +vector< shared_ptr > Ruler::items() +{ + const vector< shared_ptr > time_items(view_.time_items()); + return vector< shared_ptr >( + time_items.begin(), time_items.end()); +} + +shared_ptr Ruler::get_mouse_over_item(const QPoint &pt) { const vector< shared_ptr > items(view_.time_items()); for (auto i = items.rbegin(); i != items.rend(); i++) @@ -209,28 +215,11 @@ void Ruler::mouseReleaseEvent(QMouseEvent *) i->drag_release(); } -void Ruler::leaveEvent(QEvent*) -{ - mouse_point_ = QPoint(-1, -1); - update(); -} - void Ruler::mouseDoubleClickEvent(QMouseEvent *e) { view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale()); } -void Ruler::contextMenuEvent(QContextMenuEvent *event) -{ - const shared_ptr r = get_mouse_over_item(mouse_point_); - if (!r) - return; - - QMenu *menu = r->create_context_menu(this); - if (menu) - menu->exec(event->globalPos()); -} - void Ruler::keyPressEvent(QKeyEvent *e) { assert(e);