X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=2cd1275348d737f9f2f3c6fd1868c977118fe7aa;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hp=0149155d24c300e0bbd8b68127548ac1d4416ac9;hpb=b434cbaf3208c2037fd5f86001b367b46ba926ba;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 0149155..2cd1275 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -83,14 +83,6 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 	return nullptr;
 }
 
-void Ruler::drag_items(const QPoint &delta)
-{
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		if (i->dragging())
-			i->drag_by(delta);
-}
-
 void Ruler::paintEvent(QPaintEvent*)
 {
 	const int ValueMargin = 3;
@@ -99,16 +91,15 @@ 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()));
 
 	const double minor_tick_period = tick_period / MinorTickSubdivision;
 	const double first_major_division =
-		floor(view_.offset() / tick_period);
+		floor(view_.offset() / tick_period).convert_to<double>();
 	const double first_minor_division =
-		ceil(view_.offset() / minor_tick_period);
+		ceil(view_.offset() / minor_tick_period).convert_to<double>();
 	const double t0 = first_major_division * tick_period;
 
 	int division = (int)round(first_minor_division -
@@ -123,14 +114,15 @@ void Ruler::paintEvent(QPaintEvent*)
 
 	do {
 		const double t = t0 + division * minor_tick_period;
-		x = (t - view_.offset()) / view_.scale();
+		x = ((t - view_.offset()) / view_.scale()).convert_to<double>();
 
 		if (division % MinorTickSubdivision == 0)
 		{
 			// 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));
 		}
@@ -156,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);
 	}