X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=5f7b1f67faade83e7d3acf388e8230d26a7d07fa;hb=c677193dc6e691493081fe87476a04e1674093a5;hp=f4bffd4cf6820449f4818dba3d78e4505fbfe57e;hpb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;p=pulseview.git diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index f4bffd4..5f7b1f6 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -27,8 +27,6 @@ #include "ruler.hpp" #include "view.hpp" -#include - using namespace Qt; using std::shared_ptr; @@ -49,6 +47,18 @@ Ruler::Ruler(View &parent) : connect(&view_, SIGNAL(hover_point_changed()), this, SLOT(hover_point_changed())); + connect(&view_, SIGNAL(offset_changed()), + this, SLOT(invalidate_tick_position_cache())); + connect(&view_, SIGNAL(scale_changed()), + this, SLOT(invalidate_tick_position_cache())); + connect(&view_, SIGNAL(tick_prefix_changed()), + this, SLOT(invalidate_tick_position_cache())); + connect(&view_, SIGNAL(tick_precision_changed()), + this, SLOT(invalidate_tick_position_cache())); + connect(&view_, SIGNAL(tick_period_changed()), + this, SLOT(invalidate_tick_position_cache())); + connect(&view_, SIGNAL(time_unit_changed()), + this, SLOT(invalidate_tick_position_cache())); } QSize Ruler::sizeHint() const @@ -85,57 +95,48 @@ shared_ptr Ruler::get_mouse_over_item(const QPoint &pt) void Ruler::paintEvent(QPaintEvent*) { - const int ValueMargin = 3; - - QPainter p(this); - p.setRenderHint(QPainter::Antialiasing); - - 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); - const double first_minor_division = - ceil(view_.offset() / minor_tick_period); - const double t0 = first_major_division * tick_period; + if (!tick_position_cache_) { + auto ffunc = [this](const pv::util::Timestamp& t) + { + return util::format_time( + t, + this->view_.tick_prefix(), + this->view_.time_unit(), + this->view_.tick_precision()); + }; + + tick_position_cache_.emplace(calculate_tick_positions( + view_.tick_period(), + view_.offset(), + view_.scale(), + width(), + ffunc)); + } - int division = (int)round(first_minor_division - - first_major_division * MinorTickSubdivision) - 1; + const int ValueMargin = 3; 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; - - do { - const double t = t0 + division * minor_tick_period; - x = (t - view_.offset()) / view_.scale(); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - if (division % MinorTickSubdivision == 0) - { - // Draw a major tick - 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, ruler_height)); - } - else - { - // Draw a minor tick - p.drawLine(QPointF(x, minor_tick_y1), - QPointF(x, ruler_height)); - } + // Draw the tick marks + p.setPen(palette().color(foregroundRole())); - division++; + for (const auto& tick: tick_position_cache_->major) { + p.drawText(tick.first, ValueMargin, 0, text_height, + AlignCenter | AlignTop | TextDontClip, tick.second); + p.drawLine(QPointF(tick.first, major_tick_y1), + QPointF(tick.first, ruler_height)); + } - } while (x < width()); + for (const auto& tick: tick_position_cache_->minor) { + p.drawLine(QPointF(tick, minor_tick_y1), + QPointF(tick, ruler_height)); + } // Draw the hover mark draw_hover_mark(p, text_height); @@ -148,46 +149,48 @@ void Ruler::paintEvent(QPaintEvent*) // Draw the items const vector< shared_ptr > items(view_.time_items()); for (auto &i : items) { - const bool highlight = !dragging_ && + const bool highlight = !item_dragging_ && i->label_rect(r).contains(mouse_point_); i->paint_label(p, r, highlight); } } -void Ruler::mouseMoveEvent(QMouseEvent *e) +Ruler::TickPositions Ruler::calculate_tick_positions( + const pv::util::Timestamp& major_period, + const pv::util::Timestamp& offset, + const double scale, + const int width, + std::function format_function) { - mouse_point_ = e->pos(); - - if (!(e->buttons() & Qt::LeftButton)) - return; - - if ((e->pos() - mouse_down_point_).manhattanLength() < - QApplication::startDragDistance()) - return; + TickPositions tp; - // Do the drag - dragging_ = true; + const double minor_period = + (major_period / MinorTickSubdivision).convert_to(); + const pv::util::Timestamp first_major_division = floor(offset / major_period); + const pv::util::Timestamp first_minor_division = ceil(offset / minor_period); + const pv::util::Timestamp t0 = first_major_division * major_period; - const QPoint delta = e->pos() - mouse_down_point_; - const vector< shared_ptr > items(view_.time_items()); - for (auto &i : items) - if (i->dragging()) - i->drag_by(delta); -} + int division = (round(first_minor_division - + first_major_division * MinorTickSubdivision)).convert_to() - 1; -void Ruler::mouseReleaseEvent(QMouseEvent *) -{ - using pv::widgets::Popup; + double x; - if (!dragging_ && mouse_down_item_) - show_popup(mouse_down_item_); + do { + pv::util::Timestamp t = t0 + division * minor_period; + x = ((t - offset) / scale).convert_to(); + + if (division % MinorTickSubdivision == 0) { + // Recalculate 't' without using 'minor_period' which is of type double. + t = t0 + division / MinorTickSubdivision * major_period; + tp.major.emplace_back(x, format_function(t)); + } else { + tp.minor.emplace_back(x); + } - dragging_ = false; - mouse_down_item_.reset(); + division++; + } while (x < width); - const vector< shared_ptr > items(view_.time_items()); - for (auto &i : items) - i->drag_release(); + return tp; } void Ruler::mouseDoubleClickEvent(QMouseEvent *e) @@ -225,5 +228,16 @@ void Ruler::hover_point_changed() update(); } +void Ruler::invalidate_tick_position_cache() +{ + tick_position_cache_ = boost::none; +} + +void Ruler::resizeEvent(QResizeEvent*) +{ + // the tick calculation depends on the width of this widget + invalidate_tick_position_cache(); +} + } // namespace view } // namespace pv