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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index f4bffd4..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,48 +148,12 @@ 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);
 	}
 }
 
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-	mouse_point_ = e->pos();
-
-	if (!(e->buttons() & Qt::LeftButton))
-		return;
-
-	if ((e->pos() - mouse_down_point_).manhattanLength() <
-		QApplication::startDragDistance())
-		return;
-
-	// Do the drag
-	dragging_ = true;
-
-	const QPoint delta = e->pos() - mouse_down_point_;
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		if (i->dragging())
-			i->drag_by(delta);
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-	using pv::widgets::Popup;
-
-	if (!dragging_ && mouse_down_item_)
-		show_popup(mouse_down_item_);
-
-	dragging_ = false;
-	mouse_down_item_.reset();
-
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		i->drag_release();
-}
-
 void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
 	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());