MarginWidget: Moved in keyPressEvent

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index f671c95e0c9bd529d67111237ea8fc45c73da0c5..f4bffd4cf6820449f4818dba3d78e4505fbfe57e 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -28,7 +28,6 @@
 #include "view.hpp"
 
 #include <pv/util.hpp>
-#include <pv/widgets/popup.hpp>
 
 using namespace Qt;
 
@@ -52,14 +51,6 @@ Ruler::Ruler(View &parent) :
                this, SLOT(hover_point_changed()));
 }
 
-void Ruler::clear_selection()
-{
-       const vector< shared_ptr<TimeItem> > items(view_.time_items());
-       for (auto &i : items)
-               i->select(false);
-       update();
-}
-
 QSize Ruler::sizeHint() const
 {
        const int text_height = calculate_text_height();
@@ -76,6 +67,22 @@ QSize Ruler::extended_size_hint() const
                ViewItem::HighlightRadius);
 }
 
+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++)
+               if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt))
+                       return *i;
+       return nullptr;
+}
+
 void Ruler::paintEvent(QPaintEvent*)
 {
        const int ValueMargin = 3;
@@ -161,53 +168,19 @@ 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());
-}
-
-void Ruler::mousePressEvent(QMouseEvent *e)
-{
-       if (e->buttons() & Qt::LeftButton) {
-               mouse_down_point_ = e->pos();
-
-               mouse_down_item_.reset();
-
-               clear_selection();
-
-               const vector< shared_ptr<TimeItem> > items(view_.time_items());
-               for (auto i = items.rbegin(); i != items.rend(); i++)
-                       if ((*i)->label_rect(rect()).contains(e->pos())) {
-                               mouse_down_item_ = (*i);
-                               break;
-                       }
-
-               if (mouse_down_item_) {
-                       mouse_down_item_->select();
-                       mouse_down_item_->drag();
-               }
-
-               selection_changed();
-       }
+                       i->drag_by(delta);
 }
 
 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,30 +190,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::keyPressEvent(QKeyEvent *e)
-{
-       assert(e);
-
-       if (e->key() == Qt::Key_Delete)
-       {
-               const vector< shared_ptr<TimeItem> > items(view_.time_items());
-               for (auto &i : items)
-                       if (i->selected())
-                               i->delete_pressed();
-       }
-}
-
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
        const int x = view_.hover_point().x();