X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=fe08cb06ceaa56cd874b77ec35a836c89cdfd323;hp=5455b2099ba77abf7315a4e9fa11a98c5494d499;hb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index 5455b209..fe08cb06 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -46,8 +46,8 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&view_, SIGNAL(hover_point_changed()),
-		this, SLOT(hover_point_changed()));
+	connect(&view_, SIGNAL(hover_point_changed(QPoint)),
+		this, SLOT(hover_point_changed(QPoint)));
 	connect(&view_, SIGNAL(offset_changed()),
 		this, SLOT(invalidate_tick_position_cache()));
 	connect(&view_, SIGNAL(scale_changed()),
@@ -140,7 +140,7 @@ void Ruler::paintEvent(QPaintEvent*)
 
 		tick_position_cache_ = calculate_tick_positions(
 			view_.tick_period(),
-			view_.offset(),
+			view_.ruler_offset(),
 			view_.scale(),
 			width(),
 			ffunc);
@@ -228,7 +228,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
 
 void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
 {
-	view_.add_flag(view_.offset() + ((double)event->x() + 0.5) * view_.scale());
+	view_.add_flag(view_.ruler_offset() + ((double)event->x() + 0.5) * view_.scale());
 }
 
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
@@ -256,8 +256,10 @@ int Ruler::calculate_text_height() const
 	return QFontMetrics(font()).ascent();
 }
 
-void Ruler::hover_point_changed()
+void Ruler::hover_point_changed(const QPoint &hp)
 {
+	(void)hp;
+
 	update();
 }