X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=06cd1b1540ba3dca171d2cd286cdc35f66d1fd86;hb=4030e03db23566ccc2521c7c40903d0f360797ca;hp=0322af8a611e1ad9520b854e2cbae0b7ec39ad81;hpb=b42d25c43e52c900cbdd3e5cde0282961b8721e7;p=pulseview.git diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 0322af8..06cd1b1 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -34,6 +34,7 @@ #include #include +using namespace boost; using namespace std; namespace pv { @@ -49,9 +50,8 @@ const int Ruler::FirstSIPrefixPower = -15; const int Ruler::HoverArrowSize = 5; Ruler::Ruler(View &parent) : - QWidget(&parent), - _view(parent), - _grabbed_marker(NULL) + MarginWidget(parent), + _dragging(false) { setMouseTracking(true); @@ -59,6 +59,14 @@ Ruler::Ruler(View &parent) : this, SLOT(hover_point_changed())); } +void Ruler::clear_selection() +{ + CursorPair &cursors = _view.cursors(); + cursors.first()->select(false); + cursors.second()->select(false); + update(); +} + QString Ruler::format_time(double t, unsigned int prefix, unsigned int precision) { @@ -163,7 +171,8 @@ void Ruler::paintEvent(QPaintEvent*) } while (x < width()); // Draw the cursors - draw_cursors(p, prefix); + if (_view.cursors_shown()) + _view.cursors().draw_markers(p, rect(), prefix); // Draw the hover mark draw_hover_mark(p); @@ -173,51 +182,58 @@ void Ruler::paintEvent(QPaintEvent*) void Ruler::mouseMoveEvent(QMouseEvent *e) { - if (!_grabbed_marker) + if (!(e->buttons() & Qt::LeftButton)) return; + + if ((e->pos() - _mouse_down_point).manhattanLength() < + QApplication::startDragDistance()) + return; + + _dragging = true; - _grabbed_marker->set_time(_view.offset() + - ((double)e->x() + 0.5) * _view.scale()); + if (shared_ptr m = _grabbed_marker.lock()) + m->set_time(_view.offset() + + ((double)e->x() + 0.5) * _view.scale()); } void Ruler::mousePressEvent(QMouseEvent *e) { - if (e->buttons() & Qt::LeftButton) { - _grabbed_marker = NULL; + if (e->buttons() & Qt::LeftButton) + { + _mouse_down_point = e->pos(); + + _grabbed_marker.reset(); + + clear_selection(); if (_view.cursors_shown()) { CursorPair &cursors = _view.cursors(); - if (cursors.first().get_label_rect( + if (cursors.first()->get_label_rect( rect()).contains(e->pos())) - _grabbed_marker = &cursors.first(); - else if (cursors.second().get_label_rect( + _grabbed_marker = cursors.first(); + else if (cursors.second()->get_label_rect( rect()).contains(e->pos())) - _grabbed_marker = &cursors.second(); + _grabbed_marker = cursors.second(); } + + if (shared_ptr m = _grabbed_marker.lock()) + m->select(); + + selection_changed(); } } void Ruler::mouseReleaseEvent(QMouseEvent *) { - _grabbed_marker = NULL; -} - -void Ruler::draw_cursors(QPainter &p, unsigned int prefix) -{ - if (!_view.cursors_shown()) - return; - - const QRect r = rect(); - CursorPair &cursors = _view.cursors(); - cursors.first().paint_label(p, r, prefix); - cursors.second().paint_label(p, r, prefix); + _dragging = false; + _grabbed_marker.reset(); } void Ruler::draw_hover_mark(QPainter &p) { const int x = _view.hover_point().x(); - if (x == -1 || _grabbed_marker) + if (x == -1 || _dragging) return; p.setPen(QPen(Qt::NoPen));