X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=dfe7d1c555161d6d1d9ca589bfca099695cfc5ab;hb=8a463dbc1da0a229a726c1d0f278d361d871cfe1;hp=bd106b974c695e19d78a7abdad3adf887ba0e1fb;hpb=1dffa582704bb6acb144a3e89bd6eb0e2ccf4f25;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index bd106b9..dfe7d1c 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -91,7 +91,6 @@ void Ruler::paintEvent(QPaintEvent*)
 	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()));
@@ -122,7 +121,8 @@ void Ruler::paintEvent(QPaintEvent*)
 			// Draw a major tick
 			p.drawText(x, ValueMargin, 0, text_height,
 				AlignCenter | AlignTop | TextDontClip,
-				pv::util::format_time(t, prefix));
+				util::format_time(t, view_.tick_prefix(), view_.time_unit(),
+					view_.tick_precision()));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, ruler_height));
 		}
@@ -148,7 +148,7 @@ void Ruler::paintEvent(QPaintEvent*)
 	// Draw the items
 	const vector< shared_ptr<TimeItem> > 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);
 	}