MarginWidget: Moved in keyPressEvent

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 5b84d6d321c445cad69afd0f13ea7a4383e9efa5..f4bffd4cf6820449f4818dba3d78e4505fbfe57e 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,7 +22,6 @@
 
 #include <QApplication>
 #include <QFontMetrics>
-#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
@@ -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,13 @@ 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());
@@ -177,23 +175,6 @@ void Ruler::mouseMoveEvent(QMouseEvent *e)
                        i->drag_by(delta);
 }
 
-void Ruler::mousePressEvent(QMouseEvent *e)
-{
-       if (e->buttons() & Qt::LeftButton) {
-               mouse_down_point_ = e->pos();
-               mouse_down_item_ = get_mouse_over_item(e->pos());
-
-               clear_selection();
-
-               if (mouse_down_item_) {
-                       mouse_down_item_->select();
-                       mouse_down_item_->drag();
-               }
-
-               selection_changed();
-       }
-}
-
 void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
        using pv::widgets::Popup;
@@ -214,30 +195,6 @@ 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<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)
-{
-       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();