X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=1204559c5c943d5838a968a1bd0d636c5617dfc1;hp=a085de29123cba27181414134c5e0673f2d642f7;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=4bc9230c442427a27a3934ce5ff6ff4fdd4e0855 diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp index a085de29..1204559c 100644 --- a/pv/views/trace/ruler.cpp +++ b/pv/views/trace/ruler.cpp @@ -50,8 +50,8 @@ Ruler::Ruler(View &parent) : { setMouseTracking(true); - connect(&view_, SIGNAL(hover_point_changed(QPoint)), - this, SLOT(hover_point_changed(QPoint))); + connect(&view_, SIGNAL(hover_point_changed(const QWidget*, QPoint)), + this, SLOT(on_hover_point_changed(const QWidget*, QPoint))); connect(&view_, SIGNAL(offset_changed()), this, SLOT(invalidate_tick_position_cache())); connect(&view_, SIGNAL(scale_changed()), @@ -114,7 +114,7 @@ QString Ruler::format_time_with_distance( return pv::util::format_time_minutes(t, precision, sign); } -pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) +pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const { return view_.ruler_offset() + ((double)x + 0.5) * view_.scale(); } @@ -304,8 +304,9 @@ TickPositions Ruler::calculate_tick_positions( return tp; } -void Ruler::hover_point_changed(const QPoint &hp) +void Ruler::on_hover_point_changed(const QWidget* widget, const QPoint &hp) { + (void)widget; (void)hp; update(); @@ -318,7 +319,7 @@ void Ruler::invalidate_tick_position_cache() void Ruler::on_createMarker() { - view_.add_flag(get_time_from_x_pos(context_menu_x_pos_)); + view_.add_flag(get_time_from_x_pos(mouse_down_point_.x())); } void Ruler::on_toggleHoverMarker()