X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=2f9b140eec8d0f9d1649155166b89f3a0638e5cd;hp=9f8de32fd0df7686906ee6381bba581f4158340f;hb=f9abacf20c85333a3a6be785049e7658967e3104;hpb=3e124bee223688078d60f007cfa078a1dcbfbfb3

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9f8de32f..2f9b140e 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,7 +22,6 @@
 
 #include <QApplication>
 #include <QFontMetrics>
-#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
@@ -52,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();
@@ -157,94 +148,17 @@ 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::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::contextMenuEvent(QContextMenuEvent *event)
-{
-	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
-	if (!r)
-		return;
-
-	QMenu *menu = r->create_context_menu(this);
-	if (menu)
-		menu->exec(event->globalPos());
-}
-
-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();