X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=0d86efd853202b0bf2753c91eff0344e5848478b;hb=e47b69882ca7299041123c664dbcc8b552c5db99;hp=160f1acbd9ce63babf15e337616502d6a28d7631;hpb=25a0d47cfb287d16f72116e8c198d0e5867f8c20;p=pulseview.git diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 160f1ac..0d86efd 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -28,7 +28,6 @@ #include "view.hpp" #include -#include using namespace Qt; @@ -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++) @@ -170,58 +168,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 > 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_ = 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; - - 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(); - } - } - - dragging_ = false; - mouse_down_item_.reset(); - - const vector< shared_ptr > items(view_.time_items()); - for (auto &i : items) - i->drag_release(); -} - -void Ruler::leaveEvent(QEvent*) -{ - mouse_point_ = QPoint(-1, -1); - update(); + i->drag_by(delta); } void Ruler::mouseDoubleClickEvent(QMouseEvent *e) @@ -229,19 +180,6 @@ 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 > 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();