MarginWidget: Added item() method

[pulseview.git] / pv / view / ruler.cpp

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 47da23a8b78e21a9e5f7725ca533f64d472897ad..9f8de32fd0df7686906ee6381bba581f4158340f 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -29,7 +29,6 @@
 #include "view.hpp"
 
 #include <pv/util.hpp>
-#include <pv/widgets/popup.hpp>
 
 using namespace Qt;
 
@@ -77,7 +76,14 @@ QSize Ruler::extended_size_hint() const
                ViewItem::HighlightRadius);
 }
 
-shared_ptr<TimeItem> Ruler::get_mouse_over_item(const QPoint &pt)
+vector< shared_ptr<ViewItem> > Ruler::items()
+{
+       const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+       return vector< shared_ptr<ViewItem> >(
+               time_items.begin(), time_items.end());
+}
+
+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++)
@@ -199,15 +205,8 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
        using pv::widgets::Popup;
 
-       if (!dragging_ && mouse_down_item_) {
-               Popup *const p = mouse_down_item_->create_popup(&view_);
-               if (p) {
-                       const QPoint arrpos(mouse_down_item_->get_x(),
-                               height() - ViewItem::HighlightRadius);
-                       p->set_position(mapToGlobal(arrpos), Popup::Bottom);
-                       p->show();
-               }
-       }
+       if (!dragging_ && mouse_down_item_)
+               show_popup(mouse_down_item_);
 
        dragging_ = false;
        mouse_down_item_.reset();
@@ -217,12 +216,6 @@ 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());
@@ -230,7 +223,7 @@ void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 
 void Ruler::contextMenuEvent(QContextMenuEvent *event)
 {
-       const shared_ptr<TimeItem> r = get_mouse_over_item(mouse_point_);
+       const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
        if (!r)
                return;