X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=f4bffd4cf6820449f4818dba3d78e4505fbfe57e;hp=0c4dcb0bd13ed0c17cf47be2fa07cf737b051ded;hb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;hpb=19552bb8dff1708939544beecb448bcc91f46644 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 0c4dcb0b..f4bffd4c 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include "ruler.hpp" @@ -52,14 +51,6 @@ Ruler::Ruler(View &parent) : this, SLOT(hover_point_changed())); } -void Ruler::clear_selection() -{ - const vector< shared_ptr > items(view_.time_items()); - for (auto &i : items) - i->select(false); - update(); -} - QSize Ruler::sizeHint() const { const int text_height = calculate_text_height(); @@ -76,7 +67,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++) @@ -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 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 > 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();