X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=47da23a8b78e21a9e5f7725ca533f64d472897ad;hp=7018c212db52f8b72f1449400b9160594a746dde;hb=23e75650eba0491b2636de3cef87f893e38ae6f3;hpb=819e2e95555b2b3c2190f24a3cfa82250d1f34e5 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 7018c212..47da23a8 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include "ruler.hpp" @@ -38,17 +39,13 @@ using std::vector; namespace pv { namespace view { -const int Ruler::RulerHeight = 30; +const float Ruler::RulerHeight = 2.5f; // x Text Height const int Ruler::MinorTickSubdivision = 4; -const int Ruler::HoverArrowSize = 5; - -const int Ruler::Padding = 20; -const int Ruler::BaselineOffset = 5; +const float Ruler::HoverArrowSize = 0.5f; // x Text Height Ruler::Ruler(View &parent) : - MarginWidget(parent), - text_height_(calculate_text_height()) + MarginWidget(parent) { setMouseTracking(true); @@ -66,13 +63,27 @@ void Ruler::clear_selection() QSize Ruler::sizeHint() const { - return QSize(0, RulerHeight); + const int text_height = calculate_text_height(); + return QSize(0, RulerHeight * text_height); } QSize Ruler::extended_size_hint() const { - return QSize(0, RulerHeight + - (text_height_ + Padding + BaselineOffset) / 2); + QRectF max_rect; + std::vector< std::shared_ptr > items(view_.time_items()); + for (auto &i : items) + max_rect = max_rect.united(i->label_rect(QRect())); + return QSize(0, sizeHint().height() - max_rect.top() / 2 + + ViewItem::HighlightRadius); +} + +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++) + if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt)) + return *i; + return nullptr; } void Ruler::paintEvent(QPaintEvent*) @@ -98,9 +109,10 @@ void Ruler::paintEvent(QPaintEvent*) int division = (int)round(first_minor_division - first_major_division * MinorTickSubdivision) - 1; - const int major_tick_y1 = text_height_ + ValueMargin * 2; - const int tick_y2 = RulerHeight; - const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2; + const int text_height = calculate_text_height(); + const int ruler_height = RulerHeight * text_height; + const int major_tick_y1 = text_height + ValueMargin * 2; + const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2; double x; @@ -111,17 +123,17 @@ void Ruler::paintEvent(QPaintEvent*) if (division % MinorTickSubdivision == 0) { // Draw a major tick - p.drawText(x, ValueMargin, 0, text_height_, + p.drawText(x, ValueMargin, 0, text_height, AlignCenter | AlignTop | TextDontClip, pv::util::format_time(t, prefix)); p.drawLine(QPointF(x, major_tick_y1), - QPointF(x, tick_y2)); + QPointF(x, ruler_height)); } else { // Draw a minor tick p.drawLine(QPointF(x, minor_tick_y1), - QPointF(x, tick_y2)); + QPointF(x, ruler_height)); } division++; @@ -129,17 +141,20 @@ void Ruler::paintEvent(QPaintEvent*) } while (x < width()); // Draw the hover mark - draw_hover_mark(p); + draw_hover_mark(p, text_height); // The cursor labels are not drawn with the arrows exactly on the // bottom line of the widget, because then the selection shadow // would be clipped away. - const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset); + const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius); // Draw the items const vector< shared_ptr > items(view_.time_items()); - for (auto &i : items) - i->paint_label(p, r); + for (auto &i : items) { + const bool highlight = !dragging_ && + i->label_rect(r).contains(mouse_point_); + i->paint_label(p, r, highlight); + } } void Ruler::mouseMoveEvent(QMouseEvent *e) @@ -156,31 +171,21 @@ 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()); + i->drag_by(delta); } void Ruler::mousePressEvent(QMouseEvent *e) { if (e->buttons() & Qt::LeftButton) { mouse_down_point_ = e->pos(); - - mouse_down_item_.reset(); + mouse_down_item_ = get_mouse_over_item(e->pos()); clear_selection(); - const vector< shared_ptr > 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(); @@ -198,7 +203,7 @@ void Ruler::mouseReleaseEvent(QMouseEvent *) Popup *const p = mouse_down_item_->create_popup(&view_); if (p) { const QPoint arrpos(mouse_down_item_->get_x(), - height() - BaselineOffset); + height() - ViewItem::HighlightRadius); p->set_position(mapToGlobal(arrpos), Popup::Bottom); p->show(); } @@ -223,6 +228,17 @@ 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); @@ -236,7 +252,7 @@ void Ruler::keyPressEvent(QKeyEvent *e) } } -void Ruler::draw_hover_mark(QPainter &p) +void Ruler::draw_hover_mark(QPainter &p, int text_height) { const int x = view_.hover_point().x(); @@ -246,20 +262,19 @@ void Ruler::draw_hover_mark(QPainter &p) p.setPen(QPen(Qt::NoPen)); p.setBrush(QBrush(palette().color(foregroundRole()))); - const int b = RulerHeight; + const int b = RulerHeight * text_height; + const float hover_arrow_size = HoverArrowSize * text_height; const QPointF points[] = { QPointF(x, b), - QPointF(x - HoverArrowSize, b - HoverArrowSize), - QPointF(x + HoverArrowSize, b - HoverArrowSize) + QPointF(x - hover_arrow_size, b - hover_arrow_size), + QPointF(x + hover_arrow_size, b - hover_arrow_size) }; p.drawPolygon(points, countof(points)); } -int Ruler::calculate_text_height() +int Ruler::calculate_text_height() const { - QFontMetrics fm(font()); - return fm.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, "8").height(); + return QFontMetrics(font()).ascent(); } void Ruler::hover_point_changed()