MarginWidget: Added item() method

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 160f1acbd9ce63babf15e337616502d6a28d7631..9f8de32fd0df7686906ee6381bba581f4158340f 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,13 +22,13 @@
 
 #include <QApplication>
 #include <QFontMetrics>
+#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
 #include "view.hpp"
 
 #include <pv/util.hpp>
-#include <pv/widgets/popup.hpp>
 
 using namespace Qt;
 
@@ -76,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++)
@@ -170,13 +177,11 @@ void Ruler::mouseMoveEvent(QMouseEvent *e)
        // Do the drag
        dragging_ = true;
 
-       const int delta = e->pos().x() - mouse_down_point_.x();
+       const QPoint delta = e->pos() - mouse_down_point_;
        const vector< shared_ptr<TimeItem> > items(view_.time_items());
        for (auto &i : items)
                if (i->dragging())
-                       i->set_time(view_.offset() +
-                               (i->drag_point().x() + delta - 0.5) *
-                               view_.scale());
+                       i->drag_by(delta);
 }
 
 void Ruler::mousePressEvent(QMouseEvent *e)
@@ -200,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();
@@ -218,15 +216,20 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
                i->drag_release();
 }
 
-void Ruler::leaveEvent(QEvent*)
+void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
-       mouse_point_ = QPoint(-1, -1);
-       update();
+       view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
 }
 
-void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
+void Ruler::contextMenuEvent(QContextMenuEvent *event)
 {
-       view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+       const shared_ptr<ViewItem> 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)