X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=a8cf63540a0cb239645b1cb3e4e5131743caac1e;hp=21dd16ff398cb4b03178c12353de0ee04a9207f4;hb=2f7982367e8382e05c862de7afc71075ded5f606;hpb=2155b66bed9f0802caec0b1e86f7f03d317a3e83

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 21dd16ff..a8cf6354 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -51,14 +51,6 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
-void Ruler::clear_selection()
-{
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		i->select(false);
-	update();
-}
-
 QSize Ruler::sizeHint() const
 {
 	const int text_height = calculate_text_height();
@@ -91,6 +83,19 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 	return nullptr;
 }
 
+bool Ruler::accept_drag() const
+{
+	return true;
+}
+
+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;
@@ -162,77 +167,11 @@ void Ruler::paintEvent(QPaintEvent*)
 	}
 }
 
-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::mousePressEvent(QMouseEvent *e)
-{
-	if (e->buttons() & Qt::LeftButton) {
-		mouse_down_point_ = e->pos();
-		mouse_down_item_ = get_mouse_over_item(e->pos());
-
-		clear_selection();
-
-		if (mouse_down_item_) {
-			mouse_down_item_->select();
-			mouse_down_item_->drag();
-		}
-
-		selection_changed();
-	}
-}
-
-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());
 }
 
-void Ruler::keyPressEvent(QKeyEvent *e)
-{
-	assert(e);
-
-	if (e->key() == Qt::Key_Delete)
-	{
-		const vector< shared_ptr<TimeItem> > items(view_.time_items());
-		for (auto &i : items)
-			if (i->selected())
-				i->delete_pressed();
-	}
-}
-
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
 	const int x = view_.hover_point().x();