X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=160f1acbd9ce63babf15e337616502d6a28d7631;hp=049cc4af196a8c2203d0ef3ee285e9fa33f17a84;hb=25a0d47cfb287d16f72116e8c198d0e5867f8c20;hpb=a2ae0205f2737dfd8f7647f9eae2fdcb47a0ad25 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 049cc4af..160f1acb 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -18,217 +18,255 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ruler.h" +#include -#include "cursor.h" -#include "view.h" -#include "viewport.h" +#include +#include +#include -#include +#include "ruler.hpp" +#include "view.hpp" -#include -#include -#include +#include +#include -#include -#include -#include +using namespace Qt; -using namespace std; +using std::shared_ptr; +using std::vector; namespace pv { namespace view { +const float Ruler::RulerHeight = 2.5f; // x Text Height const int Ruler::MinorTickSubdivision = 4; -const int Ruler::ScaleUnits[3] = {1, 2, 5}; -const QString Ruler::SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int Ruler::FirstSIPrefixPower = -15; - -const int Ruler::HoverArrowSize = 5; +const float Ruler::HoverArrowSize = 0.5f; // x Text Height Ruler::Ruler(View &parent) : - MarginWidget(parent), - _grabbed_marker(NULL) + MarginWidget(parent) { setMouseTracking(true); - connect(&_view, SIGNAL(hover_point_changed()), + connect(&view_, SIGNAL(hover_point_changed()), this, SLOT(hover_point_changed())); } void Ruler::clear_selection() { - CursorPair &cursors = _view.cursors(); - cursors.first().select(false); - cursors.second().select(false); + const vector< shared_ptr > items(view_.time_items()); + for (auto &i : items) + i->select(false); update(); } -QString Ruler::format_time(double t, unsigned int prefix, - unsigned int precision) +QSize Ruler::sizeHint() const { - const double multiplier = pow(10.0, - - prefix * 3 - FirstSIPrefixPower); - - QString s; - QTextStream ts(&s); - ts.setRealNumberPrecision(precision); - ts << fixed << forcesign << (t * multiplier) << - SIPrefixes[prefix] << "s"; - return s; + const int text_height = calculate_text_height(); + return QSize(0, RulerHeight * text_height); } -void Ruler::paintEvent(QPaintEvent*) +QSize Ruler::extended_size_hint() const +{ + 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) { - using namespace Qt; + 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; +} - const double SpacingIncrement = 32.0f; - const double MinValueSpacing = 32.0f; +void Ruler::paintEvent(QPaintEvent*) +{ const int ValueMargin = 3; QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - double min_width = SpacingIncrement, typical_width; - double tick_period; - unsigned int prefix; - - // Find tick spacing, and number formatting that does not cause - // value to collide. - do - { - const double min_period = _view.scale() * min_width; - - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10, order); - - unsigned int unit = 0; - - do - { - tick_period = order_decimal * ScaleUnits[unit++]; - } while (tick_period < min_period && unit < countof(ScaleUnits)); - - prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix < countof(SIPrefixes)); - - - typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX, - AlignLeft | AlignTop, format_time(_view.offset(), - prefix)).width() + MinValueSpacing; - - min_width += SpacingIncrement; - - } while(typical_width > tick_period / _view.scale()); - - const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, - AlignLeft | AlignTop, "8").height(); + const double tick_period = view_.tick_period(); + const unsigned int prefix = view_.tick_prefix(); // Draw the tick marks p.setPen(palette().color(foregroundRole())); const double minor_tick_period = tick_period / MinorTickSubdivision; const double first_major_division = - floor(_view.offset() / tick_period); + floor(view_.offset() / tick_period); const double first_minor_division = - ceil(_view.offset() / minor_tick_period); + ceil(view_.offset() / minor_tick_period); const double t0 = first_major_division * tick_period; int division = (int)round(first_minor_division - first_major_division * MinorTickSubdivision) - 1; + 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 tick_y2 = height(); - const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2; + const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2; double x; do { const double t = t0 + division * minor_tick_period; - x = (t - _view.offset()) / _view.scale(); + x = (t - view_.offset()) / view_.scale(); if (division % MinorTickSubdivision == 0) { // Draw a major tick p.drawText(x, ValueMargin, 0, text_height, AlignCenter | AlignTop | TextDontClip, - format_time(t, prefix)); + 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++; } while (x < width()); - // Draw the cursors - if (_view.cursors_shown()) - _view.cursors().draw_markers(p, rect(), prefix); - // Draw the hover mark - draw_hover_mark(p); - - p.end(); + 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, -ViewItem::HighlightRadius); + + // Draw the items + const vector< shared_ptr > items(view_.time_items()); + 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) { - if (!_grabbed_marker) + mouse_point_ = e->pos(); + + if (!(e->buttons() & Qt::LeftButton)) + return; + + if ((e->pos() - mouse_down_point_).manhattanLength() < + QApplication::startDragDistance()) return; - _grabbed_marker->set_time(_view.offset() + - ((double)e->x() + 0.5) * _view.scale()); + // Do the drag + dragging_ = true; + + const int delta = e->pos().x() - mouse_down_point_.x(); + 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) { - _grabbed_marker = NULL; - - if (_view.cursors_shown()) { - CursorPair &cursors = _view.cursors(); - if (cursors.first().get_label_rect( - rect()).contains(e->pos())) - _grabbed_marker = &cursors.first(); - else if (cursors.second().get_label_rect( - rect()).contains(e->pos())) - _grabbed_marker = &cursors.second(); + 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 *) { - _grabbed_marker = NULL; + 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::draw_hover_mark(QPainter &p) +void Ruler::leaveEvent(QEvent*) { - const int x = _view.hover_point().x(); + mouse_point_ = QPoint(-1, -1); + update(); +} - if (x == -1 || _grabbed_marker) +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(); + + if (x == -1) return; p.setPen(QPen(Qt::NoPen)); p.setBrush(QBrush(palette().color(foregroundRole()))); - const int b = height() - 1; + 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() const +{ + return QFontMetrics(font()).ascent(); +} + void Ruler::hover_point_changed() { update();